Juanjo Bazán
f0a6926710
adds restore user action for administrators
2015-08-20 16:06:23 +02:00
Juanjo Bazán
b340d7741a
adds hiding users by moderators
2015-08-20 13:16:37 +02:00
Juanjo Bazán
2b6ea3a40f
Merge pull request #207 from AyuntamientoMadrid/pagination
...
Pagination styles
2015-08-20 13:15:42 +02:00
Juanjo Bazán
d70ca040f3
ignores unused kaminari i18n keys
2015-08-20 13:10:21 +02:00
Alberto Garcia Cabeza
0d54cca910
Changes test for pagination
2015-08-20 12:55:31 +02:00
rgarcia
839314868c
adding staging.rb
2015-08-20 12:50:36 +02:00
kikito
332df09491
Add locale entry to each locale
2015-08-19 21:07:35 +02:00
Alberto Garcia Cabeza
2eccd30eff
Adds styles for deleted users, improves previous
2015-08-19 15:01:10 +02:00
kikito
da7d10d21e
adds missing i18n to en.yml
2015-08-19 12:10:29 +02:00
kikito
b4c66133da
Replaces comments by calls to user.methods
2015-08-19 12:10:08 +02:00
Alberto Garcia Cabeza
04db8112b4
Adds styles for associations comments
2015-08-19 11:53:35 +02:00
Alberto Garcia Cabeza
87d921b3c7
Adds styles for comments
2015-08-19 11:53:18 +02:00
kikito
30a63db392
Fixes Typo
2015-08-18 17:03:03 +02:00
Juanjo Bazán
b84fb65b93
Merge pull request #197 from AyuntamientoMadrid/styling_admin
...
Styling admin
2015-08-18 15:30:44 +02:00
Alberto Garcia Cabeza
33875daef6
Adds styles for new admin's sections
2015-08-18 13:48:37 +02:00
kikito
b28f63b016
merges master and fixes conflicts
2015-08-18 09:35:13 +02:00
rgarcia
c56742118c
adds stats to admin menu
2015-08-17 22:36:24 +02:00
Raimond Garcia
3a358ed90c
Merge pull request #194 from AyuntamientoMadrid/styling_admin
...
Styling admin
2015-08-17 22:07:56 +02:00
Alberto Garcia Cabeza
9f8229465c
fixes conflicts
2015-08-17 21:36:06 +02:00
Alberto Garcia Cabeza
0c2901c3fb
Adds styles for admin
2015-08-17 21:30:22 +02:00
Juanjo Bazán
7e1cd2940d
Fix conflicts
2015-08-17 21:08:15 +02:00
Raimond Garcia
b51354cffb
Merge pull request #187 from AyuntamientoMadrid/titles_and_filters
...
Titles and filters
2015-08-17 20:00:05 +02:00
Juanjo Bazán
5c630ac41d
adds settings area to admin
2015-08-17 18:38:57 +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
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
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
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
4a8825cf11
Merge pull request #184 from AyuntamientoMadrid/add_subnavigation
...
Adds sub navigation menu
2015-08-17 15:21:53 +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
74742d5f76
adds i18n to deleted comments
2015-08-17 14:08:59 +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
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
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
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
rgarcia
a81612b226
improves consistency of error messages [ #110 ]
2015-08-16 15:57:09 +02:00
Juanjo Bazán
c3974de2ff
fixes locales
2015-08-15 22:16:47 +02:00
Juanjo Bazán
8cb654092b
Merge pull request #176 from dgilperez/issue-172
...
Adds CRUD for tags to admin section and featured tags support for debates
2015-08-15 22:00:37 +02:00
