Alberto Garcia Cabeza
|
3c29ac90c9
|
Merge branch 'master' into reorganize_header
|
2015-08-21 13:05:21 +02:00 |
|
Alberto Garcia Cabeza
|
6bd060f536
|
Reorganizes header links, adds responsive styles
|
2015-08-21 13:04:41 +02:00 |
|
Alberto Garcia Cabeza
|
efd7b688cb
|
Renames language to locale
|
2015-08-21 08:50:09 +02:00 |
|
kikito
|
01eb89f5f4
|
DRYes comment views related with flagging as inappropiate
|
2015-08-20 22:54:05 +02:00 |
|
Alberto Garcia Cabeza
|
2415a0fae2
|
Adds styles for language select
|
2015-08-20 21:28:10 +02:00 |
|
kikito
|
12e8cf2056
|
Allows flagging debates as inappropriate
|
2015-08-20 19:26:36 +02:00 |
|
kikito
|
ee881230ba
|
merges master and fixes conflicts
|
2015-08-20 18:50:10 +02:00 |
|
kikito
|
e7effbf77c
|
Allows flagging comments as inappropriate
|
2015-08-20 18:47:16 +02:00 |
|
Juanjo Bazán
|
896fe41db0
|
favors with_hidden
|
2015-08-20 17:52:59 +02:00 |
|
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 |
|
Alberto Garcia Cabeza
|
51d08d9798
|
Adds styles for pagination
|
2015-08-20 12:35:00 +02:00 |
|
Juanjo Bazán
|
9e15652d58
|
adds kaminari views
|
2015-08-20 11:35:46 +02:00 |
|
Enrique García
|
307fb05e09
|
Merge pull request #201 from AyuntamientoMadrid/pagination
Adds Pagination
|
2015-08-20 00:54:06 +02:00 |
|
kikito
|
5c3f664da4
|
Fixes links in Admin::Organizations to handle filters + pages
|
2015-08-20 00:50:50 +02:00 |
|
kikito
|
5205ac99e3
|
Moves the locale switcher to its own shared view
|
2015-08-19 21:39:57 +02:00 |
|
Juanjo Bazán
|
ec6b702d00
|
Merge pull request #200 from AyuntamientoMadrid/locale-switch-turbolinks-166
disable turbolinks in locale switcher. fixes #166
|
2015-08-19 18:00:35 +02:00 |
|
Juanjo Bazán
|
fda8412ed3
|
adds pagination to admin lists
Ref: #80
|
2015-08-19 16:32:40 +02:00 |
|
Juanjo Bazán
|
a43c753ebb
|
updates style of admin/organizations
|
2015-08-19 16:32:39 +02:00 |
|
Juanjo Bazán
|
3732b7f420
|
adds pagination to 1st level comments in debate
Ref: #80
|
2015-08-19 16:32:39 +02:00 |
|
Juanjo Bazán
|
0066cb0514
|
compares ids
|
2015-08-19 16:32:39 +02:00 |
|
Juanjo Bazán
|
947514fbfc
|
adds pagination to debates#index
Ref: #80
|
2015-08-19 16:30:25 +02:00 |
|
Juanjo Bazán
|
d2ac8b7f43
|
applies hidden users styles commented
|
2015-08-19 16:22:24 +02:00 |
|
Alberto Garcia Cabeza
|
2eccd30eff
|
Adds styles for deleted users, improves previous
|
2015-08-19 15:01:10 +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
|
8bd4d02502
|
disable turbolinks in locale switcher. fixes #166
|
2015-08-18 20:37:05 +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 |
|
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 |
|
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 |
|
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 |
|
Eloy Gomez
|
5b0cd4a8ba
|
Show charts using c3.js
|
2015-08-17 19:15:17 +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 |
|
kikito
|
9e1581656a
|
merges master and fixes conflicts
|
2015-08-17 17:38:34 +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
|
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 |
|