Commit Graph

6051 Commits

Author SHA1 Message Date
Juanjo Bazán
aee9a9d7c0 adds geozone helper 2016-01-11 14:01:50 +01:00
Juanjo Bazán
3f05864a16 adds spending proposals to admin 2016-01-11 13:45:10 +01:00
Juanjo Bazán
7c92a92537 adds resolution query methods 2016-01-11 12:53:05 +01:00
Juanjo Bazán
9a8dcd660f adds resolution scopes 2016-01-11 12:18:46 +01:00
Juanjo Bazán
facf6183d7 adds resolution to spending proposals 2016-01-11 12:18:45 +01:00
Juanjo Bazán
bc8c14e4a1 adds geozone to spending_proposals 2016-01-11 12:18:23 +01:00
Juanjo Bazán
d6abf44477 adds Geozones 🗺 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
Juanjo Bazán
a6f8c79268 adds SpendingProposal model 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
Julian Herrero
083772aa62 add frendly urls for debates and proposals (specs) 2016-01-08 17:32:16 +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
790d8de5b6 removes unused method 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
14e0cf29da Updates test 2016-01-07 17:21:51 +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
9898353d99 Fixes specs for debates and proposals 2016-01-05 19:38:36 +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
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
8c8e837dfc fixes failing moderation spec 2015-12-22 12:14:42 +01:00
kikito
5f563911ad adds a test 2015-12-22 11:26:42 +01:00
kikito
57e72206d2 makes the census api try several variants before failing a verification 2015-12-21 17:07:48 +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
kikito
fc3a2e8a62 Add additional check on on the legislation spec 2015-12-18 13:09:52 +01:00
rgarcia
0a555af6f4 fixes specs 2015-12-17 21:41:53 +01:00
rgarcia
c2eadd47ad fixes specs 2015-12-16 19:46:17 +01:00
rgarcia
5a6a915a1b removes unused test code 2015-12-16 19:37:48 +01:00
rgarcia
ba8742d1b5 moves default annotation range to factory 2015-12-16 19:37:27 +01:00
rgarcia
89896a94ee renames legislation body id 2015-12-16 19:37:27 +01:00
rgarcia
221eeaa299 tests for annotation text instead of id 2015-12-16 19:37:27 +01:00
kikito
61357afba7 Fixes failing tests (now you can not edit/destroy annotations unless you are their author!) 2015-12-16 18:47:28 +01:00
kikito
9ebcebb2ab makes more tests green 2015-12-16 16:21:40 +01:00
Julian Herrero
e7314ac380 add option to subscribe/unsubscribe to website newsletter 2015-12-16 16:14:35 +01:00
Julian Herrero
81bc3d7267 add link in emails to manage notification settings (unsubscribe) 2015-12-16 16:13:25 +01:00
rgarcia
b5c945f1f5 cleans up specs 2015-12-16 11:45:47 +01:00
kikito
f0440f3208 adds annotation destroy spec 2015-12-16 11:45:47 +01:00
rgarcia
1512e944df adds update annotation spec 2015-12-16 11:45:47 +01:00