Commit Graph

2701 Commits

Author SHA1 Message Date
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
kikito
b4b69d89e7 Updates abilities for the new organisations
Note that unverified organisations can now create debates and comments
- that is a change over the initial request
2015-08-13 20:03:38 +02:00
kikito
674e2c5b8c Adds User.organizations scope 2015-08-12 17:49:01 +02:00
kikito
450b0098c6 Adds abilities for verifying/rejecting organizations 2015-08-12 17:48:25 +02:00
David Gil
1227ce7c08 clean up tags_count_out_of_limit 2015-08-12 17:34:04 +02:00
David Gil
9a1bdb7aca move tags helper to view, fix case when less than 5 tags were present, tag list was showing a + link 2015-08-12 16:26:41 +02:00
David Gil
06d8c96d54 Limiting max number of tags shown on debate cards ~ issue#144 2015-08-12 16:26:41 +02:00
David Gil
7c8948639f move model code out of migration 2015-08-12 14:59:54 +02:00
David Gil
1ee3378768 adding a few tests 2015-08-12 14:59:54 +02:00
David Gil
575c2dd281 faking children_count counter cache due to possible bug with awesome_nested_set 2015-08-12 14:59:21 +02:00
David Gil
0291f574a2 add vote counters to comments 2015-08-12 14:59:21 +02:00
David Gil
19ef481917 adding counter_cache to comments children and WIPing on the issue 2015-08-12 14:58:36 +02:00
kikito
5cef152c37 Adds organization rejection & tests 2015-08-12 13:47:47 +02:00
David Gil
44d4fa9fc4 order comments by the most recent first 2015-08-11 20:27:37 +02:00
kikito
523e69fb02 Adds validations for organizations 2015-08-11 19:48:11 +02:00
kikito
9ee1e5dbc5 Adds Abilities for Organizations 2015-08-11 19:34:18 +02:00