Commit Graph

93 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
David Gil
a4ec38d752 adds create and destroy to the tags CRUD 2015-08-15 20:01:52 +02:00
David Gil
664f656fe3 tests featured tags administration and adding featured tags to debates 2015-08-15 19:38:42 +02:00
David Gil
1de941d1fa adding featured tags list to debate form 2015-08-15 18:36:10 +02:00
David Gil
0a4aafd8de scaffolds a tag list to mark tags as featured on the admin section 2015-08-15 18:22:29 +02:00
Alberto Garcia Cabeza
feb85c2aea Adds blog link on header 2015-08-15 00:58:45 +02:00
rgarcia
101477c7da refactors admin layout 2015-08-14 13:33:30 +02:00
rgarcia
88defaa455 adds admin layout and access links [#163] 2015-08-14 12:37:44 +02:00
kikito
a59ef10e44 adds organization controller, with views and tests 2015-08-12 18:26:12 +02:00
Raimond Garcia
e49567c953 Merge pull request #154 from AyuntamientoMadrid/debates
Debates
2015-08-12 15:59:20 +02:00
Alberto Garcia Cabeza
d6c7528df3 Improves styles of debates show page 2015-08-12 15:26:46 +02:00
David Gil
1ee3378768 adding a few tests 2015-08-12 14:59:54 +02:00
David Gil
0291f574a2 add vote counters to comments 2015-08-12 14:59:21 +02:00
David Gil
19ef481917 adding counter_cache to comments children and WIPing on the issue 2015-08-12 14:58:36 +02:00
Alberto Garcia Cabeza
00af11396d Improves styles for auth pages 2015-08-12 14:07:34 +02:00
Alberto Garcia Cabeza
502920c7f2 Improves styles for account page, adds user image 2015-08-12 11:53:28 +02:00