431 Commits

Author	SHA1	Message	Date
Rob Harrington	b2565991e6	Merge branch 'master' into reg_and_ent_types	2014-10-17 12:33:21 +11:00
Rohan Mitchell	0e03b5f209	Admin can change the format that Spree::Images are stored/served in	2014-10-16 12:41:11 +11:00
Rohan Mitchell	7e23479f3a	Consistency	2014-10-16 12:08:12 +11:00
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	f0c9e7cd44	fix for tests, remove open in new tab	2014-10-04 13:12:36 +10:00
Rafael Schouten	884c111240	fix failing tests	2014-10-04 11:56:35 +10:00
Rafael Schouten	4c1fc5671f	Minor fixes	2014-10-02 10:43:17 +10:00
Rafael Schouten	4fde0ad2d7	Merge branch 'master' into migrate_ent_types	2014-10-01 16:11:20 +10:00
Rafael Schouten	5c0d846643	bugfix sells and is_distributor specs and code	2014-09-28 11:55:46 +10:00
Rafael Schouten	b821107c27	bugfix migration ad specs	2014-09-27 18:14:10 +10:00
Rob Harrington	4b2f1cefa0	Spliting order management abilities out of product management abilities	2014-09-26 17:11:11 +10:00
Rob Harrington	9520eeeb15	can specify attributes for create_enterpise_user	2014-09-25 11:56:18 +10:00
Rob Harrington	ed91cd6463	Make sure d1 != d2	2014-09-24 20:48:52 +10:00
Rob Harrington	c6d463bf25	Revert "Pending bulk order mgmt specs" ... This reverts commit eead8d665f.	2014-09-20 18:06:42 +10:00
Rob Harrington	544e6e074a	Stop being lazy	2014-09-19 14:38:59 +10:00
Rob Harrington	0fdbcc0023	Make dates consistent	2014-09-17 11:39:39 +10:00
Rob Harrington	eead8d665f	Pending bulk order mgmt specs	2014-09-17 11:39:20 +10:00
Rob Harrington	22e61d9834	TEMP: spit out variables in failing oc spec	2014-09-16 23:47:34 +10:00
Rob H	143545da0d	Try newer syntax to fix spec failing on CI	2014-09-12 23:41:26 +10:00
Rob H	05d8c825c7	Enterprise User should NOT see form elements for changing type	2014-09-12 13:40:47 +10:00
Rob H	bcca8c5c0d	Merging master into all the things	2014-09-12 13:28:30 +10:00
Rohan Mitchell	e50bbeaefb	Edit product form shows permitted suppliers	2014-09-12 11:33:47 +10:00
Rohan Mitchell	033fe88513	New product form shows permitted suppliers	2014-09-12 11:07:59 +10:00
Rob H	043cc915e7	Removing save_screenshot calls	2014-09-11 22:40:03 +10:00
Rob H	ad56594fe9	Removing obsolete spec	2014-09-11 15:19:24 +10:00
Rob H	c0e4a22a6e	Adding enterprise_limit form element to user edit page	2014-09-11 15:19:24 +10:00
Rob H	9085741f3c	Removing enterprises form from user edit page	2014-09-11 15:19:23 +10:00
Rob H	eb6af408d7	Trailing spaces crusader: one man, a million trailing spaces	2014-09-11 15:19:23 +10:00
Rob H	60297eb5c8	Hide 'New Enterprise' link on index page when user has reached limit	2014-09-11 15:19:23 +10:00
Rob H	41b286f80f	Delete specific E2ER in spec	2014-09-11 14:54:51 +10:00
Rob H	f1c19ea64c	Enterprise validates owner enterprise_limit	2014-09-11 14:54:51 +10:00
Rob H	3e1f4628e3	Can change owner of enterprises from index page	2014-09-11 14:51:22 +10:00
Rob H	7983b2f45a	Adding changing ownership to enterprise update spec	2014-09-11 14:39:15 +10:00
Rob H	13d814ff23	Adding user autocomplete directive to speed up specification of owner for enterprises	2014-09-11 14:39:15 +10:00
Rob H	73a32fdaf1	Remove distributor_info: 'how does it work' from enterprises edit page	2014-09-11 14:39:14 +10:00
Rob H	4bde6a0a3d	WIP: VERY SLOW PAGE LOAD: Super admin can edit owner of enterprise from edit screen	2014-09-11 14:39:14 +10:00
Rohan Mitchell	32a2e793ad	When deleting enterprise relationships, delete dependent permissions	2014-09-10 14:49:15 +10:00
Rob H	5fb4110328	Adding distributor and producer checkboxes to enterprise index	2014-09-07 21:04:53 +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	ee4a1925fe	Bulk Order Management works with navigation helper override	2014-09-06 00:34:27 +10:00
Rob H	780df6bfe0	Hide 'profile type' form element for non super-admin users	2014-09-05 18:38:43 +10:00
Rob H	20bfcd6e48	Switching enterprise relationships form around	2014-09-05 17:11:57 +10:00
Rohan Mitchell	e72c3d861b	Enterprise manager can edit products from enterprises it has manage_products permission on	2014-09-01 11:49:09 +10:00
Rohan Mitchell	c81503d95f	Include producers I have permission to in BPE producers choice	2014-09-01 10:44:09 +10:00
Rohan Mitchell	cfb31b46e4	Bulk product edit lists managed products	2014-09-01 10:13:59 +10:00
Rohan Mitchell	66f20a6b8a	Name test enterprises semantically	2014-09-01 09:17:38 +10:00
Rohan Mitchell	7f74854a2f	For OC, fetch all enterprises we have access to, including those via E2E relationships	2014-08-29 16:38:23 +10:00
Rohan Mitchell	0b61872d96	Revert 5ede8d1, reinstating a4be0ff..7b89e6a	2014-08-29 16:38:10 +10:00
Rob H	ba3f97ca1f	Fixing enterprise relationships spec	2014-08-28 14:45:24 +10:00
Rob H	5ede8d169f	Revert a4be0ff..7b89e6a for deployment	2014-08-28 14:32:57 +10:00