Juanjo Bazán
|
ab74bd58fa
|
avoids queries when creating a notification
|
2016-01-08 13:06:00 +01:00 |
|
Alberto Garcia Cabeza
|
de51bb0f79
|
Merge branch 'master' into notifications
|
2016-01-08 12:46:28 +01:00 |
|
Alberto Garcia Cabeza
|
40ffeeaeb0
|
Removes unused method
|
2016-01-08 12:46:02 +01:00 |
|
Alberto Garcia Cabeza
|
e008d1f642
|
Adds new styles for notifications
|
2016-01-08 12:45:37 +01:00 |
|
Alberto Garcia Cabeza
|
09120b6129
|
Updates icons font
|
2016-01-08 12:44:40 +01:00 |
|
Enrique García
|
017bfe9146
|
Merge pull request #813 from consul/gitignore
Ignores byebug history
|
2016-01-07 18:16:49 +01:00 |
|
rgarcia
|
90ee85ecdf
|
ignores byebug history
|
2016-01-07 17:51:06 +01:00 |
|
Raimond Garcia
|
bcf8c18143
|
Merge pull request #812 from consul/design_layout
Design layout
|
2016-01-07 17:42:20 +01:00 |
|
Alberto Garcia Cabeza
|
14e0cf29da
|
Updates test
|
2016-01-07 17:21:51 +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
|
9c2b576431
|
fixes specs
|
2016-01-07 15:30:48 +01:00 |
|
Juanjo Bazán
|
5e635d7cfc
|
Merge pull request #809 from consul/selects-to-links
Selects to links (needs style)
|
2016-01-07 14:12:56 +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 |
|
Alberto Garcia Cabeza
|
2948a2ebe4
|
Improves search form of header
|
2016-01-07 12:05:05 +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
|
8a594e673a
|
modifies i18n for the new orders
|
2016-01-05 19:39:59 +01:00 |
|
kikito
|
9898353d99
|
Fixes specs for debates and proposals
|
2016-01-05 19:38:36 +01:00 |
|
kikito
|
b89f39bfef
|
Removes unused orders from debates controller
|
2016-01-05 19:37:56 +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
|
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
|
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 |
|