9 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	c088c47a49	add email to enterprise params	2014-10-03 17:31:46 +10:00
Rafael Schouten	b821107c27	bugfix migration ad specs	2014-09-27 18:14:10 +10:00
Rob Harrington	07275574b6	Manager can't bulk update owner	2014-09-19 18:31:50 +10:00
Rob H	e83e2295ed	Adding some extra controller-level specs for enterprise ownership	2014-09-11 14:54:51 +10:00
Rob H	138e0281a3	Specify owner for enterprise create action	2014-09-11 14:39:14 +10:00
Rob H	6540bb8efc	Adding select field for enterprise type to index when super admin	2014-09-07 19:51:14 +10:00
Rob H	58dcdbd9c4	Restricting ability to change enterprise type at the controller level	2014-09-05 18:30:15 +10:00
Rohan Mitchell	f5b56617a0	As an enterprise user, when I create an enterprise, I should have management permission for it	2013-09-30 11:10:20 +10:00