Julian Herrero 8ef9e69f71 Update from upstream

2016-01-10 15:26:19 +01:00

..

admin

fixes conflicts with master [#500]

2015-09-28 12:00:48 +02:00

concerns

displays relevance order in searches

2015-11-23 13:39:32 +01:00

management

redirect to frendly url for debates and proposals if needed

2016-01-10 13:38:22 +01:00

moderation

removes before_filter

2015-12-19 10:21:53 +01:00

organizations

adds responsible_name to organizations

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

users

takes the user to the same page he was in after logout

2015-12-22 11:19:06 +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

merges activities into notifications

2016-01-06 12:33:37 +01:00

comments_controller.rb

Merge branch 'master' into notifications

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

debates_controller.rb

redirect to frendly url for debates and proposals if needed

2016-01-10 13:38:22 +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 404 for not found pages

2015-12-30 14:27:16 +01:00

proposals_controller.rb

redirect to frendly url for debates and proposals if needed

2016-01-10 13:38:22 +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