1098 Commits

Author	SHA1	Message	Date
Rob H	e114aecfd0	Merge branch 'master' into bom	2014-04-10 16:30:13 +10:00
Rob H	e64bfe8ba3	Fix failing API Orders spec	2014-04-10 16:26:24 +10:00
Rob H	5c7d36ba9b	BOM: interface cleanup and adding 'Clear All' button for filters	2014-04-10 15:29:09 +10:00
Rob H	645b6d5a8f	BOM: change datetimepickers to datepickers	2014-04-10 10:51:55 +10:00
Rob H	c5d5f5a9e6	BOM: view information about max quantities ordered	2014-04-10 10:33:57 +10:00
Will Marshall	093004a460	Clearing the cart when order cycle is changed	2014-04-09 15:40:41 +10:00
Rohan Mitchell	e792107d7b	Make order cycle specs more robust	2014-04-09 15:02:40 +10:00
Rohan Mitchell	19ca8e142a	Do not show deleted products on shopfront	2014-04-09 15:02:40 +10:00
Will Marshall	87a43fc36e	Fixing the build! Some minor bugs due to mailer changes	2014-04-09 12:19:52 +10:00
Will Marshall	902eefa8bb	Patching one test and simplifying the modifications to order cycle tooltip	2014-04-07 14:15:15 +10:00
Rob H	aad5ad4bc0	BOM interface cleanup	2014-04-06 19:22:17 +10:00
Rob H	0a6230088d	Make BOM bulk action dropdown pretty	2014-04-06 17:39:53 +10:00
Rob H	366555d9a7	Remove old column toggle from BOM	2014-04-05 10:08:37 +11:00
Will Marshall	5c999fd9cf	Adding a signup confirmation email	2014-04-04 12:36:33 +13:00
Will Marshall	44049da3cb	Text change	2014-04-04 12:36:12 +13:00
Rob H	8e54bf1e2e	Enterprise users are aurthorised to view BOM	2014-04-04 09:11:56 +11:00
Will Marshall	718e295f3f	Some more minor test fiddling	2014-04-03 10:34:04 +13:00
Rohan Mitchell	32ffd05ba0	Order cycle can have the same enterprise participating as supplier, coordinator and distributor	2014-04-02 11:54:28 +11:00
Rohan Mitchell	98d599e5f7	Fix order cycle failing to save after a failing submit to server	2014-04-02 11:38:59 +11:00
Will Marshall	d9e86ae395	Some more minor refactoring	2014-04-01 16:58:50 +11:00
Will Marshall	bd4623bc71	Reworking the tests a little more for FASTER	2014-04-01 14:11:48 +11:00
Will Marshall	749abd82e8	Undoing previous change: no performance fix	2014-04-01 14:02:25 +11:00
Will Marshall	da479b7534	Fast version of OC selection	2014-04-01 14:01:57 +11:00
Will Marshall	5153c44aa0	Refactoring checkout specs some more	2014-04-01 13:53:37 +11:00
Will Marshall	f8f37abe32	Reworking the checkout spec slightly	2014-04-01 13:44:36 +11:00
Will Marshall	e1465352d0	Improving the navigation by moving it all to a service, adding a generic icon	2014-03-28 16:02:31 +11:00
Will Marshall	12b1a1b0e9	Switching our recover password form to Darkswarm	2014-03-28 16:02:31 +11:00
Rohan Mitchell	da6ba04780	Update variant weight from unit value when unit is weight	2014-03-28 15:34:26 +11:00
Rohan Mitchell	fddfdf8050	Select all supplied products on order cycle admin page	2014-03-28 15:34:26 +11:00
Rob H	771ccc6e76	Merge branch 'capybara-fails' into bom	2014-03-28 13:52:17 +11:00
Rob H	73271fa45a	Fix BOM regression bugs caused by capybara upgrade	2014-03-28 13:50:10 +11:00
Rob H	4d65427d18	Fix BPE regression bugs caused by capybara upgrade	2014-03-28 12:11:36 +11:00
Will Marshall	d8160bc6d5	Partially fixing the visible issue	2014-03-27 16:12:18 +11:00
Rob H	ab14bf70ab	Merge branch 'bpe_issues' into bom	2014-03-27 15:39:37 +11:00
Will Marshall	e48a25983a	Starting a working forgot password system	2014-03-27 15:11:11 +11:00
Will Marshall	adcd5e1c8d	Fixing a regression issue	2014-03-27 14:30:52 +11:00
Rob H	0c2e215fef	BOM: Add a method to check that all selected variants have a unit_value	2014-03-27 14:11:19 +11:00
Will Marshall	2be9ad7dd0	Starting with our own passwords controller	2014-03-27 13:52:02 +11:00
Rob H	a260a3fa56	BOM: Fixed bug causing Order Cycles filter to break in some cases	2014-03-27 13:32:26 +11:00
Will Marshall	b5f1464ce9	Patching more regression issues	2014-03-27 13:01:06 +11:00
Will Marshall	3976694dad	Patching up some regressions	2014-03-27 13:01:05 +11:00
Will Marshall	17bb1f9d25	Getting the tests working once more	2014-03-27 13:01:05 +11:00
Will Marshall	61e6050e3a	Fixing up some more minor regression bugs	2014-03-27 13:01:03 +11:00
Will Marshall	e4bb2f1cdf	Keeping Foundation 4 and 5 parallel	2014-03-27 13:01:02 +11:00
Will Marshall	bf7d12b40e	Upgrading Foundation, starting to work through regression issues	2014-03-27 13:01:01 +11:00
Will Marshall	0690fcda48	Reworking the way the Sidebar works	2014-03-27 11:54:25 +11:00
Rohan Mitchell	93db813b3a	Make current_producers helper more resilient	2014-03-27 10:25:05 +11:00
Rohan Mitchell	ce2882de35	OrderCycleFormApplicator uses exchanges.incoming instead of role	2014-03-27 09:49:08 +11:00
Rohan Mitchell	3104d285ca	Order cycle admin JS uses exchanges.incoming instead of role	2014-03-27 09:30:53 +11:00
Rob H	cd1086ce05	WIP: Bulk calculation box work with shared resources	2014-03-26 16:44:26 +11:00