8189 Commits

Author	SHA1	Message	Date
Will Marshall	58112fb105	Adding primary taxon	2014-05-23 16:01:24 +10:00
Will Marshall	110a6f2d14	Adding primary taxon to admin forms	2014-05-23 15:59:06 +10:00
Will Marshall	fd1e7ebaa3	Adding primary taxon field to product	2014-05-23 15:59:06 +10:00
Will Marshall	6d24a6555e	Adding fields to product supplier	2014-05-23 15:59:06 +10:00
summerscope	84b6f99321	Styling for shop page product modal	2014-05-23 15:59:06 +10:00
Rohan Mitchell	9b15c213d1	When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges	2014-05-23 11:28:00 +10:00
Rob H	e85c144e87	Remove reference to 'Admin' from global namespace	2014-05-23 11:22:12 +10:00
summerscope	4657285769	Producers modal styling and markup	2014-05-22 16:35:48 +10:00
Rob H	47f6d32055	Make list items the same height	2014-05-22 15:47:50 +10:00
Rob H	f8776fecff	Move enterprises dashboard controller	2014-05-22 15:46:26 +10:00
Rob H	371240652c	Change 'Overview' menu item to 'Dashboard'	2014-05-22 15:30:11 +10:00
Rob H	ed3c23cd90	Split 'My Enterprises' dashboard item into Hubs and Producers	2014-05-22 15:28:25 +10:00
Will Marshall	1a7c6f87ed	Adding fields to product supplier	2014-05-22 14:47:27 +10:00
summerscope	d7bc1a9b95	Styling for shop page product modal	2014-05-22 14:40:35 +10:00
Will Marshall	015403c282	Merge branch 'new_shop'	2014-05-22 12:40:48 +10:00
Will Marshall	d1b27edefe	Reworking the JS specs	2014-05-22 12:40:46 +10:00
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +10:00
Will Marshall	0140472fbc	Adding working modals	2014-05-22 12:40:46 +10:00
Will Marshall	d6512a78d4	Removing position fixed	2014-05-22 12:39:52 +10:00
Will Marshall	c69a4a5f1a	Adding social media links	2014-05-22 12:12:10 +10:00
Will Marshall	34c31afabe	Adding large image	2014-05-22 11:34:46 +10:00
Rohan Mitchell	c2f762d570	Enterprise user can only see relationships involving their enterprises	2014-05-22 11:27:19 +10:00
Rohan Mitchell	d7b4318aff	Find enterprise relationships involving any of a number of enterprises	2014-05-22 11:25:37 +10:00
Rohan Mitchell	06955a024f	Enterprise user can only create relationships with their own enterprises as parent	2014-05-22 11:02:03 +10:00
Rohan Mitchell	f6bc1a82be	Enterprise user can manage enterprise relationships	2014-05-22 10:54:51 +10:00
Will Marshall	250b76ec79	Merge branch 'master' into new_shop	2014-05-22 10:43:02 +10:00
Will Marshall	f997026796	Reworking the JS specs	2014-05-22 10:42:44 +10:00
Will Marshall	67e72f4504	Setting up after_login redirects	2014-05-22 10:42:44 +10:00
Will Marshall	2d0a42b2c2	Adding working modals	2014-05-22 10:42:44 +10:00
Rohan Mitchell	a049266732	Replace enterprise relationship parent/child concepts with 'X permits Y'	2014-05-21 16:28:27 +10:00
Rohan Mitchell	0c647841a6	Add dynamic filter to enterprise relationships	2014-05-21 16:18:07 +10:00
Rohan Mitchell	92292c853d	Extract partials from enterprise relationships admin page	2014-05-21 15:03:29 +10:00
Rob H	3bf21d42dd	WIP: removing all payment methods from enterprise edit page	2014-05-21 15:02:59 +10:00
Rohan Mitchell	18886c931f	Extract create EnterpriseRelationship to service	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5d0680234d	Admin can delete enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	aa965e3752	Show a CSS3 animation when a row is added	2014-05-21 11:29:11 +10:00
Rohan Mitchell	f1df021091	Show enterprise relationships tab as selected	2014-05-21 11:29:11 +10:00
Rohan Mitchell	b9a9937541	Attempting to create a relationship with invalid data shows an error message	2014-05-21 11:29:11 +10:00
Rohan Mitchell	e40843bccb	Allow error messages without attribute name. Improve enterprise relationship error message.	2014-05-21 11:29:11 +10:00
Rohan Mitchell	9b2a80c6b5	Admin can create enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	3cb55062cc	Split enterprise_relationships rabl into show and index	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5f4e4ebeb0	Admin can list enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	6414ae2972	Output enterprise relationships as JSON	2014-05-21 11:29:11 +10:00
Rohan Mitchell	1a854b89ec	Sort enterprise relationships by enterprise name	2014-05-21 11:29:11 +10:00
Rohan Mitchell	f7de504d89	Add stub angular controller for managing enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	aa53d82386	Add stub page for managing enterprise relationships	2014-05-21 11:29:11 +10:00
Will Marshall	391b1da04c	adding session token to order test	2014-05-21 10:46:03 +10:00
summerscope	d874855aa1	Update styling on empty cart	2014-05-20 16:40:23 +10:00
Will Marshall	ef91f8d17f	Redirecting if cart is empty and activating the empty cart link	2014-05-20 16:05:28 +10:00
Will Marshall	36aba8049f	Starting to rework login behaviour when hitting /admin	2014-05-20 16:05:28 +10:00