15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Marshall	476eeef69d	Starting on on the map	2014-06-05 12:18:26 +10:00
Rohan Mitchell	566afc0b75	Merge branch 'laura_and_will'	2014-06-05 11:42:02 +10:00
Rohan Mitchell	f28d9f9d9b	Fix distributor logo spec - Add a logo	2014-06-05 11:38:27 +10:00
Rohan Mitchell	4a7609a835	Basic styling for checkout credit card form	2014-06-05 11:17:53 +10:00
Will Marshall	fc02e7857a	Merge branch 'master' into laura_and_will ... Conflicts: app/views/shopping_shared/_contact.html.haml	2014-06-04 17:24:30 +10:00
Rob H	3240a4e08e	Use display_as as option value for variant when it is present	2014-06-04 17:23:11 +10:00
Will Marshall	69e5459afd	Finishing off the merge with localStorage refactoring with sekrets	2014-06-04 17:22:10 +10:00
summerscope	039108a07d	Styling label on taxons on fat view of active table for hubs (add a little padding to right)	2014-06-04 17:16:47 +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
summerscope	3d64f883a0	Fix issue with double up columns - delete duplicate	2014-06-04 17:12:05 +10:00
summerscope	825ec1bb63	Adding in icons to home hubs fat and skinny views	2014-06-04 17:09:50 +10:00
summerscope	8d24301c26	Changing shop link to correct /shop	2014-06-04 16:57:21 +10:00
Rohan Mitchell	fc3402bbd0	Determine whether to send card field attributes by payment method type	2014-06-04 16:55:27 +10:00
summerscope	c2a2f2b3b8	Adding icon for producers. Remove styling summary-header to distinguish between product and producer	2014-06-04 16:51:43 +10:00
summerscope	cb5948047b	Adding new icons into producer modal. Making it pretty	2014-06-04 16:50:51 +10:00
summerscope	54a70d9b08	Adding new icons into hubs fat view. Making it pretty	2014-06-04 16:50:26 +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
summerscope	814ee9847e	Adding a new partial for mobile menu (off canvas) to restyle items in dropdown in big menu	2014-06-04 16:09:15 +10:00
summerscope	33c276c7f7	Adding in new icon fonts to mobile menu partial	2014-06-04 16:08:16 +10:00
summerscope	122ab01ce4	Adding in new icon fonts to large menu partial	2014-06-04 16:08:02 +10:00
summerscope	498559f70d	Adding in new icon fonts to cart partial	2014-06-04 16:07:41 +10:00
summerscope	6e4de586a9	Adding in new icon fonts to signed out partial	2014-06-04 16:07:17 +10:00
summerscope	1e3c046368	Adding in new icon fonts to signed in partial	2014-06-04 16:07:02 +10:00
summerscope	77f847dcbe	Adding in new icon fonts to menu system. Adding drop down cog to simplify top menu.	2014-06-04 16:06:24 +10:00
Rob H	7f2b3d62f4	OptionValueNamer spec refactor	2014-06-04 15:39:04 +10:00
Rob H	f4c15bfc48	Adding name and display_as fields to variants	2014-06-04 15:21:31 +10:00
Rob H	1ed5dcf994	Merge branch 'master' into units	2014-06-04 15:07:28 +10:00
Rob H	8d87cfbc35	Move option value naming logic into separate lib class	2014-06-04 14:54:42 +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
Rob H	29fbf0438b	Adding all fields to new admin product spec	2014-06-04 11:42:42 +10:00
summerscope	62e8a913fa	Merge branch 'laura_and_will' into icon_font	2014-06-04 11:09:37 +10:00
summerscope	1a39b70a14	Merge branch 'master' into laura_and_will	2014-06-04 11:08:44 +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
summerscope	fc4e20ffd4	Adding new icons from new pretty icon font	2014-06-03 11:50:38 +10:00
summerscope	037769bfb1	Adding new icons from icon font	2014-06-03 11:50:17 +10:00
summerscope	a6a86612c7	Adding X from new icon font to modal	2014-06-03 11:48:11 +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