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
Alberto Garcia Cabeza
ff6285d114
Improves general styles
2015-08-21 18:57:09 +02:00
Juanjo Bazán
b396a3b415
refactors user's registration
...
Simplifies process and fields:
* In: username
* Out: first_name, last_name, phone, nickname, use_nickname?
Closes #213
2015-08-21 16:41:08 +02:00
kikito
01eb89f5f4
DRYes comment views related with flagging as inappropiate
2015-08-20 22:54:05 +02:00
kikito
12e8cf2056
Allows flagging debates as inappropriate
2015-08-20 19:26:36 +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
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
5c3f664da4
Fixes links in Admin::Organizations to handle filters + pages
2015-08-20 00:50:50 +02:00
Juanjo Bazán
fda8412ed3
adds pagination to admin lists
...
Ref: #80
2015-08-19 16:32:40 +02:00
Juanjo Bazán
3732b7f420
adds pagination to 1st level comments in debate
...
Ref: #80
2015-08-19 16:32:39 +02:00
Juanjo Bazán
947514fbfc
adds pagination to debates#index
...
Ref: #80
2015-08-19 16:30:25 +02:00
Juanjo Bazán
ced2a05063
adds eager loading to avoid N+1 queries
2015-08-18 16:54:49 +02:00
kikito
b28f63b016
merges master and fixes conflicts
2015-08-18 09:35:13 +02:00
rgarcia
32f2a4f2a1
adds admin verification to view stats
2015-08-17 22:30:24 +02:00
Juanjo Bazán
862a239d87
fixes specs and makes stats for admins eyes only
2015-08-17 22:00:54 +02:00
Juanjo Bazán
7e1cd2940d
Fix conflicts
2015-08-17 21:08:15 +02:00
Eloy Gomez
5b0cd4a8ba
Show charts using c3.js
2015-08-17 19:15:17 +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
Juanjo Bazán
d758958b9b
removes layout from admin tags controller
...
layout is inherited from admin base controller
2015-08-17 15:22:50 +02:00
kikito
1c435eacbe
adds filters to admin/organizations
2015-08-17 14:25:43 +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
ae21209920
Moves the layout to admin::BaseController and moderation::BaseController
2015-08-17 13:20:52 +02:00
kikito
8ca546a431
merges master and fixes conflicts
2015-08-17 02:40:11 +02:00
