2671 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Marshall	843ea9faef	Basic but hacky way to get events out of map	2014-06-05 15:08:50 +10:00
Will Marshall	476eeef69d	Starting on on the map	2014-06-05 12:18:26 +10:00
Will Marshall	69e5459afd	Finishing off the merge with localStorage refactoring with sekrets	2014-06-04 17:22:10 +10:00
Will Marshall	3c21ce8d99	Returning to the basic flash for now	2014-06-04 17:13:19 +10:00
Will Marshall	cd09f70ed3	Compacting down our flash messages	2014-06-04 17:13:19 +10:00
Will Marshall	874afb2d7e	Hiding image if not present	2014-06-04 17:13:18 +10:00
Will Marshall	5bd7485ca6	Restoring the image	2014-06-04 17:13:18 +10:00
Will Marshall	df7ee03cbf	Adding presenters to the social media fields	2014-06-04 17:13:18 +10:00
Will Marshall	d384b18d1b	Adding social media data to producers biatch	2014-06-04 17:13:18 +10:00
Will Marshall	a6a4d28072	Fixing up bugs in the Checkout form	2014-06-04 17:13:18 +10:00
Will Marshall	2c43d5960d	Patching up url formatting, still need to normalize this on backend	2014-06-04 17:12:17 +10:00
Will Marshall	d944c31d77	Showing a loading products thing	2014-06-04 17:12:16 +10:00
Will Marshall	59c433881e	Making the auto-closing more granular on checkout	2014-06-04 17:12:16 +10:00
Rohan Mitchell	fc3402bbd0	Determine whether to send card field attributes by payment method type	2014-06-04 16:55:27 +10:00
Rohan Mitchell	6a8def3d76	Do not send attributes for card fields when no card is supplied	2014-06-04 16:30:57 +10:00
Rohan Mitchell	37c780ed70	WIP: Send credit card details to server on checkout	2014-06-04 16:20:48 +10:00
Rohan Mitchell	a99e18990d	Readability	2014-06-04 14:27:17 +10:00
Rohan Mitchell	1ccfc46e50	Update primary taxons migration - take more care in setting the default primary taxon	2014-06-04 14:27:05 +10:00
Rohan Mitchell	d52c1fa5da	Revert "Do not show deleted products in order cycle admin" ... This reverts commit 4e45a682fd.	2014-06-03 12:18:27 +10:00
Rohan Mitchell	d4f65a63bb	Remove spec for removed image	2014-06-03 11:31:30 +10:00
Rohan Mitchell	4e45a682fd	Do not show deleted products in order cycle admin	2014-06-03 11:29:54 +10:00
Rohan Mitchell	60711301c1	Initialise primary taxon in migration instead of in model callback	2014-06-03 11:29:54 +10:00
summerscope	8fa053a0a8	Commenting out promo image from About tab in shopfront page. This needs an additional image style to be applied before it can be implemented correctly.	2014-06-03 10:28:18 +10:00
Rob H	bcfa1a8266	Fix spec to check validation of missing primary_taxon correctly	2014-05-30 20:06:40 +10:00
Rob H	f97ef0838c	Rollback variant_unit_change check, auto-set primary taxons where they exist	2014-05-30 19:20:15 +10:00
Rob H	bf4d83aecc	Fix master options_text display on front end	2014-05-30 18:39:41 +10:00
Rob H	2a8ef182f2	Merge remote-tracking branch 'origin/master' into new-product-form	2014-05-30 16:38:50 +10:00
Rob H	1d5cc5dced	Adding specs for new product creation	2014-05-30 16:38:29 +10:00
Rob H	66a47f053c	Amend products controller spec to include requirement for primary_taxon_id	2014-05-30 16:21:04 +10:00
Will Marshall	5f163eef1c	Tweaking the contact thingy	2014-05-30 16:10:45 +10:00
summerscope	ae310ff606	Refactor producers tab content for spacing of string	2014-05-30 16:02:46 +10:00
summerscope	587cf1ac9b	Tabs styling for hub shopfront page	2014-05-30 15:56:40 +10:00
summerscope	06adca7462	Producers tab content styling and layout for hub shopfront page	2014-05-30 15:54:42 +10:00
summerscope	9f172af34c	Styling and layout for groups tab content	2014-05-30 15:54:42 +10:00
summerscope	87d58b639d	Styling and layout and content updates to contact hub tab content	2014-05-30 15:54:42 +10:00
summerscope	57b895b0c3	Styling and layout for About Hub Name tab content on shopping page	2014-05-30 15:54:41 +10:00
Will Marshall	5c46057bf3	Merge branch 'master' into laura_and_will	2014-05-30 15:53:03 +10:00
Will Marshall	13c6ce6786	Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty	2014-05-30 15:52:20 +10:00
Rob H	4aae6be9b7	Remove unused overrides for primary taxons and product/new	2014-05-30 15:48:36 +10:00
Rob H	66d6de9dfc	Merge master (with primary taxons restored)	2014-05-30 15:45:48 +10:00
Will Marshall	7abfb2f936	Showing the resizing logo as well	2014-05-30 15:32:47 +10:00
Rohan Mitchell	15d8299efb	Fix enterprises spec - primary taxons change	2014-05-30 15:28:53 +10:00
Will Marshall	de9319f002	Auto-aligning BEFORE resizing	2014-05-30 15:23:42 +10:00
Rob H	69376e7f4b	Merge in master	2014-05-30 15:10:13 +10:00
Will Marshall	3ddd7c31e8	Patching which image is rendered	2014-05-30 15:08:16 +10:00
Will Marshall	be640fd856	Patching a spec and naming something	2014-05-30 15:02:47 +10:00
Will Marshall	7304e24591	Switching the image dimensions	2014-05-30 14:47:53 +10:00
Will Marshall	a7340df6a5	Removing some dud test content	2014-05-30 14:45:27 +10:00
summerscope	5cbc60e686	Typo fix on food hub modal	2014-05-30 14:43:31 +10:00
summerscope	68582514ef	Grammar fix up for food hub modal	2014-05-30 14:41:34 +10:00