34725 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
summerscope	c91e3aaa79	Removing useless hubs requirement in Hub service	2014-04-25 11:41:41 +10:00
summerscope	386908a947	Adding in copy for modals	2014-04-25 11:32:25 +10:00
Will Marshall	2212156f00	Adding handling of 'current hub'	2014-04-25 11:32:02 +10:00
Will Marshall	f57020d190	Fixing a bug with modals	2014-04-25 11:09:27 +10:00
summerscope	4b87e39fd7	Adding in content for modals	2014-04-24 17:13:53 +10:00
Will Marshall	9ef7023600	Adding template cache injection	2014-04-24 17:05:10 +10:00
Will Marshall	962a9cb5f7	Moving partials from darkswarm to hubs	2014-04-24 16:53:46 +10:00
Will Marshall	f9b7b602da	Moving from darkswarm to home	2014-04-24 16:53:00 +10:00
Will Marshall	f6bfc71c4b	Various small functional tweaks	2014-04-24 16:28:12 +10:00
Rob H	07ace99adc	Add informational warnings to admin enterprises index page	2014-04-24 16:10:40 +10:00
Rob H	566704a968	Alter enterprise index order	2014-04-24 16:09:52 +10:00
Rohan Mitchell	85db8859bb	On admin order cycle edit page, do not show exchanges for enterprises the user doesn't manage	2014-04-24 15:51:39 +10:00
Rob H	29cf40a5bf	Add visual indication that no payment/shipping/fees exist to enterprise index	2014-04-24 15:35:59 +10:00
Rob H	43106d5db8	Add explanation to top of BOM	2014-04-24 15:10:45 +10:00
Rohan Mitchell	2603256a17	Extract admin order cycle index row into partial	2014-04-24 14:53:32 +10:00
Rohan Mitchell	d0585b4d05	Admin order cycle listing does not show order cycles that enterprise users don't have access to	2014-04-24 14:43:33 +10:00
summerscope	4b95b9979e	Homepage styling and pretties	2014-04-24 14:12:27 +10:00
Rob H	c86586fc16	Remove collection date from admin enterprises index	2014-04-24 13:57:56 +10:00
summerscope	47468127c2	New pictures added	2014-04-24 13:56:30 +10:00
summerscope	7b794324d3	Adding pretty pictures	2014-04-24 13:53:08 +10:00
Rob H	b59aa53158	Add edit order button to BOM	2014-04-24 13:49:28 +10:00
Rohan Mitchell	8dd9260163	Do not add dummy distributor to orders without one - they don't need it	2014-04-24 13:20:16 +10:00
Rohan Mitchell	b649d6ef69	Authorise access to OrderCycles API	2014-04-24 13:20:16 +10:00
Rohan Mitchell	3c8757034a	Enterprise user can soft-delete a variant. BUT, only its own variants.	2014-04-24 13:20:16 +10:00
Rohan Mitchell	8715b71151	Do not show rspec profiling by default	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	95a6e34523	Spec access denied to regular user when soft-deleting variants	2014-04-24 13:20:16 +10:00
Rohan Mitchell	d16d970952	BPE uses soft-delete	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
Rohan Mitchell	4cbe434573	Remove trailing relations on destruction for EnterpriseFee and Variant	2014-04-24 13:20:15 +10:00
Rohan Mitchell	f7658ad250	Add foreign keys, sanitising data first	2014-04-24 13:20:15 +10:00
Rob H	2e51518b5b	CMS spec being weird	2014-04-24 11:28:53 +10:00
Will Marshall	5ea97b0919	Merge branch 'darkswarm_home' of github.com:openfoodfoundation/openfoodnetwork into darkswarm_home	2014-04-24 11:06:46 +10:00
Will Marshall	9bb0abbe48	Merge branch 'master' into darkswarm_home	2014-04-24 10:52:33 +10:00
Rob H	76f05d13d7	Slow specs on CI	2014-04-24 10:50:35 +10:00
summerscope	7c11a4082f	Styling tagline	2014-04-24 10:46:55 +10:00
Will Marshall	3ed569b24a	Patching a couple of borked specs	2014-04-24 09:52:29 +10:00
Will Marshall	b4da348e36	Patching a json test	2014-04-23 16:58:38 +10:00
Will Marshall	c060019873	Adding a learn more modal, restructuring partials	2014-04-23 16:48:53 +10:00
Will Marshall	0479a0a55d	Fixing bugs, improving dates	2014-04-23 15:46:14 +10:00
Will Marshall	16251fe5ea	Merging with master	2014-04-23 14:43:39 +10:00
Will Marshall	2981412540	Adding some specs, next order cycle, better CSS	2014-04-23 14:38:41 +10:00
Will Marshall	8027af2bb7	Adding active boolean and sorting	2014-04-23 13:22:30 +10:00
Will Marshall	f5b32ebd3f	Better handling of the home page hubs	2014-04-23 12:58:34 +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	669ec0eee7	Fix failing API specs	2014-04-23 12:02:27 +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