kikito
|
ee881230ba
|
merges master and fixes conflicts
|
2015-08-20 18:50:10 +02:00 |
|
kikito
|
8944327405
|
adds InappropiateFlag model with relations and specs
|
2015-08-20 16:03:00 +02:00 |
|
Juanjo Bazán
|
bd16e9345a
|
adds paranoia to User
|
2015-08-20 13:16:37 +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
|
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
|
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 |
|
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
|
674e2c5b8c
|
Adds User.organizations scope
|
2015-08-12 17:49:01 +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
|
83e3dd1c6f
|
Implements User#organization? and User#verified_organization?
|
2015-08-11 19:15:00 +02:00 |
|
rgarcia
|
4839081ad2
|
uses simple_captcha instead of recaptcha [#51]
|
2015-08-10 20:24:56 +02:00 |
|
kikito
|
a9a4f4fb81
|
Undo user.moderator? returning true for admins
|
2015-08-10 13:00:26 +02:00 |
|
kikito
|
9eae91c764
|
Makes user.moderator? return true for administrators
|
2015-08-07 18:52:09 +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 |
|
Juanjo Bazán
|
627616d9ff
|
adds devise's confirmable/reconfirmable to user
|
2015-07-31 13:51:03 +02:00 |
|
rgarcia
|
31e17396f5
|
removes unused association [#11]
|
2015-07-18 17:11:46 +02:00 |
|
rgarcia
|
bf11dba092
|
adds convenience methods and association [#11]
|
2015-07-18 14:49:31 +02:00 |
|
rgarcia
|
f618a9f45d
|
adds devise configuration [#6]
|
2015-07-16 19:47:54 +02:00 |
|