Commit Graph

129 Commits

Author SHA1 Message Date
David Gil
f0e47ee787 adds Identity model and migration 2015-08-24 20:24:10 +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
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
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
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
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
83e3dd1c6f Implements User#organization? and User#verified_organization? 2015-08-11 19:15:00 +02:00
kikito
a9a4f4fb81 Undo user.moderator? returning true for admins 2015-08-10 13:00:26 +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
rgarcia
910f5a79a1 removes sample pending spec 2015-07-18 20:38:01 +02:00
rgarcia
f618a9f45d adds devise configuration [#6] 2015-07-16 19:47:54 +02:00