Commit Graph

390 Commits

Author SHA1 Message Date
rgarcia
1fb2211776 removes unused validation errors [#395] 2015-09-10 14:27:37 +02:00
rgarcia
cd74744e06 adds validation error for letter verification code [#395] 2015-09-10 14:27:02 +02:00
rgarcia
16dd609ad0 adds verification tries to letter code [#332] 2015-09-10 11:43:25 +02:00
Raimond Garcia
02c101cd97 Merge pull request #453 from AyuntamientoMadrid/ie8
Ie8
2015-09-09 23:51:31 +02:00
Alberto Garcia Cabeza
dba3385a6c Adds rem and respond js 2015-09-09 20:32:38 +02:00
Raimond Garcia
9e4fdec28e Merge pull request #444 from AyuntamientoMadrid/deploy-custom-branch-357
Deploy custom branch 357
2015-09-09 19:57:40 +02:00
kikito
f8d6dd4ca7 strings to symbols 2015-09-09 19:49:09 +02:00
kikito
e7e1663b26 makes staging the only variable server. uses ENV and defaults to master 2015-09-09 19:46:26 +02:00
rgarcia
6a09e6548d reverts - stats with delayed jobs 2015-09-09 19:17:13 +02:00
Raimond Garcia
bab31b0559 Merge pull request #448 from AyuntamientoMadrid/caches
Cache for comments
2015-09-09 17:01:11 +02:00
Juanjo Bazán
811c329199 changes how comment.created_at is shown
time_ago_in_words is not cache friendly
2015-09-09 14:57:27 +02:00
rgarcia
dca7e1e38f moves stats storing to queue 2015-09-09 14:41:19 +02:00
rgarcia
cdc914de0d moves storing of visits to queue 2015-09-09 14:41:19 +02:00
kikito
2f983198d7 default to custom branch in staging and pre 2015-09-09 12:45:09 +02:00
kikito
8fb62a3b35 asks for the branch to deploy instead of immediately deploying master in staging & pre 2015-09-09 12:37:33 +02:00
Juanjo Bazán
55b2f96062 changes sentence 2015-09-09 11:05:48 +02:00
Juanjo Bazán
a51198dab6 Merge pull request #430 from AyuntamientoMadrid/desing_improves
Desing improves
2015-09-09 11:04:35 +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
48ba9a436d adds select all/none to bulk moderation 2015-09-08 20:46:18 +02:00
kikito
b9ebe8c2c4 Implements basic bulk debates functionality 2015-09-08 19:44:50 +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
0ba5f9a434 configures newrelic 2015-09-08 17:42:09 +02:00
rgarcia
339e978237 default order confidence_score for home and debate index 2015-09-08 14:47:58 +02:00
Alberto Garcia Cabeza
5b7cda2233 Adds message info on debate new form 2015-09-08 14:47:32 +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
f2426e09fa adds users to moderator's menu 2015-09-07 17:57:08 +02:00
Juanjo Bazán
af6cb16e9b adds banned users section to moderation zone 2015-09-07 17:56:53 +02:00
Juanjo Bazán
c7ff431160 configures routes for moderation/users 2015-09-07 17:56:19 +02:00
Juanjo Bazán
64a0046e45 Merge pull request #408 from AyuntamientoMadrid/registration-success-390
Adds registration "success" intermediate page
2015-09-07 17:32:30 +02:00
kikito
980728279f Adds registration "success" intermediate page 2015-09-07 17:23:59 +02:00
Raimond Garcia
b3b4b79f41 Merge pull request #406 from AyuntamientoMadrid/improves_styles
Improves styles
2015-09-07 16:57:20 +02:00
Alberto Garcia Cabeza
b096cfee50 Updates texts 2015-09-07 16:37:02 +02:00
kikito
1a855b2a90 Fixes error which prevented executing cap -T 2015-09-07 13:03:11 +02:00
Raimond Garcia
5b671ce623 Merge pull request #387 from AyuntamientoMadrid/improve_design
Improve design
2015-09-07 01:08:58 +02:00
Alberto Garcia Cabeza
6825409744 Comments unused keys 2015-09-07 00:23:10 +02:00
Alberto Garcia Cabeza
eedd919424 Improves styles and texts for devise pages 2015-09-07 00:16:54 +02:00
Alberto Garcia Cabeza
a7e593c039 Updates texts 2015-09-07 00:15:39 +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
rgarcia
554d58b620 comments out custom capistrano asset task 2015-09-06 17:04:25 +02:00
rgarcia
c6886cfad6 fixes typo 2015-09-06 13:42:31 +02:00
rgarcia
994af94253 enables rollbar in staging env 2015-09-06 13:38:19 +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
ae872b88ac updates blog link 2015-09-05 20:15:31 +02:00
Juanjo Bazán
b020795d3d adds search to debates index 2015-09-05 15:20:46 +02:00
Alberto Garcia Cabeza
54eeff41b7 Adds search form to sidebar 2015-09-05 14:01:59 +02:00
Juanjo Bazán
1b51738be6 updates blog link 2015-09-05 12:29:05 +02:00
Raimond Garcia
8c678c88e8 Merge pull request #364 from AyuntamientoMadrid/error_pages
Error pages
2015-09-05 00:49:53 +02:00