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 |
|
Juanjo Bazán
|
f8becd1b23
|
Merge branch 'master' into admin-77
|
2015-08-08 13:00:41 +02:00 |
|
rgarcia
|
3eac8d0bd8
|
adds email specs [#23]
|
2015-08-07 20:58:24 +02:00 |
|
kikito
|
9eae91c764
|
Makes user.moderator? return true for administrators
|
2015-08-07 18:52:09 +02:00 |
|
kikito
|
5cc9c21b8d
|
fixes typo in user_spec
|
2015-08-07 17:46:36 +02:00 |
|
kikito
|
c04d397e66
|
Implements User.administrator? & User.moderator?
|
2015-08-07 17:20:20 +02:00 |
|
Juanjo Bazán
|
af0698da35
|
fixes conflicts
|
2015-08-07 10:12:58 +02:00 |
|
Juanjo Bazán
|
6e7832957a
|
adds method to get user votes on specific debates
|
2015-08-06 18:10:14 +02:00 |
|
kikito
|
72c33330cf
|
Adds nickname-related validations & name to User
|
2015-08-06 16:53:18 +02:00 |
|
kikito
|
87dd655d70
|
Make debate.description always html_safe
|
2015-08-04 18:42:49 +02:00 |
|
kikito
|
b53bc42dcd
|
Uses the TagSanitizer in Debate
|
2015-08-03 19:32:00 +02:00 |
|
kikito
|
824ce3c8fe
|
Add specs for description sanitisation
|
2015-07-31 16:10:20 +02:00 |
|
Juanjo Bazán
|
df1a800d94
|
adds editable methods to Debate
|
2015-07-19 14:46:21 +02:00 |
|
rgarcia
|
910f5a79a1
|
removes sample pending spec
|
2015-07-18 20:38:01 +02:00 |
|
rgarcia
|
967b5cdcb5
|
adds author validation spec [#11]
|
2015-07-18 15:09:28 +02:00 |
|
rgarcia
|
75f1638cd6
|
fixing conflicts [#6]
|
2015-07-16 21:29:44 +02:00 |
|
rgarcia
|
f618a9f45d
|
adds devise configuration [#6]
|
2015-07-16 19:47:54 +02:00 |
|
rgarcia
|
62349acc54
|
adds debate model specs [#5]
|
2015-07-16 19:26:17 +02:00 |
|
rgarcia
|
b216470d59
|
adds debate model
|
2015-07-15 21:07:15 +02:00 |
|