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

5807 Commits

Author SHA1 Message Date
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
3e0dd544a6 adds specs 2016-02-08 17:49:03 +01:00
Juanjo Bazán
16db3f8537 adds minimal public stats 2016-02-08 14:12:37 +01:00
palomahnhp
2ee90ac76e share links to debate 2016-02-08 10:32:57 +01:00
rgarcia
eb04266772 removes unused translations 2016-02-05 13:08:49 +01:00
rgarcia
a5f7211d82 corrects error translations keys 2016-02-05 12:54:21 +01:00
rgarcia
36aee45908 removes unused combined stats 2016-02-04 12:36:14 +01:00
palomahnhp
837da1b6b2 show link to sign in for no connect users 2016-02-04 10:40:13 +01:00
rgarcia
77fc851748 fixes specs 2016-02-03 19:57:42 +01:00
rgarcia
41cdf6cec2 organizes translations according to view structure 2016-02-03 19:57:42 +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
Juanjo Bazán
eda2c419f7 fixes typo in es locale 2016-02-03 11:39:16 +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
kikito
4bac9e6ea1 updates oauth code to handle faulty facebook responses better 2016-01-27 18:36:22 +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
kikito
1617f7295c requests omniauth facebook email 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
c6c01fc9f2 Adds 'registering_with_oauth' boolean to users 
Conflicts:
	db/schema.rb

Changes title in finish_signup page

Conflicts:
	config/locales/en.yml
	config/locales/es.yml
 2016-01-26 18:11:04 +01:00
kikito
f262686023 Allows deploying branches in preproduction 
Bundle install
 2016-01-26 18:10:51 +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
df04992405 adds translations 2016-01-25 22:28:46 +01:00
rgarcia
21b9e31f11 uses geozones instead of district tags 2016-01-25 22:28:46 +01:00
rgarcia
a86f6bc5b7 fixes conflicts with master 2016-01-25 22:28:46 +01:00
Perisso
93d794c089 change locales 2016-01-25 22:28:17 +01:00
Perisso
7d1d4cea4a filter by districts and categories 2016-01-25 22:28:17 +01:00
Juanjo Bazán
3945eb1ff0 lists dynamic keys as ignore_unused in i18n-tasks 2016-01-25 14:59:37 +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
c287ae97d9 fix setting key 2016-01-25 14:12:16 +01:00
Juanjo Bazán
64441825d8 renames settings zone in admin 2016-01-25 12:04:40 +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
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
Alberto Garcia Cabeza
ffbbdb3358 Adds custom styles for date picker 2016-01-20 15:57:14 +01:00
Juanjo Bazán
34456320e1 adds spending proposals to Management 2016-01-20 13:08:54 +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
ba74542c3d Parameterize social links 2016-01-18 12:43:36 +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
44769d96f4 adds comprehensive specs for author type and date range searches 2016-01-16 21:45:59 +01:00
Juanjo Bazán
8fc76ef67a normalizes i18n keys 2016-01-16 18:40:24 +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
Antonio Tapiador del Dujo
9610a6a933 Adds Tolk gem for i18n web interface 
Closes #793
 2016-01-14 14:57:06 +01:00