rgarcia
|
66b704b3b9
|
refactors filterable concern
|
2016-01-13 19:25:48 +01:00 |
|
rgarcia
|
d147cec929
|
moves filters to a concern
|
2016-01-13 19:25:48 +01:00 |
|
Ana
|
0993a6ec1a
|
Error corrected
|
2016-01-13 19:25:47 +01:00 |
|
Ana
|
d3f9920e28
|
Advanced search corrections
|
2016-01-13 19:25:47 +01:00 |
|
Ana
|
48d6a76491
|
Advanced search added to debates
|
2016-01-13 19:25:47 +01:00 |
|
Ana
|
a7b70f50e2
|
Advanced search - author type finished
|
2016-01-13 19:25:46 +01:00 |
|
Ana
|
4d3e3f2e09
|
Advanced search - except author type
|
2016-01-13 19:25:46 +01:00 |
|
kikito
|
e014b3ad83
|
fixes failing specs
|
2016-01-13 16:58:17 +01:00 |
|
kikito
|
ae6d70b1c1
|
Uses Abilities instead of exceptions in the proposals controller
|
2016-01-13 16:32:10 +01:00 |
|
Juanjo Bazán
|
eb4c352f7d
|
removes before_action in favor of cancancan
|
2016-01-13 12:56:27 +01:00 |
|
nachogomez
|
bcfe50b41e
|
Add Thematic structure and Districts - Iss685 - 12 january 2016
|
2016-01-13 12:11:33 +01:00 |
|
Juanjo Bazán
|
e5caf84c02
|
adds show view in admin for spending proposals
|
2016-01-11 14:25:33 +01:00 |
|
Juanjo Bazán
|
3f05864a16
|
adds spending proposals to admin
|
2016-01-11 13:45:10 +01:00 |
|
Juanjo Bazán
|
bc8c14e4a1
|
adds geozone to spending_proposals
|
2016-01-11 12:18:23 +01:00 |
|
Juanjo Bazán
|
8aebfecae0
|
removes tags from spending proposals
|
2016-01-11 12:18:01 +01:00 |
|
Juanjo Bazán
|
54badef191
|
users can create spending proposals
|
2016-01-11 12:17:10 +01:00 |
|
Juanjo Bazán
|
864ef6e73b
|
adds basic spending proposals index
|
2016-01-11 12:16:31 +01:00 |
|
Juanjo Bazán
|
2c36ceb10c
|
adds abilities for SpendingProposals
|
2016-01-11 12:15:42 +01:00 |
|
Julian Herrero
|
7bbfcd74e2
|
check if username is available in registration form
|
2016-01-10 19:17:20 +01:00 |
|
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 |
|
nachogomez
|
51d9d186af
|
Add Thematic structure and Districts - Iss685
|
2016-01-08 13:49:23 +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 |
|