Juanjo Bazán
|
ced2a05063
|
adds eager loading to avoid N+1 queries
|
2015-08-18 16:54:49 +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
|
fc9689c2da
|
Changes to pass all test
|
2015-08-18 14:04:11 +02:00 |
|
Alberto Garcia Cabeza
|
33875daef6
|
Adds styles for new admin's sections
|
2015-08-18 13:48:37 +02:00 |
|
Alberto Garcia Cabeza
|
ad1833b918
|
Updates custom icons font
|
2015-08-18 13:47:24 +02:00 |
|
kikito
|
b28f63b016
|
merges master and fixes conflicts
|
2015-08-18 09:35:13 +02:00 |
|
Juanjo Bazán
|
1f5f6d2589
|
makes labels work in admin/tags
|
2015-08-17 23:27:29 +02:00 |
|
Juanjo Bazán
|
59bd6e839b
|
adds active class to admin menu
|
2015-08-17 23:20:42 +02:00 |
|
rgarcia
|
c56742118c
|
adds stats to admin menu
|
2015-08-17 22:36:24 +02:00 |
|
rgarcia
|
32f2a4f2a1
|
adds admin verification to view stats
|
2015-08-17 22:30:24 +02:00 |
|
Raimond Garcia
|
3a358ed90c
|
Merge pull request #194 from AyuntamientoMadrid/styling_admin
Styling admin
|
2015-08-17 22:07:56 +02:00 |
|
rgarcia
|
67e02f08de
|
fixes specs
|
2015-08-17 22:03:30 +02:00 |
|
Juanjo Bazán
|
862a239d87
|
fixes specs and makes stats for admins eyes only
|
2015-08-17 22:00:54 +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 |
|
Alberto Garcia Cabeza
|
0df1524f0d
|
Creates SCSS for admin
|
2015-08-17 21:30:07 +02:00 |
|
Alberto Garcia Cabeza
|
43ee2144c1
|
Updates custom icons font
|
2015-08-17 21:29:44 +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 |
|
Eloy Gomez
|
5b0cd4a8ba
|
Show charts using c3.js
|
2015-08-17 19:15:17 +02:00 |
|
Eloy Gomez
|
5d91663016
|
Add a helper for build c3.js chart compatible data
|
2015-08-17 19:13:56 +02:00 |
|
Eloy Gomez
|
637e428f4c
|
Add c3.js and dependencies
|
2015-08-17 19:13:38 +02:00 |
|
Eloy Gomez
|
2c515da780
|
Remore charkick gem and dependencies
|
2015-08-17 19:13:03 +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 |
|
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
|
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
|
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
|
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
|
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
|
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 |
|
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
|
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 |
|