kikito
e84873d875
Modifies devise shared link to include organisations sometimes
2015-08-17 01:16:08 +02:00
kikito
9af1f2f4a9
Adds registration controller for organizations
2015-08-17 01:16:07 +02:00
kikito
9343952d52
Adds User.organization_attributes
2015-08-17 01:16:07 +02:00
kikito
60a1cc2267
Adds User.is_organization and User.organization_name
2015-08-14 20:24:19 +02:00
kikito
4e5d53f2f1
Updates the Moderation Organisation controller
2015-08-13 20:05:32 +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
19db7f9dda
Updates factories to use the new organization table structure
2015-08-13 20:02:29 +02:00
kikito
a59ef10e44
adds organization controller, with views and tests
2015-08-12 18:26:12 +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
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
Raimond Garcia
16183d9909
Merge pull request #116 from AyuntamientoMadrid/admin-77
...
Administrator and Moderator basic interface
2015-08-10 16:41:47 +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
c1c1362780
Adapts debates controller to new permissions system
2015-08-10 15:00:14 +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
fefe5a12ba
adds spec for failed edition of user data
2015-08-08 14:04:55 +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
rgarcia
0a55a7b6a8
changes untranslated spec to english [ #23 ]
2015-08-07 20:57:52 +02:00
rgarcia
829180a84a
adds reset password spec [ #23 ]
2015-08-07 20:57:31 +02:00
rgarcia
6803dc9d74
configures email_spec gem [ #23 ]
2015-08-07 20:48:20 +02:00
kikito
dac5b8d22a
Make /admin and /moderation only accesible to Admins & Moderators
2015-08-07 19:15:08 +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
e34ae1a805
adds tests for :js vote specs
2015-08-07 09:21:29 +02:00
kikito
a194d9584b
merges master and fixes conflicts
2015-08-06 19:25:51 +02:00
Juanjo Bazán
cdaa3e2808
favors dom_id
2015-08-06 18:53:40 +02:00
Juanjo Bazán
33489e7b0c
adds css classes to voted options in debates
...
for logged users.
Closes #88
2015-08-06 18:53:05 +02:00
kikito
b1acbeb39d
Adds i18n-tasks
2015-08-06 18:31:26 +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
ae34be1ddd
adds link to debate description
2015-08-06 15:50:36 +02:00
rgarcia
ec6d34a49f
fixes conflicts
2015-08-06 13:42:57 +02:00
Enrique García
ca575a6f20
Merge pull request #101 from AyuntamientoMadrid/show-0-votes
...
shows "0%" when there's zero votes
2015-08-06 12:00:37 +02:00
Fernando Seror
c4eb29f99d
Merge branch 'master' into escoger_idioma_803
...
Conflicts:
app/controllers/application_controller.rb
2015-08-05 15:47:52 -05:00
Fernando Seror
a89d621d1d
Allow locale to be set through the front-end
...
* Store the last used locale in the session
* Allow home page to be identified in helpers even when containing
parameters
* Create initializer to explicitly set the available locales, the
default and the load_path
2015-08-05 15:43:39 -05:00
Juanjo Bazán
64f5c4e7f1
shows "0%" when there's zero votes
...
Closes #97
2015-08-05 17:56:14 +02:00
Juanjo Bazán
ae8068f5fd
fix conflict
2015-08-05 14:46:18 +02:00
Juanjo Bazán
d23ce151a6
Merge pull request #96 from AyuntamientoMadrid/coveralls
...
Cobertura de tests
2015-08-05 14:40:39 +02:00
rgarcia
c2091f570c
integrates coveralls in test suite
2015-08-05 14:16:58 +02:00
Juanjo Bazán
8d87a69e0f
hides comment forms from not logged users
...
Closes #66
2015-08-05 14:12:58 +02:00
