Commit Graph

918 Commits

Author SHA1 Message Date
Juanjo Bazán
bc8c14e4a1 adds geozone to spending_proposals 2016-01-11 12:18:23 +01:00
Juanjo Bazán
8aebfecae0 removes tags from spending proposals 2016-01-11 12:18:01 +01:00
Juanjo Bazán
54badef191 users can create spending proposals 2016-01-11 12:17:10 +01:00
Juanjo Bazán
8b8c1feab7 favors underscore for resource name resolution
SpendingProposal becomes spending_proposal instead of spendingproposal
2016-01-11 12:17:10 +01:00
Juanjo Bazán
767d1fd09e adds spending_proposals info page 2016-01-11 12:16:31 +01:00
Juanjo Bazán
c9950f8c11 activate header menus for all actions 2016-01-11 12:16:31 +01:00
Juanjo Bazán
864ef6e73b adds basic spending proposals index 2016-01-11 12:16:31 +01:00
Juanjo Bazán
2c36ceb10c adds abilities for SpendingProposals 2016-01-11 12:15:42 +01:00
Juanjo Bazán
fb7550c7de fixes build 2016-01-08 15:12:10 +01:00
Juanjo Bazán
307b29736d Merge branch 'master' into notifications 2016-01-08 15:07:16 +01:00
Juanjo Bazán
432e9e0d5b adds counter cache for user's notifications 2016-01-08 14:39:34 +01:00
Juanjo Bazán
704a038795 groups notifications 2016-01-08 14:32:16 +01:00
Alberto Garcia Cabeza
9db19a3049 Merge branch 'master' into comment-show 2016-01-08 13:41:25 +01:00
Alberto Garcia Cabeza
5ef9f4de87 Improves styles for comments show 2016-01-08 13:41:18 +01:00
Alberto Garcia Cabeza
de51bb0f79 Merge branch 'master' into notifications 2016-01-08 12:46:28 +01:00
Alberto Garcia Cabeza
e008d1f642 Adds new styles for notifications 2016-01-08 12:45:37 +01:00
Alberto Garcia Cabeza
4ff27d3d16 Moves featured debates and proposals 2016-01-07 17:05:21 +01:00
Alberto Garcia Cabeza
b84730aac0 Merge branch 'master' into design_layout 2016-01-07 16:21:00 +01:00
rgarcia
816a95b7b7 adds comment show view 2016-01-07 15:18:28 +01:00
Alberto Garcia Cabeza
c9f9433f96 Improves styles for submenu links 2016-01-07 13:49:42 +01:00
Alberto Garcia Cabeza
9b2ab35b98 Improves styles for tags 2016-01-07 12:47:21 +01:00
kikito
2467ee4a54 removes unused i18n keys 2016-01-07 12:37:16 +01:00
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
kikito
7eda0b2889 Uses order_links in proposals/index and debates/index 2016-01-05 19:37:40 +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
6bb4baa809 Removes social icons from header 2016-01-05 17:07:27 +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