1631 Commits

Author	SHA1	Message	Date
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +10:00
Rob H	d7b232aefd	Split dirtyProducts out into its own service	2014-05-07 11:25:09 +10:00
Will Marshall	6af314a075	Patching unmerged path	2014-05-06 18:31:20 +10:00
Will Marshall	7835343273	Switching out colour schemes	2014-05-06 18:28:55 +10:00
Will Marshall	1756479c85	Patching a regression bug with login on checkout	2014-05-06 18:28:20 +10:00
Will Marshall	3542799349	Removing pointless foundation crud, reworking the login	2014-05-06 18:28:20 +10:00
summerscope	1c926c49bc	Styling for producer node + add link for producers into footer	2014-05-06 18:27:17 +10:00
summerscope	e84ee91184	Styling for producers page and new pretty bg picture	2014-05-06 18:24:30 +10:00
summerscope	1d9a1aa8ce	Add stylesheet for producers	2014-05-06 18:04:17 +10:00
summerscope	779bf6b096	Renaming ID to make it more generic to table search rather than Hub	2014-05-06 17:55:38 +10:00
summerscope	c4cd15423c	Add email link with reverse	2014-05-06 17:40:02 +10:00
summerscope	6cb186ffe3	Styling for footer and further work for top nav	2014-05-06 17:32:22 +10:00
summerscope	93f095d976	Adding a menu style and styling around the new top nav	2014-05-06 16:10:02 +10:00
Will Marshall	1a396429fe	Re-ordering stuff for Laura	2014-05-06 12:27:21 +10:00
Will Marshall	5b962cc3e4	Merge branch 'darkswarm_home'	2014-05-06 11:41:37 +10:00
Will Marshall	25de2f920a	Merge branch 'master' into reworking_menu ... Conflicts: app/views/layouts/darkswarm.html.haml	2014-05-06 11:16:20 +10:00
Will Marshall	010025798d	Removing a redundant 'in'	2014-05-05 16:29:33 +10:00
Will Marshall	9db602f031	Patching the visible flag in admin	2014-05-05 16:26:03 +10:00
Will Marshall	dcd2e39f2c	Tweaking for a moved partial	2014-05-05 15:57:16 +10:00
Will Marshall	dd25bfd345	Starting to rework menu	2014-05-05 15:52:48 +10:00
Will Marshall	1774bc1e19	Adding producers filtering and more Angular magic	2014-05-05 15:43:11 +10:00
Rob H	6ba0d6c5f9	WIP: Split out admin angularjs	2014-05-02 21:38:39 +10:00
Rob H	5a2a43a060	Create angularjs admin module	2014-05-02 15:56:20 +10:00
Will Marshall	bbb70342b3	Merging	2014-05-02 15:35:43 +10:00
Will Marshall	23fa1c7b7b	Patching a couple more issues	2014-05-02 15:17:44 +10:00
Will Marshall	b907616749	Renaming our partials	2014-05-02 14:47:12 +10:00
Rob H	ceada3596b	Merge master into cleanup	2014-05-02 14:43:06 +10:00
Rohan Mitchell	4480c75494	Fix "undefined method 'association_class' for nil:NilClass" error when creating Migs payment gateway	2014-05-02 14:25:32 +10:00
Rohan Mitchell	c9aefa507a	Remove chili	2014-05-02 14:25:32 +10:00
Will Marshall	3d06caf1e3	Merging in master	2014-05-02 13:10:31 +10:00
Will Marshall	19137ce309	Adding state to home page filtering	2014-05-02 12:57:33 +10:00
Will Marshall	9bd76df116	That wasn't actually a bug! Sorry	2014-05-02 12:52:51 +10:00
Will Marshall	794d7b69ae	Restoring our toggle option	2014-05-02 12:50:32 +10:00
Rob H	de369ae32b	WIP: Can manage taxons in BPE	2014-05-02 10:28:33 +10:00
Will Marshall	34f170d4f7	Bugged thing in the shop spec	2014-05-02 10:18:57 +10:00
Will Marshall	2d536e01e7	Patching some deadlocks	2014-05-01 17:21:46 +10:00
Will Marshall	0956aa2532	Patching a bug in order cycle partial	2014-05-01 17:08:15 +10:00
Will Marshall	6ad30d901d	Tidying down shop/checkout test	2014-05-01 16:22:11 +10:00
Will Marshall	e65924c50f	Removing a dud reference to active'	2014-05-01 15:52:27 +10:00
Will Marshall	2ff2d3dcbd	Starting to work on test format	2014-05-01 15:51:40 +10:00
Rob H	56204d4ea6	Upgrade Admin AngularJS	2014-05-01 13:01:52 +10:00
summerscope	c1ab0c0f0b	Renaming sass files for relevance. Style tweaks for large input to fix firefox bug.	2014-04-30 16:12:39 +10:00
Will Marshall	8a5b93ace9	Adding a couple of basic feature tests for the sake of demonstration	2014-04-30 16:10:02 +10:00
summerscope	4ed81da022	Updates to styling homepage and active table	2014-04-30 15:36:42 +10:00
summerscope	dcacf01c1d	Tweaking copy for food hubs modals.	2014-04-30 15:05:41 +10:00
Will Marshall	e901f3439a	Starting to partialize and test the RABL partials	2014-04-30 13:52:06 +10:00
Will Marshall	0f6bd7049c	Starting to build out producers Angular page	2014-04-30 12:52:47 +10:00
Will Marshall	e7d6e7e564	Removing the sidebar before filter stuff, since we're not using it anymore	2014-04-30 12:15:57 +10:00
Will Marshall	f68a637609	Renaming Enterprise.active to Enterprise.visible	2014-04-30 12:09:22 +10:00
Will Marshall	4ca148ee93	Starting on the producers controller	2014-04-30 12:05:53 +10:00