kikito
|
1f2f318e83
|
Turns on devise scoped views
That way we can have users/registrations & organizations/registrations
|
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
|
91804b5f7c
|
replaces organization migrations with a new table
|
2015-08-13 18:18:49 +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
|
674e2c5b8c
|
Adds User.organizations scope
|
2015-08-12 17:49:01 +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 |
|
kikito
|
3551b55bdd
|
add migration for User organization fields
|
2015-08-11 18:57:16 +02:00 |
|
Raimond Garcia
|
8053034ddf
|
Merge pull request #132 from AyuntamientoMadrid/i18n-files
adds i18n files for new namespaces
|
2015-08-10 17:04:00 +02:00 |
|
Juanjo Bazán
|
8b50b60814
|
adds i18n files for new namespaces
|
2015-08-10 16:58:35 +02:00 |
|
Raimond Garcia
|
17aba2303d
|
Merge pull request #131 from AyuntamientoMadrid/footer
Footer
|
2015-08-10 16:49:12 +02:00 |
|
rgarcia
|
66e4581a84
|
fixes conflicts with master
|
2015-08-10 16:46:27 +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
|
7f5f5d6b19
|
Adds i18n for unauthorized messages
|
2015-08-10 16:24:01 +02:00 |
|
kikito
|
51323fa891
|
Adds back missing authenticate_user! calls
|
2015-08-10 16:05:58 +02:00 |
|
kikito
|
84d848df7e
|
Adapts the CommentsController to the new permissions system
|
2015-08-10 15:40:23 +02:00 |
|
Alberto Garcia Cabeza
|
91cdfbc8a1
|
Adds content on footer
|
2015-08-10 15:39:38 +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
|
30e738a2fe
|
Add cancan authorization in all main urls
|
2015-08-10 14:59:42 +02:00 |
|
Alberto Garcia Cabeza
|
c80d9b0a47
|
Reorganizes scss files
|
2015-08-10 13:33:02 +02:00 |
|
kikito
|
a9a4f4fb81
|
Undo user.moderator? returning true for admins
|
2015-08-10 13:00:26 +02:00 |
|
Raimond Garcia
|
ee681b7725
|
Merge pull request #130 from AyuntamientoMadrid/sdoc
removes doc from gemfile
|
2015-08-10 12:48:57 +02:00 |
|
kikito
|
8b53ae6f08
|
Adds Abilities for Debates
|
2015-08-10 12:38:22 +02:00 |
|
Juanjo Bazán
|
857edf60cc
|
Merge pull request #129 from AyuntamientoMadrid/votes
Adds styles for debates voted and no voted
|
2015-08-10 12:23:33 +02:00 |
|
Juanjo Bazán
|
259c90d65c
|
removes doc from gemfile
Ref: #125
|
2015-08-10 12:16:14 +02:00 |
|
Alberto Garcia Cabeza
|
6c0dd32ed1
|
Adds styles for debates voted and no voted
|
2015-08-10 12:08:43 +02:00 |
|
Juanjo Bazán
|
6d989488d9
|
Merge pull request #128 from AyuntamientoMadrid/remove-jbuilder-125
Remove jbuilder gem. Fixes #125
|
2015-08-10 11:56:41 +02:00 |
|
kikito
|
d7ab4331ea
|
Remove jbuilder gem. Fixes #125
|
2015-08-10 09:52:24 +02:00 |
|
Adrian Pradilla
|
85e3e4439c
|
Add translations for active record models
Fix i18n spec
Add i18n activerecord files
Fix activerecord first name and last name labels
|
2015-08-09 17:40:14 +02:00 |
|
Juanjo Bazán
|
d96f1697dc
|
Merge pull request #121 from AyuntamientoMadrid/user
styles user account
|
2015-08-08 14:07:26 +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
|
61463fc378
|
removes unused i18n entries
|
2015-08-08 13:53:15 +02:00 |
|
Alberto Garcia Cabeza
|
c048f25941
|
Fixes conflicts
|
2015-08-08 13:28:29 +02:00 |
|
Alberto Garcia Cabeza
|
fdfef95595
|
Adds styles for account page and edit user
|
2015-08-08 13:21:46 +02:00 |
|
Juanjo Bazán
|
f8becd1b23
|
Merge branch 'master' into admin-77
|
2015-08-08 13:00:41 +02:00 |
|
Juanjo Bazán
|
90a3dcdc16
|
Merge pull request #119 from AyuntamientoMadrid/header
Changes styles for header
|
2015-08-08 01:51:59 +02:00 |
|
Alberto Garcia Cabeza
|
d45a22781a
|
Changes styles for header
|
2015-08-07 23:23:16 +02:00 |
|
rgarcia
|
a949d54a85
|
removes unused json respond block [#77]
|
2015-08-07 21:52:14 +02:00 |
|
Juanjo Bazán
|
1454a3063c
|
Merge pull request #118 from AyuntamientoMadrid/emails-23
Sends emails
|
2015-08-07 21:25:09 +02:00 |
|