1281 Commits

Author	SHA1	Message	Date
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
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
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
Rob H	9135a8f27b	Change 'ready on' to 'ready for'	2014-06-19 16:28:16 +10:00
summerscope	ce28e286da	Make the rabl capture phone number at enterprise level	2014-06-19 15:42:33 +10:00
Will Marshall	a4d12c4515	Patching up IE warning	2014-06-19 15:18:14 +10:00
Will Marshall	34e2170faf	Patching some regressions	2014-06-19 14:36:47 +10:00
Will Marshall	ce1732db27	Adding taxon preview (big) to the admin UI	2014-06-19 14:18:52 +10:00
Will Marshall	7f4816c9a5	Adding new producer modal and dereferencing shopfront	2014-06-19 14:00:37 +10:00
Will Marshall	36451423ba	Producer fat view	2014-06-19 12:56:55 +10:00
Will Marshall	3c7f5e9158	Adding new mechanism to hubs/fat	2014-06-19 12:54:06 +10:00
Will Marshall	738fdfcd49	Merge branch 'laura_and_will'	2014-06-19 12:11:12 +10:00
Will Marshall	8fcc2b0c62	Merge branch 'refactoring_services' into laura_and_will	2014-06-19 12:10:28 +10:00
Will Marshall	5d71af7687	fixing issue 750	2014-06-19 12:10:26 +10:00
Will Marshall	8905b45333	Fixing a minor regression	2014-06-19 12:10:05 +10:00
Will Marshall	b9561ecf20	Minor refactoring from code review with Rohan	2014-06-19 11:41:24 +10:00
summerscope	b0b8e14adb	Tweak IE old warning message for stakeholder feedback	2014-06-19 11:30:41 +10:00
Will Marshall	c02c7cf7ca	Further patches to the damned RABL system, patching everything up to use our new Service structure	2014-06-18 17:54:13 +10:00
summerscope	2dcdd997a2	Turn off IE message ready for logic	2014-06-18 17:14:20 +10:00
summerscope	4d6a92dfe4	Update markup to include links to modern browsers for upgrade	2014-06-18 17:11:08 +10:00
Will Marshall	224a70c11f	Refactoring JSON injection a bit further	2014-06-18 16:43:57 +10:00
Rohan Mitchell	cf4e7b18b4	Redirect to enterprises index page after updating producer properties	2014-06-18 15:43:22 +10:00
Will Marshall	deb6c8a05a	Refactoring the RABL injection and the Hubs/Producers/Enterprises services	2014-06-18 15:40:02 +10:00