Juanjo Bazán
|
0a5efb8025
|
fixes build
|
2016-01-21 18:03:00 +01:00 |
|
rgarcia
|
027e8b2398
|
Merge branch 'microweb10-registration_username_ajax_validation'
|
2016-01-21 18:02:42 +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
|
82279b4f6b
|
uses get instead of post to check username
|
2016-01-21 17:27:43 +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 |
|
Enrique García
|
edc3be1d8b
|
Merge pull request #846 from AjuntamentdeBarcelona/security/devise_key
Use `secret_key_base` as devise's secret key
|
2016-01-21 16:08:40 +01:00 |
|
nachogomez
|
8d54e51413
|
change test in debates and proposals for district Select geozone.name
|
2016-01-21 09:55:15 +01:00 |
|
Josep Jaume Rey Peroy
|
1c9a4c8ec6
|
Use secret_key_base as devise's secret key
|
2016-01-21 08:52:23 +01:00 |
|
Juanjo Bazán
|
9c7e2b83dd
|
Merge pull request #843 from consul/search-dates
Advanced search - datepicker
|
2016-01-20 17:01:28 +01:00 |
|
Raimond Garcia
|
a32a750ec1
|
Merge pull request #842 from consul/auth_tabindex
Adds tabindex on users sign in form
|
2016-01-20 16:44:12 +01:00 |
|
Raimond Garcia
|
5b56afe986
|
Merge pull request #841 from consul/simplify-404
returns empty 404
|
2016-01-20 16:43:38 +01:00 |
|
Alberto Garcia Cabeza
|
4d533c3ee3
|
Adds tabindex on users sign_in form
|
2016-01-20 16:28:42 +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 |
|
Alberto Garcia Cabeza
|
ffbbdb3358
|
Adds custom styles for date picker
|
2016-01-20 15:57:14 +01:00 |
|
Raimond Garcia
|
a31a71a45f
|
Merge pull request #839 from consul/managers-spending-proposals
[Management] spending proposals
|
2016-01-20 13:53:52 +01:00 |
|
Raimond Garcia
|
9b1034b80f
|
Merge pull request #840 from consul/add-new-settings-to-dev-seeds
adds values for new settings to dev_seeds
|
2016-01-20 13:52:59 +01:00 |
|
Juanjo Bazán
|
0772150426
|
adds values for new settings to dev_seeds
|
2016-01-20 13:16:21 +01:00 |
|
Juanjo Bazán
|
ca1f020454
|
adds link to managers' menu
|
2016-01-20 13:09:23 +01:00 |
|
Juanjo Bazán
|
34456320e1
|
adds spending proposals to Management
|
2016-01-20 13:08:54 +01:00 |
|
Juanjo Bazán
|
b451c76846
|
adds simple show view for spending proposals
|
2016-01-20 12:57:16 +01:00 |
|
rgarcia
|
6905d07638
|
uses jquery datepicker instead of html5 date field
|
2016-01-20 12:25:47 +01:00 |
|
rgarcia
|
e85ba440b6
|
configures jquery datepicker
|
2016-01-20 12:24:37 +01:00 |
|
Juanjo Bazán
|
14e0d3a23f
|
removes unneeded tags from spending proposals
|
2016-01-19 13:38:00 +01:00 |
|
Juanjo Bazán
|
3966d23966
|
Merge pull request #834 from AjuntamentdeBarcelona/make-search-cache-reusable
Make search cache reusable
|
2016-01-19 12:57:03 +01:00 |
|
beagleknight
|
f595c6ee7f
|
Use model table name instead of hardcoding it
|
2016-01-19 12:44:15 +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 |
|
Juanjo Bazán
|
91d583c8b2
|
Merge pull request #763 from AjuntamentdeBarcelona/make_consul_location_agnostic
Parameterize brand and social links
|
2016-01-18 12:50:47 +01:00 |
|
Josep Jaume Rey Peroy
|
ba74542c3d
|
Parameterize social links
|
2016-01-18 12:43:36 +01:00 |
|
Josep Jaume Rey Peroy
|
5de3d700e4
|
Simplify Settings API
|
2016-01-18 12:43:34 +01:00 |
|
Alberto Garcia Cabeza
|
f135bae082
|
Improves styles for search results page
|
2016-01-18 12:31:51 +01:00 |
|
Alberto Garcia Cabeza
|
4737f2be1b
|
Improves styles for advanced search
|
2016-01-18 12:13:38 +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 |
|
Raimond Garcia
|
89ece16fe8
|
Merge pull request #829 from consul/normalize-i18n-keys
normalizes i18n keys
|
2016-01-16 19:28:35 +01:00 |
|
Juanjo Bazán
|
8fc76ef67a
|
normalizes i18n keys
|
2016-01-16 18:40:24 +01:00 |
|
rgarcia
|
5dc9d9313b
|
adds multiple filters spec
|
2016-01-15 12:41:58 +01:00 |
|
Juanjo Bazán
|
d175f11f13
|
Merge pull request #826 from consul/design_spending_proposals
Design spending proposals
|
2016-01-15 11:25:27 +01:00 |
|
Juanjo Bazán
|
d36ee4cdaf
|
changes text
|
2016-01-15 11:18:00 +01:00 |
|
Juanjo Bazán
|
167911e427
|
Merge branch 'pardoam-five_last_week'
|
2016-01-15 11:11:54 +01:00 |
|