consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,782 Commits 1 Branch 0 Tags
a87669840cd8d7f9ffdc4b9b67362dd7e1fd2eac
Commit Graph

1662 Commits

Author SHA1 Message Date
kikito
a87669840c Hides fields without errors in finish_signup.html.erb 
Conflicts:
	app/views/users/registrations/finish_signup.html.erb
 2016-01-26 18:11:11 +01:00
kikito
b71dd5767b Adds username to the finish_signup form 
Conflicts:
	app/views/users/registrations/finish_signup.html.erb
 2016-01-26 18:11:04 +01:00
kikito
f74028e3b5 Replaces the OMNIAUTH_REGEX logic with a boolean 2016-01-26 18:11:04 +01:00
kikito
981e82fb4d Refactors ensure_signup_complete action 2016-01-26 18:11:04 +01:00
kikito
d1741a2b28 Refactor first_or_create_for_auth & its usage 
Conflicts:
	app/controllers/users/omniauth_callbacks_controller.rb

Refactors first_or_initialize_for_oauth
 2016-01-26 18:10:57 +01:00
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
Juanjo Bazán
dc23bf19b3 Merge pull request #855 from consul/districts-and-categories 
Categories and Geozones
 2016-01-26 13:55:06 +01:00
Alberto Garcia Cabeza
471f8f3530 Replaces districts map to generic image 2016-01-26 13:28:34 +01:00
Alberto Garcia Cabeza
e3ad813b4f Improves styles for districts map page 2016-01-26 13:28:33 +01:00
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
822d28a4a1 sets sanitize to false for already sanitized text 
The new version of the rails-html-sanitizer (used by simple_format) strips by default all attributes. We want rel='nofollow' and target='_blank' here and the text has just been sanitized in text_with_links.
 2016-01-25 21:52:59 +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
Juanjo Bazán
23fe85db32 adds feature flag for spending_proposals in admin 2016-01-24 19:23:56 +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
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
nachogomez
8d54e51413 change test in debates and proposals for district Select geozone.name 2016-01-21 09:55:15 +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
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
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
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
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