Commit Graph

780 Commits

Author SHA1 Message Date
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
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
kikito
2ced669821 legislation annotation spec cleanup 2015-12-16 11:45:47 +01:00
rgarcia
1702426414 adds search and create specs 2015-12-16 11:45:47 +01:00
Abigail Sosa
189a6426b1 Se agregan anotaciones a propuestas existentes 2015-12-16 11:45:46 +01:00
Alberto Garcia Cabeza
eb47f3de44 Removes unused static page 2015-12-14 18:20:51 +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
Jakub
ea9a2b3be6 Better names for the official email methods 2015-11-30 21:52:48 +01:00
Jakub
da490a4661 Officials level 1 is auto-assigned on email confirmation. Settings option is now optional. Also working on subdomains 2015-11-30 20:48:12 +01:00
Jakub
a1e4c1526b Spec: test email_domain_for_officials 2015-11-29 14:23:50 +01:00
Juanjo Bazán
fe350c2fe4 Merge pull request #735 from codegram/change_default_locale
Use `en` as default locale on tests
2015-11-27 18:20:58 +01:00
Josep Jaume Rey Peroy
c83b1804e2 Use en as default locale on tests 2015-11-27 18:04:46 +01:00
Jakub
8974276681 Spec: Ensure that the submit button is disabled when clicked 2015-11-27 14:44:12 +01:00
rgarcia
3f68c6726a maintains responsible name when user is erased 2015-11-23 19:12:57 +01:00
rgarcia
dffc5f5eae adds specs 2015-11-23 13:43:48 +01:00
rgarcia
d19c84e940 tmp commit 2015-11-20 17:18:16 +01:00
rgarcia
4d3a9d1908 rearranges specs 2015-11-20 16:48:06 +01:00
rgarcia
1429728368 improves search order 2015-11-18 21:30:12 +01:00
rgarcia
c212aa3afd fixes specs 2015-11-18 21:04:16 +01:00
Juanjo Bazán
19212a6b46 fixes 'My activity' comments count for admins/mods 2015-11-17 19:40:18 +01:00