4351 Commits

Author	SHA1	Message	Date
Will Marshall	a49fe2bf65	Fixing a regression bug	2014-06-25 16:30:23 +10:00
Will Marshall	33b5359a16	Spiking AMS implementation of data	2014-06-25 15:18:13 +10:00
Will Marshall	b1f275dac8	Adding enterprises to cart to prevent errors being thrown	2014-06-25 14:38:16 +10:00
summerscope	e14470ad77	Fix placeholder text to reference Producer rather than Hub	2014-06-25 14:16:42 +10:00
Will Marshall	2c6e239962	Adding some basic animations, upgrading Angular Foundation	2014-06-25 13:59:22 +10:00
Will Marshall	5f242f9232	Fixing groups page anchor scrolling	2014-06-25 10:46:32 +10:00
Will Marshall	4f3d468db6	Dereferencing groups and adding modals to page	2014-06-24 17:15:31 +10:00
Will Marshall	c09555e380	Tab fixes, new tests, reworking modals	2014-06-24 17:15:31 +10:00
Will Marshall	b3f0cb1e74	Bunch of minor bugfixes	2014-06-24 17:14:01 +10:00
summerscope	ff344533d9	Remove link for follow links on CONTACT for shopfront mini menu (tabs) - should be icon only	2014-06-24 16:51:58 +10:00
summerscope	a93a1a07cf	Tweak styling for closed shoptfront	2014-06-24 13:50:18 +10:00
summerscope	d0b2f73c5a	Tweak markup for PRODUCERS tab on mini menu	2014-06-24 13:25:45 +10:00
summerscope	e0f5f51f92	Tweak markup for GROUPS tab on mini menu	2014-06-24 13:25:27 +10:00
summerscope	902d896218	Tweak markup for CONTACT tab on mini menu	2014-06-24 13:25:13 +10:00
summerscope	703ee5e566	Tweak markup for ABOUT tab on mini menu	2014-06-24 13:24:56 +10:00
Rob H	9099fca11c	Merge branch 'bug-herd' into working	2014-06-23 22:01:41 +10:00
Will Marshall	3fc337299b	Adding ponies and filtering	2014-06-20 17:14:05 +10:00
Rob H	0785509bc4	Add plus icon to new order cycles button	2014-06-20 17:00:36 +10:00
Rob H	9f285b1d8c	Add plus icon to new enterprises button	2014-06-20 17:00:07 +10:00
Rob H	a448ccdad4	Remove unused enterprise show page	2014-06-20 16:53:04 +10:00
Will Marshall	1eaf2c3bc5	Fixing missing taxons	2014-06-20 16:50:31 +10:00
Rob H	d71966b5c0	Change show link to edit link on admin enterprises index	2014-06-20 16:39:09 +10:00
Rob H	4b437e2ab5	Realign enterprises social media form components	2014-06-20 16:38:10 +10:00
Will Marshall	21589fd5b0	Hack patching home page modals	2014-06-20 16:31:49 +10:00
Will Marshall	1ed634239d	Major refactoring	2014-06-20 16:31:49 +10:00
Rob H	d6341b65e5	Add edit button to Order cycles index	2014-06-20 16:22:55 +10:00
Rob H	1a0a8ec160	Merge branch 'master' into working	2014-06-20 13:54:52 +10:00
Will Marshall	8bb5f75ea0	Temporary fix to get staging working	2014-06-20 13:51:21 +10:00
Rob H	1f72bade65	Changing promo image explanation text	2014-06-20 13:47:33 +10:00
Rob H	3d1927d545	Merge branch 'master' into working	2014-06-20 12:29:47 +10:00
Rob H	a668a4fd55	Further tidy-up for order confirmation email	2014-06-20 12:21:33 +10:00
Will Marshall	c955bf61ac	Reverting the main_app changes	2014-06-20 12:11:00 +10:00
Will Marshall	ba842be5b8	Loading enterprises per-view again	2014-06-20 12:03:51 +10:00
Will Marshall	17521516b4	Patching up some regressions with the tabs	2014-06-20 11:33:30 +10:00
Will Marshall	b0d88c071a	Merge branch 'laura_and_will'	2014-06-20 10:49:31 +10:00
Will Marshall	c97fa711b7	Adding config changes to app.rb, fixing mixing producers links	2014-06-20 10:47:46 +10:00
summerscope	9a59f6b520	Remove parentheses from address on button	2014-06-20 10:36:09 +10:00
summerscope	5a005d944b	Remove parentheses from address on button	2014-06-20 10:35:58 +10:00
summerscope	f4fc0beb36	Styling about on hub shopfront page	2014-06-20 10:34:46 +10:00
summerscope	3a1bf24a86	Product modal adjust markup for SVG icon styling	2014-06-20 10:00:54 +10:00
summerscope	f87b2ea1e3	Producer hubs view - fat node - adjust markup to make more dynamic, adjust for new designs	2014-06-20 10:00:36 +10:00
summerscope	48292be98b	Home hubs view - fat node - adjust markup to make more dynamic, adjust for new designs	2014-06-20 10:00:16 +10:00
Rob H	2861191ab7	Merge branch 'sm-desc' into working	2014-06-20 09:43:58 +10:00
Rob H	0527900453	Change text of OC collection details	2014-06-19 18:02:05 +10:00
Rob H	3c24be3c0b	Change text of OC delivery instructions placeholder	2014-06-19 17:57:23 +10:00
Rob H	bd13b2b3fc	Add shipping method description to confirmation email, cleanup	2014-06-19 17:52:25 +10:00
summerscope	d1b6a7b2a2	Adjusting markup for active table producer fat view WIP commit	2014-06-19 17:06:38 +10:00
summerscope	7c5dc397b9	Adjusting markup for active table hub fat view for new layout	2014-06-19 17:06:16 +10:00
Rob H	df660ff536	Adding shipping method description to checkout	2014-06-19 16:34:28 +10:00
summerscope	5319ad8846	Changing name of classes to be less contextual and more reusable	2014-06-19 16:29:28 +10:00