Commit Graph

528 Commits

Author SHA1 Message Date
rgarcia
dbc19090ed cleans up 2016-01-26 12:13:29 +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
rgarcia
0505be08e8 fixes conflicts 2016-01-25 22:24:58 +01:00
Juanjo Bazán
7931ae914b adds specific treatment for feature flags in admin 2016-01-25 14:52:57 +01:00
Josep Jaume Rey Peroy
f9b6284df6 Explicitly check for different locale before updating 2016-01-22 18:26:08 +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
rgarcia
027e8b2398 Merge branch 'microweb10-registration_username_ajax_validation' 2016-01-21 18:02:42 +01:00
rgarcia
cade157acd fixes conflicts with master 2016-01-21 17:27:02 +01:00
Juanjo Bazán
9c6ab40623 fixes gendered translations 2016-01-21 17:09:32 +01:00
nachogomez
8d54e51413 change test in debates and proposals for district Select geozone.name 2016-01-21 09:55:15 +01:00
Juanjo Bazán
2d4d057b48 returns empty 404 instead of raising exception
for the catch-all route
2016-01-20 16:20:43 +01:00
Juanjo Bazán
34456320e1 adds spending proposals to Management 2016-01-20 13:08:54 +01:00
Juanjo Bazán
14e0d3a23f removes unneeded tags from spending proposals 2016-01-19 13:38:00 +01:00
nachogomez
d16f1ccd08 merge with master two 2016-01-19 11:09:47 +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
rgarcia
8d7984dcb3 uses case statement instead of eval 2016-01-18 15:02:18 +01:00
Josep Jaume Rey Peroy
57f5296e49 Feature flag spending proposals 2016-01-18 13:05:00 +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
44769d96f4 adds comprehensive specs for author type and date range searches 2016-01-16 21:45:59 +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
nachogomez
326dd04ae7 merge with master 2016-01-14 13:03:48 +01:00
rgarcia
c68c2b9f1d maintains search criteria 2016-01-13 19:25:49 +01:00
rgarcia
33cfd92b09 adds naming consistency 2016-01-13 19:25:48 +01:00
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
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