Juanjo Bazán
e33723635b
moves Email model to Verification namespace
2015-08-29 12:26:20 +02:00
Juanjo Bazán
e6fd62189b
moves Sms model to Verification namespace
2015-08-29 12:17:27 +02:00
Juanjo Bazán
50dcbcdf9b
moves Letter to Verification namespace
2015-08-29 12:07:43 +02:00
Juanjo Bazán
1353a1c64b
Merge pull request #274 from AyuntamientoMadrid/refactor-selects
...
Refactor selects
2015-08-29 11:36:38 +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
ae98ba3572
merges master and fixes conflicts
2015-08-28 19:57:28 +02:00
Raimond Garcia
b1117dd1af
Merge pull request #275 from mlovic/filter-topic
...
Allow debates to be filtered by topic
2015-08-28 17:41:38 +02:00
rgarcia
fe9586bc29
adds password protection for staging and production servers
2015-08-28 17:27:14 +02:00
kikito
cb99996317
merges master and fix conflicts
2015-08-28 13:23:30 +02:00
Marko Lovic
4285ba4bb3
Add tag filter to debates page
2015-08-28 12:41:10 +02:00
kikito
9328e1401f
Adds user admin capabilities and missing i18n entries
2015-08-28 12:00:18 +02:00
kikito
a5e48693fe
Implements admin interface for Comments incl. filters
2015-08-28 10:56:43 +02:00
rgarcia
f7d22f64b6
adds letter verification
2015-08-27 23:58:31 +02:00
rgarcia
570f67195c
adds email verification
2015-08-27 23:57:04 +02:00
rgarcia
3fc8d830f1
adds verified users concept
2015-08-27 23:56:10 +02:00
rgarcia
671399bb89
adds sms verification
2015-08-27 23:54:57 +02:00
rgarcia
07180bcd04
adds residence verification
2015-08-27 23:53:49 +02:00
kikito
76c2f2f021
Merge branch 'master' into flag-renaming
2015-08-27 19:06:29 +02:00
kikito
fb9d3097cc
Finishes admin interface for debates
2015-08-27 19:05:27 +02:00
Marko Lovic
b6df3be8c0
Change Debate.sort_by method for individual scopes
2015-08-27 15:24:59 +02:00
Marko Lovic
6f32801a88
Change names of debate order filters
...
* 'news' to 'created_at'
* 'votes' to 'total_votes'
* 'rated' to 'likes'
2015-08-27 15:24:59 +02:00
Marko Lovic
2d48966de3
Change variable name and references from "filter" to "order"
2015-08-27 15:24:59 +02:00
Marko Lovic
ccaca54816
Add filters to specify order of debates#index
2015-08-27 15:24:59 +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
b9634cffab
Adds User#for_render
2015-08-26 19:41:55 +02:00
kikito
48ef4df0c3
Adds Comment#for_render
2015-08-26 19:41:42 +02:00
kikito
9112cacde4
Adds Debate#for_render
2015-08-26 19:40:37 +02:00
kikito
6110284356
removes all references to "review" (replaced by "archive")
2015-08-26 13:48:57 +02:00
kikito
c183cf2cc6
merges master and fix conflicts
2015-08-25 19:31:25 +02:00
Alberto Garcia Cabeza
82c404092a
fixes conflicts [ #226 ]
2015-08-25 16:53:11 +02:00
Alberto Garcia Cabeza
8037a82fef
Adds styles to moderation admin
2015-08-25 15:19:54 +02:00
David Gil
8d0ba2fe33
cleans up unused variable
2015-08-25 15:07:36 +02:00
David Gil
59aede5b00
adds Google OAuth2 support
2015-08-25 14:15:24 +02:00
Jose Manuel
d84e80c379
Merge branch '134_create_moderator'
2015-08-25 00:07:42 +01:00
David Gil
86dccac9c6
adds support for Facebook OAuth
2015-08-24 20:24:54 +02:00
David Gil
ddcef1a0f2
remove unused and locales
2015-08-24 20:24:54 +02: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
Juanjo Bazán
82fb56e4c0
refactors comments controller ugly method
2015-08-24 18:59:53 +02:00
Juanjo Bazán
030fd49120
allows comment as moderator/administrator
...
Ref: #170
2015-08-24 18:17:04 +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
c88f7c1f30
merges master and fixes conflicts
2015-08-23 20:27:11 +02:00
kikito
5eeaa7d189
implements /moderation/debates
2015-08-22 23:20:55 +02:00
kikito
169809496e
Adds filters & refactors to comment moderation
2015-08-22 20:28:48 +02:00
kikito
9785749057
Refactors organization factories & admin controller
2015-08-22 19:46:28 +02:00
kikito
00b51bbc23
Adds first version of comment moderation
...
Missing:
* Ensure removing a flag updates the flagged_at attribute correctly
* Showing the debate when the comment is not a “root”
* Filter (pending / reviewed / all)
* Order
* Same for debates
2015-08-21 22:01:47 +02:00
Raimond Garcia
a9a8359bc7
Merge pull request #216 from AyuntamientoMadrid/design_improvements
...
Design improvements
2015-08-21 20:17:34 +02:00
