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 |
|
Enrique García
|
539336a119
|
Merge pull request #778 from consul/annotator-help
Adds annotator help
|
2015-12-18 13:17:42 +01:00 |
|
Juanjo Bazán
|
cf271fe33a
|
uses proposal total_votes for % helper methods
|
2015-12-18 13:15:00 +01:00 |
|
kikito
|
fc3a2e8a62
|
Add additional check on on the legislation spec
|
2015-12-18 13:09:52 +01:00 |
|
Alberto Garcia Cabeza
|
69e66ccbeb
|
Adds annotator help
|
2015-12-18 12:21:47 +01:00 |
|
Juanjo Bazán
|
3f195d6234
|
Merge pull request #775 from consul/annotator-fixes
Annotator fixes
|
2015-12-17 21:49:07 +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
|
0021eb58ff
|
Comments annotator css on js file
|
2015-12-17 21:03:52 +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 |
|
Juanjo Bazán
|
44047004e6
|
Merge pull request #773 from consul/annotator-specs
Annotator specs
|
2015-12-16 19:53:58 +01:00 |
|
rgarcia
|
c2eadd47ad
|
fixes specs
|
2015-12-16 19:46:17 +01:00 |
|
rgarcia
|
5a6a915a1b
|
removes unused test code
|
2015-12-16 19:37:48 +01:00 |
|
rgarcia
|
ba8742d1b5
|
moves default annotation range to factory
|
2015-12-16 19:37:27 +01:00 |
|
rgarcia
|
89896a94ee
|
renames legislation body id
|
2015-12-16 19:37:27 +01:00 |
|
rgarcia
|
221eeaa299
|
tests for annotation text instead of 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
|
61357afba7
|
Fixes failing tests (now you can not edit/destroy annotations unless you are their author!)
|
2015-12-16 18:47:28 +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 |
|
kikito
|
9ebcebb2ab
|
makes more tests green
|
2015-12-16 16:21:40 +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 |
|
kikito
|
7996f5f816
|
makes cancan return a json error when asked for json and permissions fail
|
2015-12-16 14:02:03 +01:00 |
|
Raimond Garcia
|
ee473c124e
|
Merge pull request #770 from consul/refactor_styles
Refactor styles
|
2015-12-16 13:51:38 +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
|
52e5cda45e
|
Improves footer and account page
|
2015-12-16 13:03:23 +01:00 |
|
Enrique García
|
5607f0f86a
|
Merge pull request #769 from consul/annotator
Annotator
|
2015-12-16 12:06:00 +01:00 |
|
Alberto Garcia Cabeza
|
114808745d
|
Adds mixins SCSS
|
2015-12-16 11:58:57 +01:00 |
|