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

..

admin

cleans up

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

concerns

Merge branch 'suggest_before_creating'

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

management

cleans up

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

moderation

Feature-flag debates

2016-01-18 13:05:00 +01:00

organizations

adds responsible_name to organizations

2015-09-12 18:16:14 +02:00

users

remove unuseful comment

2016-01-26 19:59:20 +01:00

verification

removes comments

2015-10-23 11:22:23 +02:00

account_controller.rb

rename column name to newsletter

2015-12-24 12:53:03 +01:00

annotations_controller.rb

ActiveRecord.find already throws a 404 if not existing; there is no find!

2015-12-16 18:44:55 +01:00

application_controller.rb

fixes failing email specs

2016-01-26 18:15:43 +01:00

comments_controller.rb

Merge branch 'master' into notifications

2016-01-08 15:07:16 +01:00

debates_controller.rb

Merge branch 'suggest_before_creating'

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

legislations_controller.rb

adds legislations

2015-12-16 11:45:46 +01:00

notifications_controller.rb

redirects notification show to notifiable

2016-01-08 13:06:00 +01:00

pages_controller.rb

returns empty 404 instead of raising exception

2016-01-20 16:20:43 +01:00

proposals_controller.rb

Merge branch 'suggest_before_creating'

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

spending_proposals_controller.rb

fixes gendered translations

2016-01-21 17:09:32 +01:00

users_controller.rb

fixes 'My activity' comments count for admins/mods

2015-11-17 19:40:18 +01:00

verification_controller.rb

puts organizations out of verification process

2015-09-12 18:05:51 +02:00

welcome_controller.rb

moves highlights and default home page

2015-09-14 19:49:09 +02:00