1998 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob H	b74a845875	Merge branch 'master' into bom	2014-03-28 14:42:15 +11:00
Rob H	ee147c232e	WIP: Remove changes to variant bulk show casuing issues	2014-03-28 14:41:03 +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	89fcf50762	Tidying up tabs	2014-03-27 16:36:12 +11:00
Will Marshall	08c25b1604	Getting a success message in place	2014-03-27 16:26:22 +11:00
Will Marshall	54491e0de2	Syncing up the email addresses between the SpreeUser tabs	2014-03-27 16:17:51 +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
Rob H	dae2d9db9e	BPE: Set defaults for price and on_hand to prevent 'I'm a teapot' error (418) on update	2014-03-27 15:38:44 +11:00
Rob H	2b035459fd	BPE: Adding blank filters alerts the user	2014-03-27 15:13:00 +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	9c65dd2ace	BOM: add warning message about missing unit values to group buy calc box	2014-03-27 14:18:00 +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
Will Marshall	2158937f82	Adding a sidebar tab	2014-03-27 13:34:38 +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	e444ff8d2c	Patching order cycle selector	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	67762317cb	Removing close link	2014-03-27 13:01:05 +11:00
Will Marshall	a89de9a80f	Patching our patch	2014-03-27 13:01:04 +11:00
Will Marshall	007428b6dc	Splitting between path and hashfragment for offcanvas and tabs respectively	2014-03-27 13:01:04 +11:00
Will Marshall	c118a86119	Latest snapshot of the patched mm-foundation, and a quick tab implementation sidebar	2014-03-27 13:01:04 +11:00
Will Marshall	cdfaf4fc92	Temporary working version with hacked Foundation/Angular/Tabs	2014-03-27 13:01:04 +11:00
Will Marshall	f5a0341851	Notes for the tabs controller	2014-03-27 13:01:03 +11:00
Will Marshall	166c8c3df4	Adding the basic Angular tabs and changed markup to keep it pretty	2014-03-27 13:01:03 +11:00
Will Marshall	80fe3f7adf	Starting dedicated tabs stylesheet	2014-03-27 13:01:03 +11:00
Will Marshall	61e6050e3a	Fixing up some more minor regression bugs	2014-03-27 13:01:03 +11:00
Will Marshall	d4f26c9ef1	Moving foundation out of assets group	2014-03-27 13:01:02 +11:00
Will Marshall	d637deeb19	Patching a Foundation bug w/ tests	2014-03-27 13:01:02 +11:00
Will Marshall	e4bb2f1cdf	Keeping Foundation 4 and 5 parallel	2014-03-27 13:01:02 +11:00
Will Marshall	8f56b829cb	Adding foundation 4 in namespace	2014-03-27 13:01:01 +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
Rohan Mitchell	71273dfc7f	Refactor Product to use exchanges.incoming instead of sender/receiver roles	2014-03-26 16:36:09 +11:00
Rohan Mitchell	20745825bf	Fix finding producers for shopfront, moving to SQL-land in the process. Woo.	2014-03-26 12:56:58 +11:00
Rohan Mitchell	ec0191806a	Update specs to explicitly specify exchange direction	2014-03-26 12:17:49 +11:00
Rohan Mitchell	abf83b0e58	Find only outgoing exchanges for Enterprise scopes using with_order_cycles_outer	2014-03-26 12:07:06 +11:00
Rohan Mitchell	ac8990f7e7	Rename enterprises_spec to singular for consistency	2014-03-26 11:46:51 +11:00
Rohan Mitchell	f184f0c246	Fix inappropriate intimacy: Extract exchange-specific queries from OrderCycle back into exchange	2014-03-26 11:43:32 +11:00
Rohan Mitchell	ac92d0919a	Add incoming boolean field to Exchange, determine exchange direction from this field rather than sender/receiver roles	2014-03-26 11:19:35 +11:00
Will Marshall	57ca48dc4a	Fixing one failing spec	2014-03-21 15:18:28 +11:00