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 |
|
kikito
|
2c04cd07d9
|
Adds independent welcome screen
|
2015-09-10 17:40:54 +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 |
|