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
|
6bb4baa809
|
Removes social icons from header
|
2016-01-05 17:07:27 +01:00 |
|
Juanjo Bazán
|
5e9240e25c
|
Merge pull request #805 from consul/mobile_navigation
Improves navigation for mobile version
|
2016-01-05 08:14:05 +01:00 |
|
Alberto Garcia Cabeza
|
833d7e0f01
|
Improves navigation for mobile version
|
2016-01-05 07:37:49 +01:00 |
|
Raimond Garcia
|
0b6cdc0368
|
Merge pull request #794 from consul/not-found-pages
returns 404 for not found pages
|
2015-12-30 15:46:58 +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 |
|
Juanjo Bazán
|
f7f32747f0
|
Merge pull request #771 from microweb10/manage_email_notifications
Manage email notifications
|
2015-12-24 13:24:08 +01:00 |
|
Julian Herrero
|
29705d9dc9
|
Merge branch 'master' into manage_email_notifications
|
2015-12-24 12:59:43 +01:00 |
|
Julian Herrero
|
b64dc3a7cb
|
Merge branch 'master' of https://github.com/consul/consul
|
2015-12-24 12:58:51 +01:00 |
|
Julian Herrero
|
31ea56d81f
|
Merge branch 'manage_email_notifications'
|
2015-12-24 12:55:51 +01:00 |
|
Julian Herrero
|
2049eb0455
|
rename column name to newsletter
|
2015-12-24 12:53:03 +01:00 |
|
Juanjo Bazán
|
a4dec13b9c
|
tweaks Gemfile
|
2015-12-23 18:37:19 +01:00 |
|
Juanjo Bazán
|
b6c179cb93
|
updates rollbar
|
2015-12-23 18:27:16 +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 |
|
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 |
|