Commit Graph

253 Commits

Author SHA1 Message Date
rgarcia
b7c1b4acee renames verify? methods [#395] 2015-09-10 20:08:11 +02:00
rgarcia
cdda0ec34a removes unused i18n key [#395] 2015-09-10 14:31:33 +02:00
Enrique García
78f35673b3 Merge pull request #457 from AyuntamientoMadrid/letter_verification_tries-332
Letter verification tries
2015-09-10 13:21:31 +02:00
rgarcia
16dd609ad0 adds verification tries to letter code [#332] 2015-09-10 11:43:25 +02:00
rgarcia
a8edad2ab6 refactors stats page 2015-09-10 11:03:48 +02:00
rgarcia
9360c0090e tracks level 2 verified users 2015-09-10 11:03:31 +02:00
rgarcia
6a09e6548d reverts - stats with delayed jobs 2015-09-09 19:17:13 +02:00
rgarcia
d7f046bd3b displays total stat count 2015-09-09 14:41:19 +02:00
rgarcia
e555126331 tracks debate visits from the controller 2015-09-09 14:41:19 +02:00
Raimond Garcia
b54e4e8649 Merge pull request #437 from AyuntamientoMadrid/debate-moderation-2
Bulk moderation
2015-09-08 20:55:51 +02:00
kikito
b9ebe8c2c4 Implements basic bulk debates functionality 2015-09-08 19:44:50 +02:00
kikito
f46b17e19b Introduces User#block method 2015-09-08 19:08:47 +02:00
Enrique García
5e13fe60f7 Merge pull request #436 from AyuntamientoMadrid/organizations-with-hidden-users
show info of hidden users in admin/organizations
2015-09-08 18:40:52 +02:00
Juanjo Bazán
6bf8af3526 show info of hidden users in admin/organizations 2015-09-08 18:06:23 +02:00
rgarcia
339e978237 default order confidence_score for home and debate index 2015-09-08 14:47:58 +02:00
Enrique García
3652de4a8f Merge pull request #412 from AyuntamientoMadrid/moderation-user-block
Moderation user block
2015-09-07 18:27:57 +02:00
Juanjo Bazán
af6cb16e9b adds banned users section to moderation zone 2015-09-07 17:56:53 +02:00
kikito
980728279f Adds registration "success" intermediate page 2015-09-07 17:23:59 +02:00
Raimond Garcia
5b671ce623 Merge pull request #387 from AyuntamientoMadrid/improve_design
Improve design
2015-09-07 01:08:58 +02:00
rgarcia
8d2d86f0c0 adds terms of services to organizations 2015-09-07 01:01:00 +02:00
rgarcia
17ce1f9d07 adds terms of service to users 2015-09-07 01:00:43 +02:00
Juanjo Bazán
9104242eed adds pending filter to admin/users 2015-09-06 21:58:34 +02:00
Juanjo Bazán
bc90812d37 adds pending filter to admin/comments 2015-09-06 21:45:41 +02:00
Juanjo Bazán
1a7806150a adds pending filter to admin/debates 2015-09-06 21:42:22 +02:00
kikito
e9dc0d54cd uses secrets variable to decide when to use http_auth 2015-09-06 18:36:31 +02:00
Juanjo Bazán
3845e6bfd2 shows visible children of hidden comments
Fixes #368
2015-09-06 12:55:44 +02:00
rgarcia
afea21c2bc fixes exception when not logged in 2015-09-06 11:26:15 +02:00
Enrique García
c28c39e052 Merge pull request #371 from AyuntamientoMadrid/residence_verification_tries
increases residence verification tries only after a Census call
2015-09-06 00:03:36 +02:00
rgarcia
34218d112b increases residence verification tries after a Census call 2015-09-05 23:57:47 +02:00
rgarcia
e751c53a5d converts necessary variables to instance variables 2015-09-05 22:02:51 +02:00
Raimond Garcia
17ebb07daf Merge pull request #367 from AyuntamientoMadrid/blog
adds nicer blog url
2015-09-05 20:26:22 +02:00
Juanjo Bazán
5d5de36ad1 adds spec for info pages 2015-09-05 20:16:20 +02:00
rgarcia
2bc1b5f1a5 adds nicer blog url 2015-09-05 19:57:33 +02:00
Juanjo Bazán
b020795d3d adds search to debates index 2015-09-05 15:20:46 +02:00
Juanjo Bazán
63378ba24c makes 'pending' filter the default in /admin/orgs 2015-09-04 22:39:07 +02:00
Juanjo Bazán
4ef2ed753d makes 'pending' filter the default in /moderation 2015-09-04 22:39:07 +02:00
Juanjo Bazán
2a4c29c7ca Merge branch 'master' into hot-score-347 2015-09-04 14:59:51 +02:00
kikito
08c31c5985 calls all the sorting scopes the same way 2015-09-04 14:17:59 +02:00
kikito
b6699932d1 uses the hot_score in the welcome screen 2015-09-04 14:16:05 +02:00
kikito
19e6740ee4 Refactors has_filters.rb 2015-09-04 11:50:29 +02:00
kikito
7c3ca55de1 Adds the default score selector/controller. Refactors debates specs 2015-09-04 11:50:07 +02:00
rgarcia
d0d33cc517 sends custom emails with delayed jobs 2015-09-03 22:48:29 +02:00
Juanjo Bazán
559b60e63f adds random order to debates' index 2015-09-03 18:50:19 +02:00
Juanjo Bazán
dbfa35c444 adds 'most commented' order to debates 2015-09-03 18:31:16 +02:00
Juanjo Bazán
cd3806476f removes 'most voted' order from debates 2015-09-03 18:20:12 +02:00
Juanjo Bazán
bcb1f2ba72 adds order by score to debates 2015-09-03 18:13:48 +02:00
Juanjo Bazán
358028c3e6 Fixes conflicts. Merge branch 'master' into ancestry 2015-09-03 16:37:28 +02:00
Juanjo Bazán
136c1e73ed uses ancestry to retrieve debate comments 2015-09-03 16:32:54 +02:00
Enrique García
aa22c82a5c Merge pull request #331 from AyuntamientoMadrid/letter_verification
Letter verification
2015-09-03 12:38:08 +02:00
kikito
e2b405083c merges master and fixes conflicts 2015-09-03 12:02:16 +02:00