Alberto Garcia Cabeza 910b24936d Merge branch 'master' into voting-proposals ...

Conflicts:
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/show.html.erb
	spec/support/common_actions.rb

2016-09-15 13:58:53 +02:00

..

controllers

fixes build

2016-07-11 10:43:27 +02:00

features

Merge branch 'master' into voting-proposals

2016-09-15 13:58:53 +02:00

helpers

adds author_of? helper method

2016-06-15 17:01:50 +02:00

lib

fixes specs

2016-08-03 20:05:08 +02:00

mailers

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

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

models

adds not_archived scope to proposal

2016-09-13 12:10:31 +02:00

support

Merge branch 'master' into voting-proposals

2016-09-15 13:58:53 +02:00

factories.rb

adds not_archived scope to proposal

2016-09-13 12:10:31 +02:00

i18n_spec.rb

Adds i18n-tasks

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

rails_helper.rb

disables js fx in specs via poltergeist config

2016-03-04 12:26:47 +01:00

spec_helper.rb

Adds invisible_captcha to proposals, debates & sps

2016-04-27 16:12:32 +02:00