Commit Graph

894 Commits

Author SHA1 Message Date
rgarcia
e2f419e625 destroy notifications when marked as read 2016-01-07 12:02:01 +01:00
rgarcia
b5e9113718 merges activities into notifications 2016-01-06 12:33:37 +01:00
Julian Herrero
7a8ffe2d4a cleanup 2016-01-05 17:43:44 +01:00
Julian Herrero
d9ba3edc2a mostrar notificaciones a los usuarios cuando alguien comenta en su
debate o responde a su comentario
2016-01-05 17:43:44 +01:00
Alberto Garcia Cabeza
833d7e0f01 Improves navigation for mobile version 2016-01-05 07:37:49 +01:00
Julian Herrero
b64dc3a7cb Merge branch 'master' of https://github.com/consul/consul 2015-12-24 12:58:51 +01:00
Julian Herrero
2049eb0455 rename column name to newsletter 2015-12-24 12:53:03 +01:00
kikito
9c1990b060 fixes typo in layout.html.erb 2015-12-22 16:37:26 +01:00
kikito
dc1f98e195 Allows multi-line values in settings 2015-12-22 16:22:02 +01:00
kikito
1df5bf582f Renames per_page_javascript to per_page_code 2015-12-22 16:21:37 +01:00
kikito
963e33005b allows nil values in per_page_js setting 2015-12-22 15:38:16 +01:00
kikito
1c71358abe adds a setting allowing including custom javascript on each page header 2015-12-22 13:29:41 +01:00
Alberto Garcia Cabeza
69e66ccbeb Adds annotator help 2015-12-18 12:21:47 +01:00
rgarcia
0a555af6f4 fixes specs 2015-12-17 21:41:53 +01:00
Alberto Garcia Cabeza
c051750248 Fixes typos 2015-12-17 21:07:05 +01:00
Alberto Garcia Cabeza
023b1ddf72 Improves legislation view 2015-12-17 21:02:52 +01:00
kikito
5d2c37e71f Displays a message when an unregistered user tries to annotate 2015-12-17 18:25:53 +01:00
kikito
555d409474 hides the annotator adder when the user is not logged in 2015-12-17 17:49:51 +01:00
rgarcia
89896a94ee renames legislation body id 2015-12-16 19:37:27 +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
60099e982b Adds the current user to the html element in application layout 2015-12-16 18:45:22 +01:00
kikito
0c96b2da8d Removes all remaining traces of setting the user_id in the browser. 2015-12-16 18:44:10 +01:00
Julian Herrero
e7314ac380 add option to subscribe/unsubscribe to website newsletter 2015-12-16 16:14:35 +01:00
Julian Herrero
81bc3d7267 add link in emails to manage notification settings (unsubscribe) 2015-12-16 16:13:25 +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
52e5cda45e Improves footer and account page 2015-12-16 13:03:23 +01:00
Alberto Garcia Cabeza
66acbdbb66 Removes unused classes 2015-12-16 11:58:36 +01:00
rgarcia
1702426414 adds search and create specs 2015-12-16 11:45:47 +01:00
rgarcia
60d6f1c41b annotates legislations instead of proposals 2015-12-16 11:45:47 +01:00
rgarcia
996e87cb13 adds legislations 2015-12-16 11:45:46 +01:00
Rod Wilhelmy
dea9110a69 Fix nil error for non-logged users in proposals#show 2015-12-16 11:45:46 +01:00
Abigail Sosa
bb5da1af7f Se agrega usuario autor a cada anotacion 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
Juanjo Bazán
a643c7c300 removes unused page 2015-12-16 11:28:37 +01:00
Alberto Garcia Cabeza
e40f411ecc Removes unused header css method 2015-12-15 17:04:03 +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
Alberto Garcia Cabeza
eb47f3de44 Removes unused static page 2015-12-14 18:20:51 +01:00
Josep Jaume Rey Peroy
a430c3e631 Fix footer links 2015-12-14 16:13:30 +01:00
Juanjo Bazán
328bd767ca adds js file for IE eyes only 2015-12-14 12:56:50 +01:00
Josep Jaume Rey Peroy
80104d100f Normalize page paths
Normalize page paths so they can be accessed by `page_path(:id)`.

The benefit of this is that we can add any arbitrary amount of pages
without affecting the routing layer.
2015-12-12 10:22:27 +01:00
Ana
23cbe7ee9f how to use moved to locale files 2015-12-06 22:13:39 +01:00
Ana
697fa748a3 More information moved to locale files and translated 2015-12-05 18:20:36 +01:00
Ana
ec25d5f6fa how it works page moved tolocale files using markdown 2015-12-05 16:10:19 +01:00
Alberto Garcia Cabeza
9ad798d26d Fixes conflicts 2015-12-03 20:50:21 +01:00
Alberto Garcia Cabeza
7beff47af6 Removes unused keys 2015-12-03 20:46:36 +01:00
Alberto Garcia Cabeza
1bbd36fd11 Improves header and footer styles 2015-12-03 20:46:36 +01:00
Juanjo Bazán
c47f5e84b6 removes provisional transparency page 2015-12-03 20:46:19 +01:00