Commit Graph

363 Commits

Author SHA1 Message Date
kikito
2c04cd07d9 Adds independent welcome screen 2015-09-10 17:40:54 +02:00
kikito
b9ebe8c2c4 Implements basic bulk debates functionality 2015-09-08 19:44:50 +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
c7ff431160 configures routes for moderation/users 2015-09-07 17:56:19 +02:00
kikito
980728279f Adds registration "success" intermediate page 2015-09-07 17:23:59 +02:00
rgarcia
99d779bcec adds letter code verification 2015-09-02 21:57:03 +02:00
Juanjo Bazán
84feeba085 adds pages controller for static pages 2015-08-29 19:32:08 +02:00
Juanjo Bazán
0f1329fa85 implements organizations search for admins 2015-08-29 16:30:32 +02:00
Jose Manuel
ef1f89ab84 Merge branch 'refactored_moderator' into master 2015-08-29 02:15:26 +01:00
Jose Manuel
e21336aeff Refactored admin´s moderator controller 2015-08-29 01:39:46 +01:00
kikito
cb99996317 merges master and fix conflicts 2015-08-28 13:23:30 +02:00
rgarcia
01a5a0387d adds routes 2015-08-28 00:00:03 +02:00
kikito
fb9d3097cc Finishes admin interface for debates 2015-08-27 19:05:27 +02:00
kikito
cd982768f2 Renames the "archive" action to "ignore_flag" (+)
* archived_at -> ignored_flag_at
* archived? -> ignored_flag?
* archive -> ignore_flag
* pending -> pending_flag_review
* archived (scope) -> with_ignored_flag
* I18n changes
2015-08-27 11:43:58 +02:00
kikito
909dfb4ce3 Several renamings
InappropiateFlag -> Flag
x.flag_as_inappropiate -> x.flag
x.undo_flag_as_inappropiate -> x.unflag
X.flagged_as_inappropiate -> x.flagged
flag-as-inappropiate-actions views & css -> flag-actions views & css
2015-08-27 10:48:49 +02:00
Jose Manuel
3baef4ae79 Merge branch 'master' of github.com:AyuntamientoMadrid/participacion 2015-08-26 21:40:44 +01:00
kikito
6110284356 removes all references to "review" (replaced by "archive") 2015-08-26 13:48:57 +02:00
Alberto Garcia Cabeza
82c404092a fixes conflicts [#226] 2015-08-25 16:53:11 +02:00
Jose Manuel
d84e80c379 Merge branch '134_create_moderator' 2015-08-25 00:07:42 +01:00
David Gil
158e203936 adds omniauth basic authentication process with Twitter, including an intermediate step to ask the user for her email if not provided by the OAuth provider - Twitter, for instance 2015-08-24 20:24:54 +02:00
kikito
5e31a9f338 adds a new "organization sigup success" view. Related with #226 2015-08-24 14:34:58 +02:00
Jose Manuel
982dc180cc Adds moderators config to admin console 2015-08-24 01:50:01 +01:00
kikito
b4bd70436a Adds routes for new methods in comment & debate moderation 2015-08-21 21:57:00 +02:00
kikito
ee881230ba merges master and fixes conflicts 2015-08-20 18:50:10 +02:00
kikito
e7effbf77c Allows flagging comments as inappropriate 2015-08-20 18:47:16 +02:00
Juanjo Bazán
aff366827d removes unused route 2015-08-20 16:14:22 +02:00
Juanjo Bazán
f0a6926710 adds restore user action for administrators 2015-08-20 16:06:23 +02:00
Juanjo Bazán
b340d7741a adds hiding users by moderators 2015-08-20 13:16:37 +02:00
kikito
b28f63b016 merges master and fixes conflicts 2015-08-18 09:35:13 +02:00
Juanjo Bazán
7e1cd2940d Fix conflicts 2015-08-17 21:08:15 +02:00
Juanjo Bazán
5c630ac41d adds settings area to admin 2015-08-17 18:38:57 +02:00
kikito
9e1581656a merges master and fixes conflicts 2015-08-17 17:38:34 +02:00
Juanjo Bazán
fabcb42328 adds edition/management of officials to admin zone 2015-08-17 17:04:29 +02:00
rgarcia
f31ed2940d adds moderation to comments and debates [#136] 2015-08-17 13:39:31 +02:00
kikito
3096a73892 Moves organization verification to Admin from Moderation 2015-08-17 13:22:38 +02:00
kikito
8ca546a431 merges master and fixes conflicts 2015-08-17 02:40:11 +02:00
kikito
9af1f2f4a9 Adds registration controller for organizations 2015-08-17 01:16:07 +02:00
kikito
de73eac2d0 Moves the registrations controller to users/registrations
This is necessary because rails gets confused when it has a a “root”
registration_controller and another non-root one. The non-root one uses
the views from the root.
2015-08-17 01:16:07 +02:00
David Gil
a4ec38d752 adds create and destroy to the tags CRUD 2015-08-15 20:01:52 +02:00
David Gil
0a4aafd8de scaffolds a tag list to mark tags as featured on the admin section 2015-08-15 18:22:29 +02:00
kikito
4e5d53f2f1 Updates the Moderation Organisation controller 2015-08-13 20:05:32 +02:00
kikito
a59ef10e44 adds organization controller, with views and tests 2015-08-12 18:26:12 +02:00
rgarcia
4dd7e14ac4 moves featured debates to home page 2015-08-11 17:26:25 +02:00
Eloy Gomez
fe2080aff9 Display some stats 2015-08-08 14:33:44 +02:00
kikito
8d83607331 Implements dashboard controllers & views for admin & moderation 2015-08-07 17:20:28 +02:00
rgarcia
fa5b678b69 fixes conflicts with master [#25] 2015-08-05 13:47:23 +02:00
rgarcia
91b52ad8d2 refactors voting implementation [#25] 2015-08-05 12:24:22 +02:00
rgarcia
44ae7078ea adds routes to votable comments and debates [#25] [#25] 2015-08-02 13:36:39 +02:00
Juanjo Bazán
e2f7b9c505 adds letter_opener 2015-07-31 13:51:31 +02:00
Juanjo Bazán
8f6e5ecfc8 adds basic 'my account' page
Fields related with authentication are not included
because the auth system will change to integrate with 
Madrid.es's Ciudadano360
ref: #22
2015-07-30 17:36:32 +02:00