Commit Graph

2603 Commits

Author SHA1 Message Date
David Gil
6b5eafd06c uses ActsAsTaggableOn.named rather than SQL to check for an existing Tag 2015-09-17 14:26:01 +02:00
Juanjo Bazán
df72ece3c4 [admin/comments] remove comments of blocked users 2015-09-17 13:54:15 +02:00
Juanjo Bazán
563cecb2e7 changes default order in moderation/proposals 2015-09-15 22:49:01 +02:00
David Gil
e2e7f8c2f2 uses case insensitive for tag filter in debates 2015-09-15 14:36:08 +02:00
Juanjo Bazán
b4312fbbfc changes pages routes to static 2015-09-15 12:04:12 +02:00
kikito
79a99ce595 Makes hot_score the default order in proposals & debates 2015-09-15 09:27:55 +02:00
Juanjo Bazán
817b5806ba adds video_url to proposals 2015-09-14 21:40:03 +02:00
rgarcia
e0ed7bd4c0 Merge branch 'proposals' of github.com:AyuntamientoMadrid/participacion into proposals 2015-09-14 20:09:13 +02:00
rgarcia
6b15ccafe2 adds summary to proposals 2015-09-14 20:07:27 +02:00
Juanjo Bazán
e5531aba87 moves highlights and default home page 2015-09-14 19:49:09 +02:00
Alberto Garcia Cabeza
0b2cf1e2bb Changes final verification step page 2015-09-14 19:18:50 +02:00
rgarcia
58357dad2c removes featured debates and proposals 2015-09-14 19:06:16 +02:00
Juanjo Bazán
a661bdccdb moves signed_in_home to highlights 2015-09-14 17:32:19 +02:00
Juanjo Bazán
bab90382f1 Merge branch 'proposals' of github.com:AyuntamientoMadrid/participacion into proposals 2015-09-14 17:06:41 +02:00
Juanjo Bazán
00f4acc7c2 refactors highlights 2015-09-14 17:00:59 +02:00
rgarcia
c9e46e3d8f fixes conflicts 2015-09-14 16:46:00 +02:00
rgarcia
e9e339fa50 adds responsible name to proposals 2015-09-14 16:43:32 +02:00
Juanjo Bazán
1e96bba262 refactors account's email config 2015-09-14 14:09:24 +02:00
kikito
3df8fe59b3 implements /admin/proposals 2015-09-14 11:30:58 +02:00
kikito
9d253b0477 Implements Proposals moderation controller 2015-09-13 22:08:30 +02:00
rgarcia
6641c380bc fixing conflicts 2015-09-13 22:00:59 +02:00
rgarcia
ad8880d02c adds proposal votes 2015-09-13 21:56:52 +02:00
Alberto Garcia Cabeza
94285d5ffc Adds pages to more information section 2015-09-13 20:22:02 +02:00
kikito
356f1c29ce Allows moderators to hide proposals from index 2015-09-13 14:39:38 +02:00
Juanjo Bazán
9928f8a85c adds basic activity page as signed_in_home 2015-09-13 14:25:52 +02:00
kikito
c4e10612c1 Enables flagging proposals 2015-09-13 12:59:12 +02:00
kikito
463ec8a2b4 Merge branch 'master' into proposals 2015-09-13 12:57:33 +02:00
rgarcia
f3af263e68 adds crud specs for proposals 2015-09-13 11:47:57 +02:00
Juanjo Bazán
dbdd149c06 redirects user to sms if no verified data
Fixes #433
2015-09-12 21:42:17 +02:00
kikito
5903ebe857 merges master and fix conflicts 2015-09-12 19:54:15 +02:00
Juanjo Bazán
d8c9974d1a adds responsible_name to org's account page 2015-09-12 18:16:40 +02:00
Juanjo Bazán
6b0edac6fc adds responsible_name to organizations 2015-09-12 18:16:14 +02:00
Juanjo Bazán
d6c52ec866 puts organizations out of verification process 2015-09-12 18:05:51 +02:00
kikito
390b5bb5f1 Adds order specs to proposals feature 2015-09-12 16:48:41 +02:00
kikito
1caf6348a9 Extract HasOrders + partial from DebatesController 2015-09-12 16:48:41 +02:00
Juanjo Bazán
65d86d8b5f makes comments controller commentable agnostic 2015-09-12 14:12:37 +02:00
rgarcia
90744e6588 adds external link 2015-09-12 13:02:37 +02:00
rgarcia
3fc4cf0c1b adds proposal's index 2015-09-12 12:47:28 +02:00
rgarcia
845ca22152 adds proposal edit 2015-09-12 12:35:54 +02:00
rgarcia
f2b917d486 adds proposal show 2015-09-12 12:30:20 +02:00
rgarcia
3f7338a6ae adds proposal new and create 2015-09-12 11:38:22 +02:00
Juanjo Bazán
f517d7f410 adds before action for verified users 2015-09-11 16:44:52 +02:00
Juanjo Bazán
bc86d81302 adds verification controller 2015-09-11 14:40:51 +02:00
Juanjo Bazán
728dd28acf Merge pull request #460 from dgilperez/improve_comment_email_delivery_logic
Prevents users to receive email notifications about own comments and replies
2015-09-10 20:45:17 +02:00
rgarcia
abc68dc868 refactors lock tries [#279] 2015-09-10 20:26:49 +02:00
Enrique García
c1c213f773 Merge pull request #461 from AyuntamientoMadrid/final_verification-395
Final letter verification
2015-09-10 20:22:42 +02:00
rgarcia
b7c1b4acee renames verify? methods [#395] 2015-09-10 20:08:11 +02:00
David Gil
3f652262e7 makes the controller send the emails instead of Comment model 2015-09-10 18:47:45 +02:00
David Gil
d9300f1c10 prevents users to receive email notifications about own comments and replies 2015-09-10 18:46:00 +02:00
kikito
249aed42c4 Makes welcome screen work using a sessions controller 2015-09-10 17:41:37 +02:00