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

..

concerns

Allows manually verifying users to level 2 without specifying a phone

2015-10-13 17:14:00 +02:00

controllers

fixes specs

2016-01-21 18:02:08 +01:00

features

Merge branch 'suggest_before_creating'

2016-01-27 13:11:23 +01:00

helpers

adds geozone_select_options helper method

2016-01-13 13:07:03 +01:00

lib

cleans up

2016-01-26 12:13:29 +01:00

mailers

Store locale in a user's field and switch locale on mailers

2016-01-22 18:10:28 +01:00

models

removes deprecated user specs

2016-01-26 18:14:47 +01:00

support

Refactors confirm_email & uses it in user_auth_spec

2016-01-26 18:11:04 +01:00

factories.rb

cleans up

2016-01-26 12:13:29 +01:00

i18n_spec.rb

Adds i18n-tasks

2015-08-06 18:31:26 +02:00

rails_helper.rb

Makes capybara exact. Should fix some randomly-failing specs

2015-09-02 18:05:43 +02:00

spec_helper.rb

Use en as default locale on tests

2015-11-27 18:04:46 +01:00