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
c051750248 Fixes typos 2015-12-17 21:07:05 +01:00
Alberto Garcia Cabeza
5ab50016b5 Changes annotator images 2015-12-17 21:03:29 +01:00
Alberto Garcia Cabeza
043b2c2656 Adds annotator overrides scss 2015-12-17 21:03:18 +01:00
kikito
5d2c37e71f Displays a message when an unregistered user tries to annotate 2015-12-17 18:25:53 +01:00
kikito
5e067e8447 adds i18n to annotator 2015-12-17 17:32:17 +01:00
kikito
85b26f960d hides the admin checkboxes in annotator 2015-12-17 16:46:46 +01:00
Raimond Garcia
d6a1ac3a18 Merge pull request #772 from consul/annotator-plus 
Annotator plus
 2015-12-16 19:35:42 +01:00
rgarcia
04ab0af8a3 fixes typo 2015-12-16 19:29:03 +01:00
kikito
2c9cbb9ce6 Uses the current user in annotator.js 2015-12-16 18:46:56 +01:00
kikito
0c96b2da8d Removes all remaining traces of setting the user_id in the browser. 2015-12-16 18:44:10 +01:00
kikito
22ec287b16 Removes the user param from the client and forces it to be current_user in the controller 2015-12-16 18:06:25 +01:00
kikito
e6755fa804 Fixes typo in annotable.js.coffee 2015-12-16 18:05:52 +01:00
kikito
f43248b174 renames & refactors annotations.js into annotable.js 2015-12-16 16:07:23 +01:00
Alberto Garcia Cabeza
5e5d790e8d Merge branch 'master' into refactor_styles 2015-12-16 13:37:46 +01:00
Alberto Garcia Cabeza
2bb9b2ff8d Unifies layout SCSS 2015-12-16 13:23:00 +01:00
Alberto Garcia Cabeza
a54828ae6b Refactors SCSS 2015-12-16 13:03:49 +01:00
Alberto Garcia Cabeza
114808745d Adds mixins SCSS 2015-12-16 11:58:57 +01:00
rgarcia
60d6f1c41b annotates legislations instead of proposals 2015-12-16 11:45:47 +01:00
Abigail Sosa
bb5da1af7f Se agrega usuario autor a cada anotacion 2015-12-16 11:45:46 +01:00
Abigail Sosa
e2f6950dc4 Carga anotaciones de la propuesta 2015-12-16 11:45:46 +01:00
Abigail Sosa
189a6426b1 Se agregan anotaciones a propuestas existentes 2015-12-16 11:45:46 +01:00
Alberto Garcia Cabeza
a48574e99a Removes Merriweather font 2015-12-15 16:54:26 +01:00
Alberto Garcia Cabeza
ca18eb99de Cleans and improves styles for header and homepage 2015-12-15 16:35:55 +01:00
Juanjo Bazán
328bd767ca adds js file for IE eyes only 2015-12-14 12:56:50 +01:00
Juanjo Bazán
393ff6ddd9 removes IE specific js files from application.js 2015-12-14 12:56:13 +01:00
Alberto Garcia Cabeza
b59d61af93 Improves styles for proposals and buttons 2015-12-03 20:25:14 +01:00
Alberto Garcia Cabeza
9ef0c3efbc Improves styles for auth pages 2015-12-03 20:06:38 +01:00
Alberto Garcia Cabeza
42487ca703 Unifies styles with transparency portal 2015-12-03 19:47:56 +01:00
Alberto Garcia Cabeza
da25779ec7 Replaces open sans font to source sans and merriweather 2015-12-03 19:29:15 +01:00
Alberto Garcia Cabeza
11bdcc90cf Refactors a little of SCSS for header 2015-11-27 18:18:46 +01:00
Jakub
12c28fe32d Fix double-submission prevention not working. 2015-11-26 17:14:14 +01:00
Alberto Garcia Cabeza
27cdad0a0b Fixes deleted avatar on author's name 2015-11-18 13:33:22 +01:00
Alberto Garcia Cabeza
ca55b43e7c Deletes text-transform for debates titles 2015-11-13 12:24:50 +01:00
Alberto Garcia Cabeza
3037eb5dc3 Adds static featured debates 2015-11-13 12:00:46 +01:00
Alberto Garcia Cabeza
859dfc09e0 Adds featured debates 2015-11-13 11:39:49 +01:00
Alberto Garcia Cabeza
ca8f410319 Adds styles for user's activity page 2015-11-06 12:28:04 +01:00
kikito
2fab210ac8 merges with master and fixes conflicts 2015-10-31 17:09:52 +01:00
Juanjo Bazán
01022d2b42 Merge pull request #651 from AyuntamientoMadrid/translations_en 
Translations en
 2015-10-29 12:46:14 +01:00
Alberto Garcia Cabeza
2e421ff760 Improves styles for print_proposals 2015-10-28 20:06:04 +01:00
kikito
e4bfc72649 Refactors design of comments order selector into a partial with i18n 2015-10-28 15:48:48 +01:00
Alberto Garcia Cabeza
82eb0bd902 Adds comments filter for debates and proposals 2015-10-28 13:28:37 +01:00
Alberto Garcia Cabeza
f675816de2 Improves styles for language select 2015-10-28 12:51:23 +01:00
Sergio Arbeo
12ec1fe6f6 Update comments count when commenting on a debate or proposal 2015-10-27 01:02:39 +01:00
Alberto Garcia Cabeza
2d0fbe113b Improves featured proposals styles 2015-10-22 13:27:33 +02:00
Raimond Garcia
5582e1016d Merge pull request #632 from AyuntamientoMadrid/faq_page 
Adds faq page
 2015-10-22 12:24:40 +02:00
Alberto Garcia Cabeza
350bd32641 Adds new styles for featured proposals 2015-10-22 11:52:46 +02:00
Alberto Garcia Cabeza
05be2f55e8 Adds faq page 2015-10-22 02:14:52 +02:00
kikito
3ab579999e merges with master and fixes conflicts 2015-10-20 16:28:22 +02:00
Alberto Garcia Cabeza
b33553cc1d Adds new styles to verifica page 2015-10-20 15:45:08 +02:00
Raimond Garcia
c2b9745401 Merge pull request #622 from AyuntamientoMadrid/improve_management 
Improves styles for management on IE
 2015-10-20 14:38:44 +02:00