5905 Commits

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	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
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	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
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
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
summerscope	72c50486fa	ADding new icons into producer modal	2014-05-30 14:29:08 +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	00ac80bdbb	Add new icons	2014-05-30 12:56:56 +10:00
summerscope	a54b3f7849	Adding new icon for refresh	2014-05-30 12:39:44 +10:00
summerscope	9a962f7445	Add new icons to checkout & back to cart buttons	2014-05-30 12:35:54 +10:00
summerscope	15cde6c372	Merge branch 'laura_and_will' into icon_font ... Conflicts: app/views/groups/index.html.haml app/views/modals/_producers.html.haml	2014-05-30 12:12:07 +10:00
summerscope	43cc77c88b	Adding icon into button	2014-05-30 12:01:57 +10:00
Will Marshall	ee785a3498	Merge branch 'master' into laura_and_will	2014-05-30 12:01:33 +10:00
Will Marshall	db131af5e7	Patching a class hook	2014-05-30 12:00:28 +10:00
summerscope	3fca8640fd	Add class right to icons	2014-05-30 11:57:19 +10:00
summerscope	9cae581cda	Add class right to icons	2014-05-30 11:57:06 +10:00
summerscope	34c4fc8aa1	Add class right to icons	2014-05-30 11:56:52 +10:00
summerscope	474581211b	Add class right to icons	2014-05-30 11:56:41 +10:00
summerscope	cca6a39476	Adding in icons to checkout partial	2014-05-30 11:49:14 +10:00
summerscope	cbc28f6da7	Adding in icons to checkout partial	2014-05-30 11:48:59 +10:00
summerscope	b4f14197fa	Adding in icons to checkout partial	2014-05-30 11:48:47 +10:00
summerscope	4893679d12	Adding in icons to checkout partial	2014-05-30 11:48:32 +10:00
Will Marshall	5b58bf2c71	Adding our own custom unauthorized page	2014-05-30 11:24:37 +10:00
Rohan Mitchell	4c6a7622eb	Convert rep template to rabl	2014-05-29 17:21:52 +10:00
Rohan Mitchell	7d73f7d7f2	Fix reversed checkbox value for select all variants on order cycle admin page	2014-05-29 17:21:52 +10:00
Will Marshall	3ae2dc34e8	Preventing rabl from dying if no current hub	2014-05-29 16:50:41 +10:00
summerscope	c0cb9857cc	Style and template adjustments to shopfront top of page to get content hierarchy looking right. Removed change location link as new menu system supercedes this.	2014-05-29 16:42:05 +10:00
Will Marshall	d5a652182e	Scrolling to groups when hotlinked	2014-05-29 16:31:12 +10:00
Will Marshall	c49d9d838c	Removing reference to modals and unnecessary ID	2014-05-29 16:19:20 +10:00
Will Marshall	f28fe34958	Removing groups modals	2014-05-29 16:15:39 +10:00
Will Marshall	e44853346e	Dropping current producers, switching to suppliers and using Angular	2014-05-29 16:12:58 +10:00