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
Juanjo Bazán
307b29736d
Merge branch 'master' into notifications
2016-01-08 15:07:16 +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
Juanjo Bazán
a976e16ef3
redirects notification show to notifiable
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
rgarcia
816a95b7b7
adds comment show view
2016-01-07 15:18:28 +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
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
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
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
900f11fd49
ActiveRecord.find already throws a 404 if not existing; there is no find!
2015-12-16 18:44:55 +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
Julian Herrero
e7314ac380
add option to subscribe/unsubscribe to website newsletter
2015-12-16 16:14:35 +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
rgarcia
60d6f1c41b
annotates legislations instead of proposals
2015-12-16 11:45:47 +01:00
rgarcia
996e87cb13
adds legislations
2015-12-16 11:45:46 +01:00
Abigail Sosa
bb5da1af7f
Se agrega usuario autor a cada anotacion
2015-12-16 11:45:46 +01:00
Abigail Sosa
e2f6950dc4
Carga anotaciones de la propuesta
2015-12-16 11:45:46 +01:00
Abigail Sosa
cf8a952b0b
Se pueden eliminar anotaciones
2015-12-16 11:45:46 +01:00
Abigail Sosa
5743068780
Se pueden editar - actualizar anotaciones
2015-12-16 11:45:46 +01:00
Abigail Sosa
189a6426b1
Se agregan anotaciones a propuestas existentes
2015-12-16 11:45:46 +01:00
Josep Jaume Rey Peroy
80104d100f
Normalize page paths
...
Normalize page paths so they can be accessed by `page_path(:id)`.
The benefit of this is that we can add any arbitrary amount of pages
without affecting the routing layer.
2015-12-12 10:22:27 +01:00
Juanjo Bazán
349288b992
removes provisional transparency page
2015-12-03 12:51:51 +01:00
Jakub
e4b31cfe29
Move automatic official_level assignment to the controller.
2015-12-01 23:18:23 +01:00
rgarcia
40ea3fcc58
displays relevance order in searches
2015-11-23 13:39:32 +01:00
Juanjo Bazán
19212a6b46
fixes 'My activity' comments count for admins/mods
2015-11-17 19:40:18 +01:00
Juanjo Bazán
1ca7ca6e05
hides comments posted as mod/admin from user page
2015-11-12 12:22:21 +01:00
Juanjo Bazán
f57eef4929
makes public activity toggleable
2015-11-04 13:51:31 +01:00
Juanjo Bazán
7f1fe034a3
adds user's public show page
2015-11-03 19:29:35 +01:00
kikito
cf31e89204
Fixes issues in moderation spex related with comment sort
2015-11-02 15:54:15 +01:00
kikito
73c306a673
Adds 3 orders for comments: most_voted, newest, oldest
2015-11-02 14:01:55 +01:00
kikito
2fab210ac8
merges with master and fixes conflicts
2015-10-31 17:09:52 +01:00
kikito
60b3c65b05
Refactor comment tree calculation using a PORO
2015-10-30 17:00:32 +01:00
Juanjo Bazán
d3423b72b8
hides featured proposal from tag page
2015-10-30 12:14:18 +01:00
Juanjo Bazán
1e0ac137bb
removes beta testers functionality
2015-10-29 13:19:00 +01:00
