Commit Graph

366 Commits

Author SHA1 Message Date
Juanjo Bazán
cfe583fbe6 adds cache to votes on Comments 2015-08-25 16:26:36 +02:00
Alberto Garcia Cabeza
8037a82fef Adds styles to moderation admin 2015-08-25 15:19:54 +02:00
David Gil
026db24b2a split long method into shorter, SRPer ones 2015-08-25 13:10:39 +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
David Gil
f0e47ee787 adds Identity model and migration 2015-08-24 20:24:10 +02:00
Juanjo Bazán
030fd49120 allows comment as moderator/administrator
Ref: #170
2015-08-24 18:17:04 +02:00
Juanjo Bazán
57228636c4 adds as_moderator/administrator methods to comment 2015-08-24 17:47:09 +02:00
Juanjo Bazán
3085f265d8 adds abilities for commenting as moderator/admin 2015-08-24 13:17: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
4f0c49f921 Changes moderation/comments to allow for different commentable_types 2015-08-22 09:15:20 +02:00
kikito
2c49d30952 Adds review-related methods to comment & debate 2015-08-21 21:58:48 +02:00
kikito
5e32fd2fa4 Adds new abilities for moderators
extends hiding (i.e. you can not hide your own content or yourself) and
adds marking as reviewed
2015-08-21 20:39:40 +02:00
kikito
0fe7740a41 Refactors ability making flagging more efficient 2015-08-21 20:36:04 +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
ee881230ba merges master and fixes conflicts 2015-08-20 18:50:10 +02:00
kikito
246145e4cb adds abilities for regular users 2015-08-20 18:45:32 +02:00
Juanjo Bazán
896fe41db0 favors with_hidden 2015-08-20 17:52:59 +02:00
kikito
8944327405 adds InappropiateFlag model with relations and specs 2015-08-20 16:03:00 +02:00
Juanjo Bazán
b340d7741a adds hiding users by moderators 2015-08-20 13:16:37 +02:00
Juanjo Bazán
259aa29de7 adds new abilities 2015-08-20 13:16:37 +02:00
Juanjo Bazán
bd16e9345a adds paranoia to User 2015-08-20 13:16:37 +02:00
Juanjo Bazán
10d7e9effe changes to unambiguous order declaration.
Specified as a string referred table of 'created_at' was ambiguous, index failed when filtering by tag
2015-08-19 16:32:39 +02:00
kikito
21c2fa2e3d Adds user.verified_organization? 2015-08-19 12:08:03 +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
Juanjo Bazán
7e1cd2940d Fix conflicts 2015-08-17 21:08:15 +02:00
Eloy Gomez
5d91663016 Add a helper for build c3.js chart compatible data 2015-08-17 19:13:56 +02:00
Juanjo Bazán
a13f4920a1 adds Settings 2015-08-17 18:13:30 +02:00
kikito
c3bee45eda fixes error in abilities 2015-08-17 17:59:23 +02:00
kikito
9e1581656a merges master and fixes conflicts 2015-08-17 17:38:34 +02:00
kikito
c1a6a37651 Removes user_id validation from Organisations 2015-08-17 17:11:17 +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
8390165ba8 adds official scope 2015-08-17 15:22:49 +02:00
Juanjo Bazán
e29ae67f31 adds methods to add/remove official position 2015-08-17 15:22:49 +02:00
Juanjo Bazán
d80fd8e468 adds official? method to User 2015-08-17 15:22:49 +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
8ca546a431 merges master and fixes conflicts 2015-08-17 02:40:11 +02:00
kikito
9343952d52 Adds User.organization_attributes 2015-08-17 01:16:07 +02:00
rgarcia
9abe303b31 removes unused method 2015-08-16 23:05:01 +02:00
rgarcia
bea38226fe fixes spacing 2015-08-16 22:45:43 +02:00
rgarcia
9f2d60c4ce refactors voted debates 2015-08-15 14:57:41 +02:00
rgarcia
4751954377 refactors debate search 2015-08-15 14:57:04 +02:00
kikito
60a1cc2267 Adds User.is_organization and User.organization_name 2015-08-14 20:24:19 +02:00
kikito
976c88177d Updates User model, moving org stuff to Organisation model 2015-08-13 20:04:57 +02:00
kikito
bdf462c16b Adds new Organization model 2015-08-13 20:04:21 +02:00