consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

2326 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
a75cbefe8d Styles for header,footer,filters, alerts and pages 2015-09-04 15:19:50 +02:00
Juanjo Bazán
f9067fe201 Fixes CKeditor & Turbolinks issue 
Closes #330
 2015-09-04 13:16:25 +02:00
David Fernández
a0ffd4f718 Smaller, better, no reason for the image being so big? 2015-09-03 23:42:26 +02:00
Alberto Garcia Cabeza
f20192d9d7 Improves styles for debates 2015-09-03 14:15:45 +02:00
Alberto Garcia Cabeza
4631b39d25 Updates custom icons fonts 2015-09-03 14:10:01 +02:00
Alberto Garcia Cabeza
3f53f61b1d Fixes conflicts 2015-09-03 00:12:59 +02:00
Alberto Garcia Cabeza
3172223930 Updates header and footer 2015-09-02 23:43:32 +02:00
Raimond Garcia
faf1b32cf5 Merge pull request #329 from AyuntamientoMadrid/verification 
Verification
 2015-09-02 18:58:25 +02:00
Alberto Garcia Cabeza
da86c5d6e0 Adds styles for verification account process 2015-09-02 12:34:08 +02:00
Juanjo Bazán
8915ce7ffd adds interface to disallow organizations votes 
on debates
 2015-09-02 12:16:55 +02:00
Juanjo Bazán
2ed0486423 toggles layer on votes via js 2015-09-01 17:49:03 +02:00
Alberto Garcia Cabeza
bcc58ab0c4 Adds styles for too much anonymous votes 2015-09-01 17:49:02 +02:00
Alberto Garcia Cabeza
57e373a7cf Adds styles for too much anonymous comments 2015-09-01 17:49:02 +02:00
Juanjo Bazán
8ca3ecd36e uses assets url helpers 2015-09-01 12:40:23 +02:00
Alberto Garcia Cabeza
da0c937983 Adds new texts for admin and moderation pages 2015-08-31 21:49:36 +02:00
Alberto Garcia Cabeza
a74f4ea030 Adds first styles for static pages 2015-08-31 21:48:50 +02:00
Alberto Garcia Cabeza
29ffe6de81 Updates custom icons font 2015-08-31 21:35:41 +02:00
Juanjo Bazán
1353a1c64b Merge pull request #274 from AyuntamientoMadrid/refactor-selects 
Refactor selects
 2015-08-29 11:36:38 +02:00
Alberto Garcia Cabeza
ee72096890 fixes conflicts 2015-08-29 00:40:15 +02:00
Alberto Garcia Cabeza
c0eb46288c Improves header, footer and debates mobile styles 2015-08-29 00:34:49 +02:00
Alberto Garcia Cabeza
13fe1dcb9f Changes bg images, adds favicon and alerts styles 2015-08-29 00:33:40 +02:00
kikito
ae98ba3572 merges master and fixes conflicts 2015-08-28 19:57:28 +02:00
Raimond Garcia
7847610c19 Merge pull request #281 from AyuntamientoMadrid/hidden_comments 
Estilo y ocultación de comentarios
 2015-08-28 19:26:44 +02:00
kikito
c989607b50 Merge branch 'master' into hidden_comments 2015-08-28 18:53:44 +02:00
Raimond Garcia
b1117dd1af Merge pull request #275 from mlovic/filter-topic 
Allow debates to be filtered by topic
 2015-08-28 17:41:38 +02:00
kikito
088144dcd1 Refactor debates order select using js-location-changer 2015-08-28 17:17:21 +02:00
kikito
934512ad7a made the locale switcher use less js, more ruby & html 2015-08-28 17:02:06 +02:00
kikito
57917f850c do not use js-classes for stying 2015-08-28 15:59:38 +02:00
Marko Lovic
4285ba4bb3 Add tag filter to debates page 2015-08-28 12:41:10 +02:00
rgarcia
7053297f09 adds missing digest to images 2015-08-28 12:30:36 +02:00
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
Alberto Garcia Cabeza
413a034e23 Adds styles for deleted comments 2015-08-27 20:21:26 +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