Commit Graph

719 Commits

Author SHA1 Message Date
kikito
5ea8d76903 Rename find_for_oauth param and refactor user expression 2016-01-26 18:10:50 +01:00
kikito
271146f688 Rename Identity method
Remove Identity method
2016-01-26 18:10:47 +01:00
rgarcia
21b9e31f11 uses geozones instead of district tags 2016-01-25 22:28:46 +01:00
Perisso
7d1d4cea4a filter by districts and categories 2016-01-25 22:28:17 +01:00
Juanjo Bazán
bb60e6b8e0 adds #enabled? to Setting 2016-01-25 14:07:07 +01:00
Juanjo Bazán
05837afd72 adds #feature_flag? to Setting 2016-01-25 13:45:15 +01:00
Juanjo Bazán
853f2c6fba fixes disabling of features via admin interface 2016-01-25 12:44:00 +01:00
Josep Jaume Rey Peroy
cf00f12ec7 Store locale in a user's field and switch locale on mailers 2016-01-22 18:10:28 +01:00
beagleknight
f595c6ee7f Use model table name instead of hardcoding it 2016-01-19 12:44:15 +01:00
Juanjo Bazán
393388de71 Merge pull request #830 from AjuntamentdeBarcelona/feature_flags
Feature flags
2016-01-18 15:19:09 +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
2d45828cad Feature-flag debates 2016-01-18 13:05:00 +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
rgarcia
5dc9d9313b adds multiple filters spec 2016-01-15 12:41: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
rgarcia
66b704b3b9 refactors filterable concern 2016-01-13 19:25:48 +01:00
rgarcia
0cfddca432 uses scopes 2016-01-13 19:25:48 +01:00
rgarcia
d147cec929 moves filters to a concern 2016-01-13 19:25:48 +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
9a31795615 removes default scope from Geozone 2016-01-13 13:06:20 +01:00
Juanjo Bazán
eb4c352f7d removes before_action in favor of cancancan 2016-01-13 12:56:27 +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
7b9285f93f defaults to order geozones by name 2016-01-11 12:18:23 +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
1710445016 makes Sanitizable concern work for non taggables 2016-01-11 12:18:01 +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
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
bf302be879 add frendly urls for debates and proposals 2016-01-08 17:24:49 +01:00
Juanjo Bazán
307b29736d Merge branch 'master' into notifications 2016-01-08 15:07:16 +01:00
Juanjo Bazán
432e9e0d5b adds counter cache for user's notifications 2016-01-08 14:39:34 +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
ba0ce4e14b añadir track_activity para mostrar futuras notificaciones a los usuarios 2016-01-05 17:42:10 +01:00
kikito
756c07c180 hides the admin checkboxes in annotator when editing an existing annotation 2015-12-18 16:31:30 +01:00
kikito
60e78e58fa Rename ability 2015-12-16 18:44:27 +01:00
kikito
cf04b48d4e Allow anyone to search and read annotations 2015-12-16 18:10:17 +01:00
kikito
c98360fa87 Return a permissions hash with all the annotations 2015-12-16 18:10:02 +01:00