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

603 Commits

Author SHA1 Message Date
Enrique García
870d349f86 Merge pull request #895 from consul/find-by-proposal-code 
Find by proposal code
 2016-02-15 14:27:25 +01:00
Enrique García
be8f6da9ea Merge pull request #892 from consul/public-stats 
Public stats
 2016-02-15 13:34:00 +01:00
Juanjo Bazán
c4055d1c28 adds searching by proposal code 
Closes #844
 2016-02-12 13:54:57 +01:00
Juanjo Bazán
28bdd6b426 Merge pull request #875 from palomahnhp/inform_users_in_vote_comments 
show link to sign in for no connect users
 2016-02-11 17:28:17 +01:00
Juanjo Bazán
3bd767e36f collapsable comments on proposals/debates 2016-02-10 19:27:15 +01:00
Juanjo Bazán
3e0dd544a6 adds specs 2016-02-08 17:49:03 +01:00
Juanjo Bazán
3a51145bc9 moves existent stats specs to admin namespace 2016-02-08 14:16:06 +01:00
palomahnhp
2ee90ac76e share links to debate 2016-02-08 10:32:57 +01:00
rgarcia
d2400d0b36 makes specs for error handling more robust 2016-02-05 13:08:09 +01:00
kikito
bc5ed945b4 Activates & updates deactivated specs 2016-02-04 20:06:49 +01:00
palomahnhp
837da1b6b2 show link to sign in for no connect users 2016-02-04 10:40:13 +01:00
kikito
6ba1db1a02 includes a "cancel" option when logging in via omniauth 
restores missing proposal in common_actions
 2016-02-03 11:59:19 +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
Maite
8f1431ec3f corrections about coding style 2016-02-01 17:11:29 +01:00
Juanjo Bazán
ff03f20f4e refactors spec to avoid flaky test errors 2016-01-29 11:41:41 +01:00
rgarcia
48b5aba1c5 removes unused helper 2016-01-27 14:55:42 +01:00
rgarcia
5a3dc42dea removes tag count 2016-01-27 14:18:40 +01:00
rgarcia
5d4b6fae92 scopes tags by category or geozone 2016-01-27 14:15:12 +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
MaiteHdezRivas
7406904c51 adding suggest with coffescript 2016-01-27 12:32:44 +01:00
Juanjo Bazán
4b1430c9d6 Merge pull request #848 from consul/omniauth2 
Omniauth2
 2016-01-27 10:04:26 +01:00
rgarcia
606a87bbbf force build 2016-01-26 18:51:59 +01:00
rgarcia
4e7e0e3a7a makes geozone clickable in proposal show 2016-01-26 18:27:47 +01:00
kikito
a23d0ebbd8 fixes issues after squashing 2016-01-26 18:19:18 +01:00
kikito
646ca8a686 Splits omniauth_callbacks_controller#login_with method in two smaller ones 
Uses new hash syntax in specs
 2016-01-26 18:15:45 +01:00
kikito
9e0494a82d Activates omniauth functionality 2016-01-26 18:15:45 +01:00
kikito
92786764b7 Adds new auth tests 
Conflicts:
	spec/features/users_auth_spec.rb
 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
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
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
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
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
rgarcia
609feb0116 fixes specs 2016-01-16 22:18:46 +01:00