Commit Graph

1488 Commits

Author SHA1 Message Date
Juanjo Bazán
5ed3a2280e Merge branch 'master' of https://github.com/danibaena/consul into danibaena-master 2016-01-21 17:47:29 +01:00
Juanjo Bazán
09b53a3d0a Merge pull request #822 from consul/advanced-search
Advanced search
2016-01-18 15:17:17 +01:00
Josep Jaume Rey Peroy
5de3d700e4 Simplify Settings API 2016-01-18 12:43:34 +01:00
Alberto Garcia Cabeza
8ef74f1e11 Merges master branch 2016-01-18 11:33:49 +01:00
rgarcia
82f9a656ad moves search by author name to full text searches 2016-01-16 22:10:17 +01:00
Juanjo Bazán
d31c846a1f cleans format 2016-01-15 11:10:58 +01:00
Juanjo Bazán
0c6e21aa59 Merge branch 'five_last_week' of https://github.com/pardoam/participacion into pardoam-five_last_week 2016-01-15 10:55:24 +01:00
MaiteHdezRivas
b3ee6d4921 adds specs 2016-01-14 13:12:34 +01:00
Juanjo Bazán
1ab0b31d4b only level 2 users can create spending proposals 2016-01-13 13:35:21 +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
d6abf44477 adds Geozones 🗺 2016-01-11 12:18:01 +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
8ef9e69f71 Update from upstream 2016-01-10 15:26:19 +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
Juanjo Bazán
790d8de5b6 removes unused method 2016-01-08 13:06:00 +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
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
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
Julian Herrero
e7314ac380 add option to subscribe/unsubscribe to website newsletter 2015-12-16 16:14:35 +01:00
Abigail Sosa
189a6426b1 Se agregan anotaciones a propuestas existentes 2015-12-16 11:45:46 +01:00
Daniel Baena
f8e1fc70a1 #670 2015-12-11 21:06:27 +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
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
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
rgarcia
0277106a08 fixes specs 2015-11-17 10:14:11 +01:00
Juanjo Bazán
c258a4f3b4 adds scope for only normal user comments 2015-11-12 12:15:36 +01:00
Juanjo Bazán
6d26901f9f adds specs for user's page 2015-11-03 20:26:13 +01:00
kikito
f0e9005332 Adds missing spec to comment 2015-11-02 14:01:55 +01:00
kikito
2fab210ac8 merges with master and fixes conflicts 2015-10-31 17:09:52 +01:00
rgarcia
84610db830 marking debates search specs as pending 2015-10-30 22:04:07 +01:00
rgarcia
593ed551d4 adds search specs 2015-10-29 14:29:52 +01:00
kikito
f5d9ea4357 adds confidence_score capacity to the comment model 2015-10-28 16:25:35 +01:00
Alberto Garcia Cabeza
2bf6603207 Merges master and fixes conflicts 2015-10-28 12:51:23 +01:00
Alberto Garcia Cabeza
abad54d01a Updates tests with new texts 2015-10-28 12:47:51 +01:00
Juanjo Bazán
cf4f9945e8 checks letter verification code as integers 2015-10-27 19:15:01 +01:00