34725 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
summerscope	31bab3469e	Implementing new X icon for modal window	2014-06-03 11:20:15 +10:00
summerscope	653120888f	Implementing new X icon for modal window	2014-06-03 11:20:03 +10:00
summerscope	c07ca67f29	Implementing new X icon for modal window	2014-06-03 11:19:56 +10:00
summerscope	73a68799be	Implementing new X icon for modal window	2014-06-03 11:19:45 +10:00
summerscope	d160f4fe51	Implementing new X icon for modal window	2014-06-03 11:19:37 +10:00
summerscope	cd332c1eb1	Implementing new X icon for modal window	2014-06-03 11:19:22 +10:00
summerscope	8a34160713	No change	2014-06-03 11:18:43 +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
summerscope	8caccfc5b0	Merge laura_and_will into icon_font	2014-05-30 17:01:49 +10:00
summerscope	ef5b36cddd	Styling producers	2014-05-30 16:39:07 +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
summerscope	b19ca3b9c4	Remove whitespace	2014-05-30 16:38:27 +10:00
Rob H	66a47f053c	Amend products controller spec to include requirement for primary_taxon_id	2014-05-30 16:21:04 +10:00
summerscope	31ae0cf2a9	Tweak logic on contact us address line display	2014-05-30 16:14:40 +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