palomahnhp bf5d253e12 Merge branch 'master' into tracking_user_verifications_and_others ...

Conflicts:
	app/controllers/admin/stats_controller.rb
	db/dev_seeds.rb

2016-04-20 11:44:33 +02:00

..

api

Add_stats_for_Investment_Proyect_#918

2016-03-21 18:18:18 +01:00

activity_controller.rb

adds activity page to administration

2015-09-22 16:30:43 +02:00

base_controller.rb

merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

comments_controller.rb

ignores in moderation the admin restored comments

2015-09-25 13:24:34 +02:00

dashboard_controller.rb

merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

debates_controller.rb

Feature-flag debates

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

moderators_controller.rb

makes spaces consistent

2015-09-03 01:29:46 +02:00

officials_controller.rb

admins can search officials by name or email

2015-08-29 17:02:21 +02:00

organizations_controller.rb

Ordenar admin/organizaciones por orden de llegada

2016-02-08 14:03:59 +01:00

proposals_controller.rb

ignores in moderation the admin restored proposals

2015-09-25 13:24:12 +02:00

settings_controller.rb

adds specific treatment for feature flags in admin

2016-01-25 14:52:57 +01:00

spending_proposals_controller.rb

Makes redirect in spending proposal go back to the full page after editing

2016-04-13 13:55:29 +02:00

stats_controller.rb

Merge branch 'master' into tracking_user_verifications_and_others

2016-04-20 11:44:33 +02:00

tags_controller.rb

adds pagination to admin lists

2015-08-19 16:32:40 +02:00

users_controller.rb

logs activity: restore admin actions

2015-09-22 17:24:13 +02:00

valuators_controller.rb

makes description nil if blank

2016-03-19 12:15:02 +01:00

verifications_controller.rb

improves incomplete verification scope [#500]

2015-09-24 17:21:09 +02:00