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

comments

adds comment show view

2016-01-07 15:18:28 +01:00

management

adds spending proposals to Management

2016-01-20 13:08:54 +01:00

moderation

Feature-flag debates

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

verification

Updates texts for tests

2015-10-28 14:03:02 +01:00

account_spec.rb

Merges master and fixes conflicts

2015-10-28 12:51:23 +01:00

admin_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00

campaigns_spec.rb

tracks visits from different email templates

2015-10-22 12:23:15 +02:00

ckeditor_spec.rb

adds crud specs for proposals

2015-09-13 11:47:57 +02:00

debates_spec.rb

Merge branch 'suggest_before_creating'

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

emails_spec.rb

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

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

highlights_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00

home_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00

legislation_spec.rb

Add additional check on on the legislation spec

2015-12-18 13:09:52 +01:00

localization_spec.rb

refactors localization spec using expect instead of global state

2015-10-20 19:08:52 +02:00

moderation_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00

notifications_spec.rb

groups notifications

2016-01-08 14:32:16 +01:00

organizations_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00

proposals_spec.rb

Merge branch 'suggest_before_creating'

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

registration_form_spec.rb

check if username is available in registration form

2016-01-10 19:17:20 +01:00

sessions_spec.rb

adds a test

2015-12-22 11:26:42 +01:00

spending_proposals_spec.rb

only level 2 users can create spending proposals

2016-01-13 13:35:21 +01:00

stats_spec.rb

fixes some random test failures

2015-10-23 12:49:51 +02:00

tags_spec.rb

Updates test

2016-01-07 17:21:51 +01:00

users_auth_spec.rb

fixes issues after squashing

2016-01-26 18:19:18 +01:00

users_spec.rb

fixes 'My activity' comments count for admins/mods

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

votes_spec.rb

Simplify Settings API

2016-01-18 12:43:34 +01:00

welcome_spec.rb

Updates tests with new texts

2015-10-28 12:47:51 +01:00