kikito 782a68e9d3 Merge branch 'master' into amiedes-api-dev-PRs-2

2017-06-14 09:58:17 +02:00

..

controllers

Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2

2017-06-13 12:07:28 +02:00

features

Merge pull request #1646 from consul/user-stats

2017-06-13 17:54:13 +02:00

fixtures/files

Site customization: images uploads

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

helpers

Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation

2017-05-22 18:43:49 +02:00

lib

Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2

2017-06-13 12:07:28 +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 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2

2017-06-13 12:07:28 +02:00

support

updates specs

2017-06-12 19:48:57 +02: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 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2

2017-06-13 12:07:28 +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