Commit Graph

20144 Commits

Author SHA1 Message Date
rgarcia
9a4d4770ea styling Readmes header 2015-09-07 18:57:53 +02:00
rgarcia
83bfdf4ee0 updates Readme for Consul 0.9 2015-09-07 18:51:19 +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
541563a3eb Merge pull request #411 from AyuntamientoMadrid/refactors_conflictive_debates
Refactors conflictive debates
2015-09-07 18:06:06 +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
rgarcia
8f778ace26 removes focus and fixes specs 2015-09-07 17:44:01 +02:00
rgarcia
bb5e18e609 refactors conflictive debates 2015-09-07 17:43:48 +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
Juanjo Bazán
f9304e5fd1 Merge pull request #409 from AyuntamientoMadrid/conflictive_debates
Conflictive debates
2015-09-07 17:29:05 +02:00
kikito
922c63aebe style 2015-09-07 17:28:14 +02:00
rgarcia
6606d776f8 expires debate cache after a new flag 2015-09-07 17:24:53 +02:00
kikito
980728279f Adds registration "success" intermediate page 2015-09-07 17:23:59 +02:00
rgarcia
f11220206a displays alert for conflictive debates 2015-09-07 17:17:33 +02:00
rgarcia
4ce95e2735 adds conflictive debates 2015-09-07 16:58:00 +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
0bda3fefad Adds alerts message for flag debates 2015-09-07 16:37:58 +02:00
Alberto Garcia Cabeza
56946b73ea Adds links on footer titles 2015-09-07 16:37:11 +02:00
Alberto Garcia Cabeza
b096cfee50 Updates texts 2015-09-07 16:37:02 +02:00
Alberto Garcia Cabeza
101a50a96e Improves layout styles 2015-09-07 16:36:33 +02:00
Juanjo Bazán
1c0622adf9 Merge pull request #402 from AyuntamientoMadrid/admins-moderating
Changes views so that administrators can see the debate moderation actions
2015-09-07 16:03:26 +02:00
kikito
75c9e87357 Changes views so that administrators can see the debate moderation actions 2015-09-07 15:57:45 +02:00
kikito
1f70bbaf50 adds favicon.ico to public, so that layout-less views get it without error 2015-09-07 13:39:24 +02:00
Raimond Garcia
91075b844f Merge pull request #398 from AyuntamientoMadrid/cache-votes
adds user's votes info to cache keys
2015-09-07 13:23:26 +02:00
Raimond Garcia
24f2131cc2 Merge pull request #397 from AyuntamientoMadrid/cache-tasks
Cache tasks
2015-09-07 13:23:03 +02:00
Juanjo Bazán
69cb070ce2 adds user's votes info to cache keys 2015-09-07 13:18:30 +02:00
kikito
12bf3856c1 adds a capistrano task to clear memcached easily 2015-09-07 13:15:56 +02:00
kikito
d575430645 Adds rake task for clearing the cache 2015-09-07 13:03:29 +02:00
kikito
1a855b2a90 Fixes error which prevented executing cap -T 2015-09-07 13:03:11 +02:00
Enrique García
ba2cf230d5 Merge pull request #392 from AyuntamientoMadrid/remove_comment_cache
removes all comments cache
2015-09-07 10:57:35 +02:00
rgarcia
13cf1d9449 removes all comments cache 2015-09-07 10:55:23 +02:00
Raimond Garcia
e2131a7327 Merge pull request #391 from AyuntamientoMadrid/comment-form-cache
removes cache from comment form
2015-09-07 10:50:41 +02:00
kikito
601323b5a3 removes cache from comment form 2015-09-07 10:50:03 +02:00
Juanjo Bazán
94047d14ed Merge pull request #389 from AyuntamientoMadrid/design_fixes
Design fixes
2015-09-07 09:39:03 +02:00
Alberto Garcia Cabeza
4513436d37 Adds new section on more information page 2015-09-07 09:36:45 +02:00
Alberto Garcia Cabeza
d3256881c3 Fixes header 2015-09-07 09:25:25 +02:00
Alberto Garcia Cabeza
96f8ea4415 Changes title and updates email header image 2015-09-07 09:22:52 +02:00
Juanjo Bazán
a23ef5b980 Merge pull request #388 from AyuntamientoMadrid/hot-score-index
Add missing db index in debate.hot_score
2015-09-07 08:55:13 +02:00
kikito
5a1646d2ff Add missing db index in debate.hot_score 2015-09-07 08:51:56 +02:00
Raimond Garcia
5b671ce623 Merge pull request #387 from AyuntamientoMadrid/improve_design
Improve design
2015-09-07 01:08:58 +02:00
rgarcia
30073ca820 fixes spec 2015-09-07 01:04:53 +02:00
rgarcia
e14afd3db6 adds terms of services to seeds 2015-09-07 01:01:21 +02:00
rgarcia
2cd997ce46 fixes specs 2015-09-07 01:01:10 +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
Alberto Garcia Cabeza
6825409744 Comments unused keys 2015-09-07 00:23:10 +02:00
Alberto Garcia Cabeza
2aac7b413c Improves styles for index, header and footer 2015-09-07 00:17:21 +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