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

493 Commits

Author SHA1 Message Date
rgarcia
af6bfdbb46 moves search logic to a searchable module 2016-02-05 14:10:02 +01:00
Juanjo Bazán
e4df5ce933 Merge pull request #880 from consul/debates-search 
Debates search
 2016-02-05 09:47:14 +01:00
kikito
d452dcda5b Replaces old search by new pg_search-based method in debates 2016-02-04 20:06:30 +01:00
kikito
014852665d refactors the way debate searches are done 2016-02-04 17:26:49 +01:00
rgarcia
3faadacc15 differentiates between level 2 and level 3 users 2016-02-04 13:38:56 +01:00
kikito
b1534c1f56 moves html escaping to search_cache 2016-02-03 18:39:07 +01:00
kikito
986919503a refactors proposals search 2016-02-03 18:26:48 +01:00
Raimond Garcia
f1672180a8 Merge pull request #860 from MaiteHdezRivas/suggest_before_creating 
Suggest before creating
 2016-02-01 18:41:21 +01:00
kikito
4bac9e6ea1 updates oauth code to handle faulty facebook responses better 2016-01-27 18:36:22 +01:00
rgarcia
5bea145d71 scopes tags only for Proposals 2016-01-27 15:11:59 +01:00
rgarcia
209b6407d3 increases tag limit to 10 2016-01-27 14:17:32 +01:00
rgarcia
5d4b6fae92 scopes tags by category or geozone 2016-01-27 14:15:12 +01:00
rgarcia
0175cd2c68 does not display category tags nor geozone names 2016-01-27 13:52:11 +01:00
MaiteHdezRivas
5dd4633d6a Merge branch 'suggest_before_creating' 
Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb
 2016-01-27 13:11:23 +01:00
rgarcia
e7e5c531a0 moves tag_cloud logic to a model 2016-01-27 13:02:18 +01:00
MaiteHdezRivas
7406904c51 adding suggest with coffescript 2016-01-27 12:32:44 +01:00
kikito
a796dade7a extracts methods into user.rb 2016-01-26 19:48:01 +01:00
kikito
1e8d46d83a fixes failing email specs 
Conflicts:
	app/models/user.rb

fixes missing i18n entry

fixes badly done merge

fixes i18n issues

force build to start
 2016-01-26 18:15:43 +01:00
kikito
a606c7aa8d Renames confirmed_oauth_email to oauth_email 
Refactors the way oauth_email is used to cover more cases (fixes pending specs)
 2016-01-26 18:15:40 +01:00
kikito
55216ba431 allows creating email duplicates while registering with omniauth 2016-01-26 18:15:39 +01:00
kikito
98f99954e7 Corrects the logic dealing with confirmations of users via oauth 2016-01-26 18:15:39 +01:00
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
1a7ca43569 Simplifies username assignation when creating a new oauth user 2016-01-26 18:11:46 +01:00
kikito
8dcb5d2cac Refactors self.first_or_initialize_for_oauth 2016-01-26 18:11:11 +01:00
kikito
f74028e3b5 Replaces the OMNIAUTH_REGEX logic with a boolean 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
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
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
beagleknight
f595c6ee7f Use model table name instead of hardcoding it 2016-01-19 12:44:15 +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
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
82f9a656ad moves search by author name to full text searches 2016-01-16 22:10:17 +01:00
rgarcia
5dc9d9313b adds multiple filters spec 2016-01-15 12:41: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
rgarcia
66b704b3b9 refactors filterable concern 2016-01-13 19:25:48 +01:00
rgarcia
0cfddca432 uses scopes 2016-01-13 19:25:48 +01:00
rgarcia
d147cec929 moves filters to a concern 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
9a31795615 removes default scope from Geozone 2016-01-13 13:06:20 +01:00
Juanjo Bazán
eb4c352f7d removes before_action in favor of cancancan 2016-01-13 12:56:27 +01:00
Juanjo Bazán
7c92a92537 adds resolution query methods 2016-01-11 12:53:05 +01:00