7 Commits

Author	SHA1	Message	Date
Rafael Schouten	20a94b4365	Merge branch 'master' into migrate_ent_types ... Conflicts: app/serializers/api/admin/enterprise_serializer.rb	2014-10-07 10:52:26 +11:00
Rafael Schouten	9eb770aed7	fix sidebar show/hide	2014-10-05 01:44:40 +10:00
Rafael Schouten	526ab8b80f	use is_distributor bool	2014-10-02 16:28:01 +10:00
Rafael Schouten	b821107c27	bugfix migration ad specs	2014-09-27 18:14:10 +10:00
Rafael Schouten	dee869a273	move checks and links in sidebars	2014-09-26 17:58:00 +10:00
Rafael Schouten	e480d3a135	rearrange admin sidebars	2014-09-26 13:06:29 +10:00
Rohan Mitchell	a533daab96	Split sidebar into parts	2014-08-19 16:41:49 +10:00