369 Commits

Author	SHA1	Message	Date
Will Marshall	2db63540ee	Adding primary taxon	2014-05-24 10:27:57 +10:00
Rohan Mitchell	7ac33beb65	Revert "Adding primary taxon" ... This reverts commit 58112fb105.	2014-05-24 09:07:55 +10:00
Will Marshall	58112fb105	Adding primary taxon	2014-05-23 16:01:24 +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
summerscope	0957edee5d	Styling for shopping cart page	2014-05-20 15:50:03 +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
Rob H	c98d2e71d8	Add scroll pane to admin dashboard	2014-05-09 17:20:53 +10:00
Rob H	05e01d02c4	Merge branch 'master' into ent-makeover	2014-05-09 15:58:17 +10:00
Rob H	01c5822fcc	Add basic dashboard to admin section	2014-05-09 15:48:58 +10:00
Rohan Mitchell	87179669a6	Change to new production hostname: openfoodnetwork.org.au	2014-05-09 11:34:52 +10:00
Rohan Mitchell	967d4c81ab	Cache expensive options_text call	2014-05-08 20:55:43 +10:00
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +10:00
Rob H	6ba0d6c5f9	WIP: Split out admin angularjs	2014-05-02 21:38:39 +10:00
Will Marshall	b907616749	Renaming our partials	2014-05-02 14:47:12 +10:00
Rob H	ceada3596b	Merge master into cleanup	2014-05-02 14:43:06 +10:00
Rob H	de369ae32b	WIP: Can manage taxons in BPE	2014-05-02 10:28:33 +10:00
Rob H	56204d4ea6	Upgrade Admin AngularJS	2014-05-01 13:01:52 +10:00
Rob H	43106d5db8	Add explanation to top of BOM	2014-04-24 15:10:45 +10:00
Rob H	b59aa53158	Add edit order button to BOM	2014-04-24 13:49:28 +10:00
Rob H	20a5278a75	Merge branch 'master' into bom	2014-04-17 09:23:08 +10:00
Rohan Mitchell	aa1c28b163	Move enterprises api controller out of spree namespace	2014-04-11 19:08:55 +10:00
Will Marshall	96913ad922	Changing the order confirmation text with Kirsten	2014-04-11 13:33:13 +10:00
Rob H	ff531f0e18	Producers can only list line items which contain products they supply	2014-04-11 09:39:01 +10:00
Rob H	e114aecfd0	Merge branch 'master' into bom	2014-04-10 16:30:13 +10:00
Rob H	6228cc0c55	BOM: Add order cycle column	2014-04-10 15:34:23 +10:00
Rob H	5c7d36ba9b	BOM: interface cleanup and adding 'Clear All' button for filters	2014-04-10 15:29:09 +10:00
Rob H	645b6d5a8f	BOM: change datetimepickers to datepickers	2014-04-10 10:51:55 +10:00
Rob H	c5d5f5a9e6	BOM: view information about max quantities ordered	2014-04-10 10:33:57 +10:00
Will Marshall	fcb04481c4	Fixing a nil chain bug	2014-04-08 17:55:09 +10:00
Will Marshall	1e04a3b5f7	Changing the confirm email text a little bit	2014-04-07 14:31:02 +10:00
Rob H	aad5ad4bc0	BOM interface cleanup	2014-04-06 19:22:17 +10:00
Rob H	0a6230088d	Make BOM bulk action dropdown pretty	2014-04-06 17:39:53 +10:00
Rob H	5cec4feb7e	Remove search boxes from filter BPE filter boxes	2014-04-05 10:17:21 +11:00
Rob H	366555d9a7	Remove old column toggle from BOM	2014-04-05 10:08:37 +11:00
Rob H	980797493d	Create dropdown list for toggling columns	2014-04-04 19:36:06 +11:00
Will Marshall	5c999fd9cf	Adding a signup confirmation email	2014-04-04 12:36:33 +13:00
Will Marshall	403ad797ac	Tidying up the cart	2014-04-01 12:42:42 +11:00
Will Marshall	e51f1b508d	Fixing the empty cart button	2014-04-01 12:39:47 +11:00
Rob H	00df441bc2	Re-add changes to variant bulk show to fix 'I'm a teapot' fails	2014-03-28 16:47:52 +11:00
Will Marshall	5d36dc5b4f	Moving User Account to darkswarm	2014-03-28 16:02:32 +11:00
Rob H	ee147c232e	WIP: Remove changes to variant bulk show casuing issues	2014-03-28 14:41:03 +11:00
Rob H	771ccc6e76	Merge branch 'capybara-fails' into bom	2014-03-28 13:52:17 +11:00
Rob H	4d65427d18	Fix BPE regression bugs caused by capybara upgrade	2014-03-28 12:11:36 +11:00
Rob H	ab14bf70ab	Merge branch 'bpe_issues' into bom	2014-03-27 15:39:37 +11:00
Rob H	dae2d9db9e	BPE: Set defaults for price and on_hand to prevent 'I'm a teapot' error (418) on update	2014-03-27 15:38:44 +11:00
Rob H	9c65dd2ace	BOM: add warning message about missing unit values to group buy calc box	2014-03-27 14:18:00 +11:00
Rob H	0c2e215fef	BOM: Add a method to check that all selected variants have a unit_value	2014-03-27 14:11:19 +11:00
Rob H	cd1086ce05	WIP: Bulk calculation box work with shared resources	2014-03-26 16:44:26 +11:00
Rob H	cbd3722380	Merge branch 'master' into bom	2014-03-21 13:47:50 +11:00