Commit Graph

1520 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
9a5f525dc9 marcar notificaciones como leidas despues de ser vistas 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
Julian Herrero
ba0ce4e14b añadir track_activity para mostrar futuras notificaciones a los usuarios 2016-01-05 17:42:10 +01:00
Alberto Garcia Cabeza
833d7e0f01 Improves navigation for mobile version 2016-01-05 07:37:49 +01:00
Juanjo Bazán
bbc0f07b74 returns 404 for not found pages
(instead of 500 by MissingTemplate)

Fixes #792
2015-12-30 14:27:16 +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
kikito
d194bf0adc takes the user to the same page he was in after logout 2015-12-22 11:19:06 +01:00
kikito
df7bb4ac95 Merge branch 'master' into devise-location 2015-12-22 10:54:52 +01:00
kikito
866e04f776 makes devise remember the last visited page before login in 2015-12-21 16:44:30 +01:00
Juanjo Bazán
0dcc176098 removes before_filter
(deprecated in favor of before_action)
2015-12-19 10:21:53 +01:00
kikito
b00dd2bf81 adds more i81n entries to gettext.js.coffee 2015-12-18 17:13:52 +01:00
kikito
756c07c180 hides the admin checkboxes in annotator when editing an existing annotation 2015-12-18 16:31:30 +01:00
Enrique García
4e97687c81 Merge pull request #779 from consul/proposal-percentages
uses proposal total_votes for % helper methods
2015-12-18 13:32:50 +01:00
Juanjo Bazán
cf271fe33a uses proposal total_votes for % helper methods 2015-12-18 13:15:00 +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
f5dd8de398 Improves styles for annotator popup 2015-12-17 21:09:54 +01:00
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
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
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
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
2c9cbb9ce6 Uses the current user in annotator.js 2015-12-16 18:46:56 +01:00
kikito
60099e982b Adds the current user to the html element in application layout 2015-12-16 18:45:22 +01:00
kikito
900f11fd49 ActiveRecord.find already throws a 404 if not existing; there is no find! 2015-12-16 18:44:55 +01:00
kikito
60e78e58fa Rename ability 2015-12-16 18:44:27 +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
cf04b48d4e Allow anyone to search and read annotations 2015-12-16 18:10:17 +01:00
kikito
c98360fa87 Return a permissions hash with all the annotations 2015-12-16 18:10:02 +01:00
kikito
3245aa9dd2 Do not accept user_id as parameter when creating annotations 2015-12-16 18:09:10 +01:00
kikito
6335732ce6 Ensure that 404 errors are thrown for inexistent annotations 2015-12-16 18:07:03 +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
fc8a1fc84b allows not-logged-in users to read existing annotations 2015-12-16 16:26:59 +01:00
Julian Herrero
e7314ac380 add option to subscribe/unsubscribe to website newsletter 2015-12-16 16:14:35 +01:00