Juanjo Bazán
|
2fe55513c1
|
Merge pull request #195 from AyuntamientoMadrid/stats
Admin stats
|
2015-08-17 22:47:01 +02:00 |
|
rgarcia
|
c56742118c
|
adds stats to admin menu
|
2015-08-17 22:36:24 +02:00 |
|
rgarcia
|
89aab092b4
|
upgrades ahoy gem
|
2015-08-17 22:36:00 +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 |
|
Juanjo Bazán
|
7582d53f50
|
updates README_EN
|
2015-08-17 22:00:19 +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 |
|
rgarcia
|
252a8ad7e6
|
removes format Fuubar from .rspec
|
2015-08-17 19:55:28 +02:00 |
|
Raimond Garcia
|
ee278985f3
|
Merge pull request #191 from AyuntamientoMadrid/rspec-fuubar
adds and activates fuubar when running the specs.
|
2015-08-17 19:40:04 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|