kikito
|
cb99996317
|
merges master and fix conflicts
|
2015-08-28 13:23:30 +02:00 |
|
rgarcia
|
9cce254c8d
|
adds specs
|
2015-08-28 00:03:16 +02:00 |
|
kikito
|
1770dfd3f6
|
adds ability to confirm the hiding of comments, debates or users
|
2015-08-27 13:20:12 +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 |
|
Juanjo Bazán
|
dacbe27fda
|
uses cache counter for debate's comments
|
2015-08-26 17:26:17 +02:00 |
|
kikito
|
6110284356
|
removes all references to "review" (replaced by "archive")
|
2015-08-26 13:48:57 +02:00 |
|
David Gil
|
f0e47ee787
|
adds Identity model and migration
|
2015-08-24 20:24:10 +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 |
|
kikito
|
c88f7c1f30
|
merges master and fixes conflicts
|
2015-08-23 20:27:11 +02:00 |
|
kikito
|
8bc92811b6
|
Adds traits to debate & comment factories
|
2015-08-22 20:20:47 +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 |
|
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 |
|
kikito
|
8944327405
|
adds InappropiateFlag model with relations and specs
|
2015-08-20 16:03:00 +02:00 |
|
Juanjo Bazán
|
259aa29de7
|
adds new abilities
|
2015-08-20 13:16:37 +02:00 |
|
kikito
|
21c2fa2e3d
|
Adds user.verified_organization?
|
2015-08-19 12:08:03 +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 |
|
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
|
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 |
|
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
|
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
|
cb301c4426
|
adds organization factory and refactors ability_spec
|
2015-08-12 18:24:57 +02:00 |
|
kikito
|
450b0098c6
|
Adds abilities for verifying/rejecting organizations
|
2015-08-12 17:48:25 +02:00 |
|
David Gil
|
a3550a55a5
|
create spec/models/comment_spec and add a few tests for children count
|
2015-08-12 14:59:54 +02:00 |
|
David Gil
|
9a2ef8366e
|
change background by let since model tests do not know about background
|
2015-08-12 14:59:54 +02:00 |
|
David Gil
|
d134284774
|
background is the new before(:each)
|
2015-08-12 14:59:54 +02:00 |
|
kikito
|
5cef152c37
|
Adds organization rejection & tests
|
2015-08-12 13:47:47 +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 |
|
kikito
|
83e3dd1c6f
|
Implements User#organization? and User#verified_organization?
|
2015-08-11 19:15:00 +02:00 |
|
kikito
|
84d848df7e
|
Adapts the CommentsController to the new permissions system
|
2015-08-10 15:40:23 +02:00 |
|
kikito
|
ce27a6f2ea
|
Adapts AccountController to new permissions system
|
2015-08-10 15:10:47 +02:00 |
|
kikito
|
a9a4f4fb81
|
Undo user.moderator? returning true for admins
|
2015-08-10 13:00:26 +02:00 |
|
kikito
|
8b53ae6f08
|
Adds Abilities for Debates
|
2015-08-10 12:38:22 +02:00 |
|