Alberto Miedes Garcés 5d9054d284 Merge branch 'master' into api-dev-PRs ...

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb

2017-05-11 21:59:42 +02:00

..

controllers

Merge branch 'master' into api-dev-PRs

2017-05-11 21:59:42 +02:00

features

changes copy

2017-05-10 12:20:38 +02:00

fixtures/files

Site customization: images uploads

2017-04-06 17:00:04 +02:00

helpers

Merge branch 'master' into polls

2017-01-19 16:51:19 +01:00

lib

Merge branch 'master' into api-dev-PRs

2017-05-11 21:59:42 +02:00

mailers

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

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

models

Merge branch 'master' into api-dev-PRs

2017-05-11 21:59:42 +02:00

support

fixes specs

2017-02-01 11:37:11 +01:00

customization_engine_spec.rb

tries to fix flacky spec 'change my credentials'

2016-11-15 11:24:59 +01:00

factories.rb

Merge branch 'master' into api-dev-PRs

2017-05-11 21:59:42 +02:00

i18n_spec.rb

Adds i18n-tasks

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

rails_helper.rb

Increase Poltergeist timeout in specs

2017-01-19 13:38:06 +01:00

spec_helper.rb

removes poltergeist no js_errors driver

2017-05-04 01:48:17 +02:00