Raimond Garcia
a9a24befb8
Merge pull request #192 from AyuntamientoMadrid/official-position
...
Official positions
2015-08-17 18:49:22 +02:00
Enrique García
162ae656ec
Merge pull request #190 from AyuntamientoMadrid/specs
...
adds robustness to spec
2015-08-17 18:40:22 +02:00
Juanjo Bazán
5c630ac41d
adds settings area to admin
2015-08-17 18:38:57 +02:00
kikito
66c8931ae9
adds account tests to increase test coverage
2015-08-17 18:31:04 +02:00
rgarcia
ce05826a92
adds robustness to spec
2015-08-17 18:30:04 +02:00
Juanjo Bazán
1f0be14c0d
ignores officials level keys
2015-08-17 18:27:43 +02:00
Juanjo Bazán
d9d5e24a8b
updates options for admin officials level
2015-08-17 18:27:18 +02:00
kikito
802c2d89d2
adds and activates fuubar when running the specs. Related with #189
2015-08-17 18:26:46 +02:00
Juanjo Bazán
ba9b04a0d6
adds default settings to seeds file
2015-08-17 18:14:03 +02:00
Juanjo Bazán
a13f4920a1
adds Settings
2015-08-17 18:13:30 +02:00
kikito
c3bee45eda
fixes error in abilities
2015-08-17 17:59:23 +02:00
kikito
9e1581656a
merges master and fixes conflicts
2015-08-17 17:38:34 +02:00
kikito
1ffc342079
fixes typo in admin.es.yml
2015-08-17 17:19:55 +02:00
kikito
8311ab6c2b
fixes typo in admin.en.yml
2015-08-17 17:19:10 +02:00
kikito
c1a6a37651
Removes user_id validation from Organisations
2015-08-17 17:11:17 +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
635dfba418
adds kaminari config file
...
it is empty now, showing the defaults
2015-08-17 17:03:48 +02:00
Juanjo Bazán
af3e356b88
dries layout admin views
...
moves common <div class='left'> to layout
2015-08-17 15:22:50 +02:00
Juanjo Bazán
d758958b9b
removes layout from admin tags controller
...
layout is inherited from admin base controller
2015-08-17 15:22:50 +02:00
Juanjo Bazán
2d85dd58b2
adds i18n for official user fields
2015-08-17 15:22:49 +02:00
Juanjo Bazán
24bde1a3ba
adds i18n files for kaminari paginator
2015-08-17 15:22:49 +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
Juanjo Bazán
f827e860e4
adds official-related fields to User model
2015-08-17 15:22:49 +02:00
Juanjo Bazán
4a8825cf11
Merge pull request #184 from AyuntamientoMadrid/add_subnavigation
...
Adds sub navigation menu
2015-08-17 15:21:53 +02:00
Juanjo Bazán
94879fbccb
adds admin_header partial
2015-08-17 15:18:51 +02:00
Juanjo Bazán
0c86882d0d
adds proper active class to header subnav links
2015-08-17 15:13:10 +02:00
Alberto Garcia Cabeza
4b59105be5
Adds filters for topics
2015-08-17 15:00:59 +02:00
Alberto Garcia Cabeza
f485225250
Merge branch 'master' into titles_and_filters
2015-08-17 14:53:48 +02:00
Alberto Garcia Cabeza
43f8db8e3a
Adds styles for titles and filters
2015-08-17 14:53:00 +02:00
kikito
1c435eacbe
adds filters to admin/organizations
2015-08-17 14:25:43 +02:00
Juanjo Bazán
fab31c9c2e
Merge pull request #185 from AyuntamientoMadrid/moderation-136
...
Moderates comments and debates
2015-08-17 14:09:14 +02:00
Juanjo Bazán
74742d5f76
adds i18n to deleted comments
2015-08-17 14:08:59 +02:00
rgarcia
fa6fa39cb6
removes unused method [ #136 ]
2015-08-17 13:55:27 +02:00
rgarcia
d9a31b7158
adds specs for moderation [ #136 ]
2015-08-17 13:39:58 +02:00
rgarcia
f31ed2940d
adds moderation to comments and debates [ #136 ]
2015-08-17 13:39:31 +02:00
kikito
264f6318c3
Adds i18n & ul for admin menus
2015-08-17 13:23:18 +02:00
kikito
3096a73892
Moves organization verification to Admin from Moderation
2015-08-17 13:22:38 +02:00
kikito
ae21209920
Moves the layout to admin::BaseController and moderation::BaseController
2015-08-17 13:20:52 +02:00
Alberto Garcia Cabeza
9f1f64cc3a
Adds sub navigation menu
2015-08-17 12:31:05 +02:00
kikito
42b441a866
fixes specs by using the correct capthca helper instead of deactivating it
2015-08-17 12:29:42 +02:00
rgarcia
cd0a64ea3e
adds paranoia gem [ #136 ]
2015-08-17 03:46:00 +02:00
kikito
8ca546a431
merges master and fixes conflicts
2015-08-17 02:40:11 +02:00
kikito
543f718891
Adds phone_number to the regular user registration / account views
2015-08-17 01:16:08 +02:00
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
de73eac2d0
Moves the registrations controller to users/registrations
...
This is necessary because rails gets confused when it has a a “root”
registration_controller and another non-root one. The non-root one uses
the views from the root.
2015-08-17 01:16:07 +02:00
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
