20351 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Will Marshall	a979334f2a	Adding primary taxon	2014-05-30 14:31:36 +10:00
Will Marshall	b736145552	Adding primary taxon to admin forms ... Conflicts: db/migrate/20140522044009_add_primary_taxon_to_products.rb spec/features/admin/products_spec.rb	2014-05-30 14:31:27 +10:00
Will Marshall	1c31ac56ea	Adding primary taxon field to product ... Conflicts: db/migrate/20140522044009_add_primary_taxon_to_products.rb	2014-05-30 14:31:03 +10:00
summerscope	72c50486fa	ADding new icons into producer modal	2014-05-30 14:29:08 +10:00
summerscope	91224ed0a4	Merge issues. Removing position fixed on modal window styling.	2014-05-30 14:27:37 +10:00
Will Marshall	20873b6e45	Patching a minor regression spec	2014-05-30 14:21:21 +10:00
Will Marshall	18597a2377	Patching a minor regression spec	2014-05-30 14:18:51 +10:00
summerscope	5f6b8c9b5b	Merge branch 'laura_and_will' into icon_font	2014-05-30 13:19:54 +10:00
summerscope	5bdb38e293	Merge issues. Removing position fixed on modal window styling.	2014-05-30 13:19:47 +10:00
Will Marshall	85ee33517a	Restoring another deleted file	2014-05-30 13:19:23 +10:00
summerscope	42a9f16800	Adding in new icon into producer partial	2014-05-30 13:08:18 +10:00
summerscope	49a39bb240	Adding unlock icon to signed in	2014-05-30 13:06:48 +10:00
summerscope	179d9f609c	Adding in new lock icon to signed in	2014-05-30 13:05:56 +10:00
summerscope	2c334a0180	Styling for trash icon on checkout page	2014-05-30 13:02:34 +10:00
Will Marshall	2b0bdc69cd	Fixing a scope issue	2014-05-30 13:01:16 +10:00
Will Marshall	638d6d2ac0	Moving around the authentication specs	2014-05-30 12:58:58 +10:00
summerscope	00ac80bdbb	Add new icons	2014-05-30 12:56:56 +10:00
Will Marshall	368fbd2383	Patching up admin redirects to be MOAR UNIVERSAL	2014-05-30 12:52:14 +10:00