3834 Commits

Author	SHA1	Message	Date
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	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	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
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	0b595e21d2	Showing admin for enterprise or admin user	2014-05-20 16:05:28 +10:00
summerscope	601281ced7	Add button style to shop page	2014-05-20 16:04:26 +10:00
summerscope	0957edee5d	Styling for shopping cart page	2014-05-20 15:50:03 +10:00
Will Marshall	685ba3f63a	Fixing my modal and the tests	2014-05-20 12:18:28 +10:00
Will Marshall	e7f6a9badf	Adding data to groups page	2014-05-20 12:18:28 +10:00
Will Marshall	61cf35a5b9	Adding attr_accessors and paperclip file uploads	2014-05-20 12:18:28 +10:00
Will Marshall	0958602418	Starting on migrations and admin forms	2014-05-20 12:18:27 +10:00
summerscope	1dd9f6326b	Tweaking the markup and styling for shop page.	2014-05-16 15:59:53 +10:00
Rob H	2b414d99e1	Revert content_for changes	2014-05-16 15:12:47 +10:00
Will Marshall	eab9c28d2e	Adding groups to this branch, also tidying up the shop stuff for Laura	2014-05-16 14:00:33 +10:00
Rob H	03139cd2de	Use existing sidebar content_for	2014-05-16 11:42:40 +10:00
Rob H	6979644af7	Fiddle with colors and scrolling in admin enterpise sidebar	2014-05-16 11:28:02 +10:00
Will Marshall	3e22e55b61	Printing taxon icons on home	2014-05-16 10:23:32 +10:00
Will Marshall	7c213a061b	Getting working taxon sorting and icon rendering in	2014-05-16 10:23:32 +10:00
Will Marshall	91fe8e18d3	Taxon sorting	2014-05-16 10:23:32 +10:00
Will Marshall	3ac9c3e00d	Basics of producer modal in place	2014-05-16 10:23:32 +10:00
Will Marshall	adb134743f	Adding producer modals to home	2014-05-16 10:23:32 +10:00
Will Marshall	c9fea79d19	Printing the primary taxon name	2014-05-16 10:23:32 +10:00
Will Marshall	9f169e6ef8	Adding a basic stub of the primary taxon	2014-05-16 10:23:31 +10:00
Will Marshall	8c6e884563	Further improvements, fixing my directive, re-arranging partial	2014-05-16 10:23:31 +10:00
Will Marshall	12ddbb6a32	Reworking the shop page	2014-05-16 10:23:31 +10:00
Will Marshall	3ce196e042	Starting on the new shop	2014-05-16 10:23:31 +10:00
Will Marshall	924128098b	Restricting shipping methods	2014-05-16 10:20:32 +10:00
Rob H	dafa89a2cc	Add placeholder for ACN and ABN	2014-05-16 10:07:30 +10:00
Rob H	d17a316387	remove naughty pry	2014-05-15 22:43:08 +10:00
Rob H	fd6f4d04df	Merge branch 'master' into ent-makeover	2014-05-15 17:05:05 +10:00
Rob H	c1c92d62e4	Adjust admin enterprise edit to improve scanning	2014-05-15 17:03:47 +10:00
Rob H	7cdfb4bab2	Add methods and fees to sidebar on enterprise edit page	2014-05-15 14:52:19 +10:00
Will Marshall	c0ba560fa6	Moving empties cart to a magic directive	2014-05-15 14:47:16 +10:00
Will Marshall	eae12da24a	Adding distributors display to producers page	2014-05-15 12:20:17 +10:00
Will Marshall	575ce9fe01	Adding producers to home and distributors to producers	2014-05-15 12:02:58 +10:00
summerscope	8238cbe0ee	Merge changes	2014-05-14 15:55:18 +10:00
summerscope	9886166750	Add in script for google font Open Sans	2014-05-14 15:55:18 +10:00
Rob H	31334be615	Tidy up of new dashboard, add 'CREATE NEW' button at top right	2014-05-14 11:31:42 +10:00
Will Marshall	1c98f10c20	Adding indexing by user id	2014-05-14 11:08:21 +10:00
Will Marshall	f574d8a65b	Restricting to visible	2014-05-13 16:34:20 +10:00
Rob H	c98d2e71d8	Add scroll pane to admin dashboard	2014-05-09 17:20:53 +10:00
Will Marshall	5b2e9e9c30	Final set of regression issues	2014-05-09 16:43:57 +10:00
Will Marshall	573d479e08	Fixing test regressions	2014-05-09 16:43:57 +10:00
Will Marshall	f25617dde7	Tweaks for laura, reworking authentication workflow, tidying up checkout	2014-05-09 16:42:51 +10:00