Julian Herrero
|
8ef9e69f71
|
Update from upstream
|
2016-01-10 15:26:19 +01:00 |
|
Julian Herrero
|
7c65b8555c
|
redirect to frendly url for debates and proposals if needed
|
2016-01-10 13:38:22 +01:00 |
|
Julian Herrero
|
bf302be879
|
add frendly urls for debates and proposals
|
2016-01-08 17:24:49 +01:00 |
|
Juanjo Bazán
|
fb7550c7de
|
fixes build
|
2016-01-08 15:12:10 +01:00 |
|
Juanjo Bazán
|
307b29736d
|
Merge branch 'master' into notifications
|
2016-01-08 15:07:16 +01:00 |
|
Juanjo Bazán
|
432e9e0d5b
|
adds counter cache for user's notifications
|
2016-01-08 14:39:34 +01:00 |
|
Juanjo Bazán
|
704a038795
|
groups notifications
|
2016-01-08 14:32:16 +01:00 |
|
Alberto Garcia Cabeza
|
9db19a3049
|
Merge branch 'master' into comment-show
|
2016-01-08 13:41:25 +01:00 |
|
Alberto Garcia Cabeza
|
5ef9f4de87
|
Improves styles for comments show
|
2016-01-08 13:41:18 +01:00 |
|
Juanjo Bazán
|
a976e16ef3
|
redirects notification show to notifiable
|
2016-01-08 13:06:00 +01:00 |
|
Juanjo Bazán
|
790d8de5b6
|
removes unused method
|
2016-01-08 13:06:00 +01:00 |
|
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 |
|
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
|
816a95b7b7
|
adds comment show view
|
2016-01-07 15:18:28 +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
|
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 |
|
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 |
|