17514 Commits

Author	SHA1	Message	Date
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
Will Marshall	da69167b4c	Putting error messages on checkout into error flash for easier debugging	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
summerscope	52345d9bb3	Improvements to shoptfront page styling	2014-05-20 14:11:41 +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