Alberto García Cabeza
|
e9ca76f34d
|
Merge pull request #789 from consul/custom-js-in-header
adds a setting allowing including custom javascript on each page header
|
2015-12-22 13:54:29 +01:00 |
|
kikito
|
1c71358abe
|
adds a setting allowing including custom javascript on each page header
|
2015-12-22 13:29:41 +01:00 |
|
Juanjo Bazán
|
b828b8a7e6
|
Merge pull request #787 from consul/devise-location
Devise location
|
2015-12-22 12:21:04 +01:00 |
|
kikito
|
8c8e837dfc
|
fixes failing moderation spec
|
2015-12-22 12:14:42 +01:00 |
|
Juanjo Bazán
|
7dbe31547c
|
Merge pull request #788 from consul/refactor-census-api
refactors method in census_api.rb
|
2015-12-22 11:57:00 +01:00 |
|
kikito
|
5e1fba288c
|
refactors method in census_api.rb
|
2015-12-22 11:49:38 +01:00 |
|
kikito
|
5f563911ad
|
adds a test
|
2015-12-22 11:26:42 +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 |
|
Juanjo Bazán
|
b6162dd24c
|
Merge pull request #786 from consul/census-api-plus
makes the census api try several variants before failing a verification
|
2015-12-21 17:32:26 +01:00 |
|
kikito
|
d8e6584bfe
|
fixes comments
|
2015-12-21 17:10:07 +01:00 |
|
kikito
|
57e72206d2
|
makes the census api try several variants before failing a verification
|
2015-12-21 17:07:48 +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
|
a83b14823f
|
updates dependencies
|
2015-12-20 22:39:14 +01:00 |
|
Juanjo Bazán
|
0dcc176098
|
removes before_filter
(deprecated in favor of before_action)
|
2015-12-19 10:21:53 +01:00 |
|
Juanjo Bazán
|
02bdeec164
|
updates nokogiri (security alert)
more info: https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.rdoc#1671--2015-12-16
|
2015-12-18 19:35:52 +01:00 |
|
Enrique García
|
ef381265fd
|
Merge pull request #781 from consul/speed-for-free
memoizes i18n keys
|
2015-12-18 18:08:02 +01:00 |
|
Juanjo Bazán
|
4f4f005328
|
removes i18n memorization for development env
|
2015-12-18 17:47:22 +01:00 |
|
Juanjo Bazán
|
7998daef7f
|
memoizes i18n keys
|
2015-12-18 17:39:32 +01:00 |
|
Juanjo Bazán
|
3976871601
|
Merge pull request #780 from consul/annotator-polish
Annotator polish
|
2015-12-18 17:31:25 +01:00 |
|
kikito
|
b864c164b2
|
eliminates unused javascript files
|
2015-12-18 17:17:15 +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 |
|
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 |
|