2482 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	5f4e4ebeb0	Admin can list enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	61af8204d9	Add spec matcher have_table_row	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
Rohan Mitchell	4f1b8d06e7	Construct enterprise relationships with a factory	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
Will Marshall	c1a55de40e	Merge branch 'new_shop'	2014-05-20 16:09:31 +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
Will Marshall	03de82eb3c	Merge branch 'new_shop' ... Conflicts: app/controllers/checkout_controller.rb	2014-05-20 15:47:32 +10:00
Will Marshall	df82627bd1	Starting to rework login behaviour when hitting /admin	2014-05-20 15:47:00 +10:00
Will Marshall	2fc45d635d	Putting error messages on checkout into error flash for easier debugging	2014-05-20 15:16:52 +10:00
Will Marshall	4e463e7087	Showing admin for enterprise or admin user	2014-05-20 15:16:52 +10:00
summerscope	52345d9bb3	Improvements to shoptfront page styling	2014-05-20 14:11:41 +10:00
Will Marshall	3eb6f98c70	Putting error messages on checkout into error flash for easier debugging	2014-05-20 12:39:22 +10:00
Will Marshall	9557d69f71	Showing admin for enterprise or admin user	2014-05-20 12:33:29 +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
Will Marshall	4e4667c33d	Adding groups	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
Will Marshall	eab9c28d2e	Adding groups to this branch, also tidying up the shop stuff for Laura	2014-05-16 14:00:33 +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	19aa79fc27	Add max height to admin sidebar items	2014-05-16 10:06:20 +10:00
Rob H	93dedb690d	Change overview controller to class_eval	2014-05-16 10:03:35 +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
Will Marshall	da95df5ab3	patching one dud spec	2014-05-15 15:41:01 +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