consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

5383 Commits

Author SHA1 Message Date
kikito
248bff712c fixes failing i18n specs 
Eliminates registering_with_oauth attr_accessor

ELIMINATE

Conflicts:
	app/views/users/registrations/finish_signup.html.erb

improves devise confirmation message

improves devise omniauth confirmation message

improves devise omniauth confirmation message

do not use nils on finish_signup fields

Fixes auth specs after changing the i18n
 2016-01-26 18:15:36 +01:00
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
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
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
23fe85db32 adds feature flag for spending_proposals in admin 2016-01-24 19:23:56 +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
9c7e2b83dd Merge pull request #843 from consul/search-dates 
Advanced search - datepicker
 2016-01-20 17:01:28 +01:00
Alberto Garcia Cabeza
4d533c3ee3 Adds tabindex on users sign_in form 2016-01-20 16:28:42 +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
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
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
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
82f9a656ad moves search by author name to full text searches 2016-01-16 22:10:17 +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
Juanjo Bazán
d175f11f13 Merge pull request #826 from consul/design_spending_proposals 
Design spending proposals
 2016-01-15 11:25:27 +01:00
Alberto Garcia Cabeza
933fa75a3b Changes icon and text for spending proposals 2016-01-14 14:20:07 +01:00
nachogomez
326dd04ae7 merge with master 2016-01-14 13:03:48 +01:00
Juanjo Bazán
ed008f1b28 Merge pull request #825 from consul/auth_footer 
Improves auth pages footer
 2016-01-14 11:34:11 +01:00
Alberto Garcia Cabeza
3164fe7be1 Improves layout and footer for auth pages 2016-01-14 11:18:04 +01:00
Raimond Garcia
0a6639834d Merge pull request #823 from consul/featured_and_filters 
Featured and filters
 2016-01-13 20:20:53 +01:00
rgarcia
7dcbf11860 adds missing translation 2016-01-13 19:31:13 +01:00
rgarcia
44677c0ec2 fixes specs 2016-01-13 19:25:49 +01:00
rgarcia
92de6546b7 removes obsolete order select 2016-01-13 19:25:49 +01:00
rgarcia
c68c2b9f1d maintains search criteria 2016-01-13 19:25:49 +01:00
rgarcia
afca5c2b90 refactors javascript 2016-01-13 19:25:48 +01:00
rgarcia
9ff3b1dd2f removes duplicate search form partial 2016-01-13 19:25:48 +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
Ana
7d3dff3222 Translation changed 2016-01-13 19:25:47 +01:00
Ana
7635c5978b debates.index.search_form replaced by i18n_namespace 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