consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
848 Commits 1 Branch 0 Tags
a0dafc68e8581a0d2d15084fcc464855aa0559e7
Commit Graph

145 Commits

Author SHA1 Message Date
kikito
a0dafc68e8 Merge branch 'master' into flag-renaming 2015-08-28 12:00:32 +02:00
Raimond Garcia
b8fe857ab1 Merge pull request #263 from AyuntamientoMadrid/include_texts 
Include texts
 2015-08-28 10:07:33 +02:00
kikito
76c2f2f021 Merge branch 'master' into flag-renaming 2015-08-27 19:06:29 +02:00
Juanjo Bazán
caf3e5ee74 Merge pull request #254 from mlovic/filter-debates 
Add filters to specify order of debates on /debates page
 2015-08-27 17:41:31 +02:00
Marko Lovic
e8004ca1d3 Add to javascript to handle debates order change 2015-08-27 17:18:07 +02:00
Alberto Garcia Cabeza
900f00b443 Adds new texts on header, debates and footer 2015-08-27 16:46:47 +02:00
kikito
cd982768f2 Renames the "archive" action to "ignore_flag" (+) 
* archived_at -> ignored_flag_at
* archived? -> ignored_flag?
* archive -> ignore_flag
* pending -> pending_flag_review
* archived (scope) -> with_ignored_flag
* I18n changes
 2015-08-27 11:43:58 +02:00
Raimond Garcia
c806547c1a Merge pull request #257 from AyuntamientoMadrid/social_networks 
Social networks
 2015-08-27 10:52:10 +02:00
Alberto Garcia Cabeza
ad9e2cc637 Adds styles for social share and auth 2015-08-26 20:32:48 +02:00
Raimond Garcia
9ab13abf20 Merge pull request #256 from AyuntamientoMadrid/improve_emails 
Improve emails
 2015-08-26 20:06:28 +02:00
Alberto Garcia Cabeza
8ac5abb7bc Updates custom icons font 2015-08-26 19:06:12 +02:00
Alberto Garcia Cabeza
4e8b281a23 Adds styles to comment and reply emails 2015-08-26 18:51:29 +02:00
kikito
c183cf2cc6 merges master and fix conflicts 2015-08-25 19:31:25 +02:00
Alberto Garcia Cabeza
82c404092a fixes conflicts [#226] 2015-08-25 16:53:11 +02:00
Alberto Garcia Cabeza
7d17209be6 Adds styles for organization success registration [#226] 2015-08-25 16:47:53 +02:00
Alberto Garcia Cabeza
8037a82fef Adds styles to moderation admin 2015-08-25 15:19:54 +02:00
Alberto Garcia Cabeza
9202a4f8e4 Adds styles for flag as inappropriate 2015-08-25 14:09:04 +02:00
Alberto Garcia Cabeza
6643f97195 Updates custom icons font 2015-08-25 13:51:25 +02:00
Juanjo Bazán
6d93f975e3 Merge branch 'master' into moderator_comments 2015-08-24 19:01:49 +02:00
kikito
e68ee3ffae Replaces id by js-class in moderator-debate-actions 2015-08-24 18:45:22 +02:00
kikito
36fb9b60b2 Use a js-class instead of an id for moderator-comment-actions 2015-08-24 18:35:59 +02:00
Alberto Garcia Cabeza
dffb8e8a5e Adds styles for comment as administrator 2015-08-24 12:29:35 +02:00
Alberto Garcia Cabeza
cfd25042b6 Adds styles for comment as moderator 2015-08-24 12:22:31 +02:00
Alberto Garcia Cabeza
908d19e2e7 Improves styles for admin 2015-08-23 11:45:43 +02:00
Alberto Garcia Cabeza
30d685ec32 Adds styles for organizations 2015-08-22 18:06:27 +02:00
Alberto Garcia Cabeza
9d992da2be Adds new icon for rejected items 2015-08-22 18:05:32 +02:00
Alberto Garcia Cabeza
570169af57 Changes icons classes names 2015-08-22 14:46:26 +02:00
Alberto Garcia Cabeza
d1a3ea6fd4 Updates custom icons font 2015-08-22 14:45:43 +02:00
Alberto Garcia Cabeza
ff6285d114 Improves general styles 2015-08-21 18:57:09 +02:00
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
Alberto Garcia Cabeza
2415a0fae2 Adds styles for language select 2015-08-20 21:28:10 +02:00
Alberto Garcia Cabeza
51d08d9798 Adds styles for pagination 2015-08-20 12:35:00 +02:00
kikito
710e83fb22 Adds locale switcher js code + feature tests 2015-08-19 21:40:17 +02:00
kikito
961a317c9b Adds (a modified version of) queryParameters.js 2015-08-19 21:26:29 +02:00
kikito
c9c4f95fdc Rename language style to locale 2015-08-19 21:07:17 +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
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
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
Raimond Garcia
3a358ed90c Merge pull request #194 from AyuntamientoMadrid/styling_admin 
Styling admin
 2015-08-17 22:07:56 +02:00
Alberto Garcia Cabeza
9f8229465c fixes conflicts 2015-08-17 21:36:06 +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