kikito
|
62ac864d90
|
removes deprecated user specs
Conflicts:
spec/models/user_spec.rb
|
2016-01-26 18:14:47 +01:00 |
|
kikito
|
892612fe9b
|
Adds two new scenarios to auth specs
|
2016-01-26 18:14:47 +01:00 |
|
kikito
|
9318cd8d7e
|
Refactors twitter hash usage on auth specs
|
2016-01-26 18:14:44 +01:00 |
|
kikito
|
91a16142bf
|
Refactors confirm_email & uses it in user_auth_spec
|
2016-01-26 18:11:04 +01:00 |
|
Juanjo Bazán
|
dc23bf19b3
|
Merge pull request #855 from consul/districts-and-categories
Categories and Geozones
|
2016-01-26 13:55:06 +01:00 |
|
Juanjo Bazán
|
c22aafa1a2
|
removes verbose pending errors from specs
|
2016-01-26 13:28:17 +01:00 |
|
rgarcia
|
433d23146f
|
adds pending debate specs
|
2016-01-26 12:13:43 +01:00 |
|
rgarcia
|
dbc19090ed
|
cleans up
|
2016-01-26 12:13:29 +01:00 |
|
rgarcia
|
8940defbb8
|
adds specs
|
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 |
|
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 |
|
Juanjo Bazán
|
b5eb398486
|
Merge branch 'danibaena-master'
|
2016-01-21 18:03:50 +01:00 |
|
Juanjo Bazán
|
0a5efb8025
|
fixes build
|
2016-01-21 18:03:00 +01:00 |
|
rgarcia
|
e4ef5c156b
|
fixes specs
|
2016-01-21 18:02:08 +01:00 |
|
Juanjo Bazán
|
5ed3a2280e
|
Merge branch 'master' of https://github.com/danibaena/consul into danibaena-master
|
2016-01-21 17:47:29 +01:00 |
|
rgarcia
|
cade157acd
|
fixes conflicts with master
|
2016-01-21 17:27:02 +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
|
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
|
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
|
609feb0116
|
fixes specs
|
2016-01-16 22:18:46 +01:00 |
|
rgarcia
|
82f9a656ad
|
moves search by author name to full text searches
|
2016-01-16 22:10:17 +01:00 |
|
rgarcia
|
44769d96f4
|
adds comprehensive specs for author type and date range searches
|
2016-01-16 21:45:59 +01:00 |
|
rgarcia
|
73bab1aad3
|
converts advanced search text to a js link
|
2016-01-16 20:40:47 +01:00 |
|
rgarcia
|
cf2dac91ad
|
renames html ids that have js behaviour
|
2016-01-16 20:15:14 +01:00 |
|
rgarcia
|
5dc9d9313b
|
adds multiple filters spec
|
2016-01-15 12:41:58 +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 |
|
nachogomez
|
326dd04ae7
|
merge with master
|
2016-01-14 13:03:48 +01:00 |
|
rgarcia
|
44677c0ec2
|
fixes specs
|
2016-01-13 19:25:49 +01:00 |
|
rgarcia
|
c68c2b9f1d
|
maintains search criteria
|
2016-01-13 19:25:49 +01:00 |
|
rgarcia
|
66b704b3b9
|
refactors filterable concern
|
2016-01-13 19:25:48 +01:00 |
|
rgarcia
|
4c27e66bb2
|
adds integration specs
|
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
|
e4dc496b89
|
adds geozone_select_options helper method
|
2016-01-13 13:07:03 +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
|
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 |
|