1627 Commits

Author	SHA1	Message	Date
Rob H	c98d2e71d8	Add scroll pane to admin dashboard	2014-05-09 17:20:53 +10:00
Will Marshall	573d479e08	Fixing test regressions	2014-05-09 16:43:57 +10:00
Rohan Mitchell	04379101e1	Change to new production hostname: openfoodnetwork.org.au	2014-05-09 16:39:39 +10:00
Rob H	05e01d02c4	Merge branch 'master' into ent-makeover	2014-05-09 15:58:17 +10:00
Rob H	01c5822fcc	Add basic dashboard to admin section	2014-05-09 15:48:58 +10:00
Rohan Mitchell	87179669a6	Change to new production hostname: openfoodnetwork.org.au	2014-05-09 11:34:52 +10:00
Will Marshall	0df2eabf95	Moving useless assets	2014-05-09 10:32:39 +10:00
Will Marshall	d9f462ba81	Moving useless assets	2014-05-09 10:12:40 +10:00
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +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
Will Marshall	9bd76df116	That wasn't actually a bug! Sorry	2014-05-02 12:52:51 +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	6ad30d901d	Tidying down shop/checkout test	2014-05-01 16:22:11 +10:00
Will Marshall	2ff2d3dcbd	Starting to work on test format	2014-05-01 15:51:40 +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
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	4ca148ee93	Starting on the producers controller	2014-04-30 12:05:53 +10:00
Will Marshall	c33fa03736	Merging into master	2014-04-29 10:35:05 +10:00
Will Marshall	f9b7b602da	Moving from darkswarm to home	2014-04-24 16:53:00 +10:00
Rob H	566704a968	Alter enterprise index order	2014-04-24 16:09:52 +10:00
Rohan Mitchell	b649d6ef69	Authorise access to OrderCycles API	2014-04-24 13:20:16 +10:00
Rohan Mitchell	7931a2e8da	Test managed products API access for all user types	2014-04-24 13:20:16 +10:00
Rohan Mitchell	6c86254a90	Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user	2014-04-24 13:20:16 +10:00
Rohan Mitchell	e6d988ff34	Nest variant soft delete route under product resource	2014-04-24 13:20:16 +10:00
Rohan Mitchell	e28a450875	Add API call to soft-delete a variant	2014-04-24 13:20:16 +10:00
Will Marshall	16251fe5ea	Merging with master	2014-04-23 14:43:39 +10:00
Rob H	131b4ac073	Hack fix for our API controllers not being able to access Spree's Rabl Responder	2014-04-23 12:31:30 +10:00
Rob H	b37a701d39	Merge branch 'api_fixes' into bom	2014-04-23 12:03:01 +10:00
Rob H	353b26c3df	Hack fix for our API controllers not being able to access Spree's Rabl Responder	2014-04-23 12:02:11 +10:00
Will Marshall	99d743f7cf	Some very basic specs	2014-04-18 16:35:06 +10:00
Will Marshall	66d5f08b99	Adding custom filtering to home page	2014-04-18 15:17:12 +10:00
Will Marshall	6753b96f29	Adding darkswarm variant of home page, getting Angular skeleton into place, taking shit off window	2014-04-18 13:01:36 +10:00
Will Marshall	c6395a686a	Adding flash notifications	2014-04-17 15:08:01 +10:00
Rob H	1b5080ceb4	Remove render	2014-04-17 12:28:28 +10:00
Rob H	5345e8d339	Add accessible_by scope to enterprises model and accessible action to enterprises API	2014-04-17 12:23:09 +10:00
Rob H	20a5278a75	Merge branch 'master' into bom	2014-04-17 09:23:08 +10:00
Rob H	83e3172901	Add accessible action to order_cycles controller for listing order_cycles by enterprises invloved	2014-04-16 18:27:50 +10:00
Will Marshall	171c8c6ed1	Merging in with master	2014-04-16 16:16:15 +10:00
Rob H	c68aeb4c36	Only show orders I am distributing in the API	2014-04-16 14:54:50 +10:00
Rob H	2b283405e7	Only admin and users of distributors can access admin orders	2014-04-13 10:09:17 +10:00
Rohan Mitchell	aa1c28b163	Move enterprises api controller out of spree namespace	2014-04-11 19:08:55 +10:00
Will Marshall	6e35dc7168	Merging with master	2014-04-11 13:09:22 +10:00
Rob H	e114aecfd0	Merge branch 'master' into bom	2014-04-10 16:30:13 +10:00
Will Marshall	36a4e34dff	Preprocessing order attributes, returning path	2014-04-09 15:04:17 +10:00
Rohan Mitchell	19ca8e142a	Do not show deleted products on shopfront	2014-04-09 15:02:40 +10:00
Will Marshall	b5550c048a	Starting on JSON checkout, moving Order properties to Order.order	2014-04-09 14:33:45 +10:00