Commit Graph

6270 Commits

Author SHA1 Message Date
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
710e83fb22 Adds locale switcher js code + feature tests 2015-08-19 21:40:17 +02:00
kikito
5205ac99e3 Moves the locale switcher to its own shared view 2015-08-19 21:39:57 +02:00
kikito
961a317c9b Adds (a modified version of) queryParameters.js 2015-08-19 21:26:29 +02:00
kikito
480ecd39c4 Replaces locales helper which returns an array by another which returns select options 2015-08-19 21:25:56 +02:00
kikito
c9c4f95fdc Rename language style to locale 2015-08-19 21:07:17 +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
10d7e9effe changes to unambiguous order declaration.
Specified as a string referred table of 'created_at' was ambiguous, index failed when filtering by tag
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
Alberto Garcia Cabeza
85ef4eb08d Updates custom icons font 2015-08-19 15:00:00 +02:00
kikito
b4c66133da Replaces comments by calls to user.methods 2015-08-19 12:10:08 +02:00
kikito
21c2fa2e3d Adds user.verified_organization? 2015-08-19 12:08:03 +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
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