12632 Commits

Author	SHA1	Message	Date
Will Marshall	ef6fe2b181	Refactoring all interactions with the home/hub table into UIHelper	2014-04-29 15:22:04 +10:00
Will Marshall	d7f8d2f5c7	Reworking some broken tests	2014-04-29 15:13:59 +10:00
Will Marshall	26adada506	Reworking UI tests	2014-04-29 15:13:59 +10:00
Will Marshall	9415c4e3ab	Patching our integration tests to use the new home page mechanics	2014-04-29 15:13:58 +10:00
Will Marshall	c33fa03736	Merging into master	2014-04-29 10:35:05 +10:00
Rohan Mitchell	126ddd0a75	Add explicit wait before inconsistently failing lookup	2014-04-25 18:59:33 +10:00
Rohan Mitchell	c8f50216ab	Increase default_wait_time on order_cycles_spec in an attempt to prevent inconsistent failures in CI	2014-04-25 18:06:09 +10:00
Will Marshall	9117b1f516	Adding some notes for future refactoring and a couple of pending integration tests for the new home	2014-04-25 17:14:18 +10:00
Will Marshall	28230f0436	Adding a current user service, refactoring various consequences of this change:	2014-04-25 16:59:46 +10:00
Rohan Mitchell	91d9b546d2	Merge branch 'foreign-keys'	2014-04-25 16:06:54 +10:00
Will Marshall	cf67b5fcac	Adding a taxon collection mechanism to Enterprise	2014-04-25 12:45:03 +10:00
Will Marshall	dbf15c03d3	Refactoring how we change window.location	2014-04-25 12:13:50 +10:00
Will Marshall	22dc8cbfa0	Unbreaking karma karma lama	2014-04-25 12:04:15 +10:00
Will Marshall	f9b7b602da	Moving from darkswarm to home	2014-04-24 16:53:00 +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
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
Rob H	c86586fc16	Remove collection date from admin enterprises index	2014-04-24 13:57:56 +10:00
Rob H	b59aa53158	Add edit order button to BOM	2014-04-24 13:49:28 +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	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
Rob H	2e51518b5b	CMS spec being weird	2014-04-24 11:28:53 +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
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	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
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
Will Marshall	99d743f7cf	Some very basic specs	2014-04-18 16:35:06 +10:00
Will Marshall	a5a3f9fe43	Fixing up some minor spec bugs	2014-04-17 17:22:30 +10:00
Rob H	2532248e6f	Fix failing javascript tests	2014-04-17 15:27:15 +10:00
Will Marshall	c6395a686a	Adding flash notifications	2014-04-17 15:08:01 +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
Rob H	2eb21a024c	Tiny fixes to API orders controller spec	2014-04-16 18:24:17 +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	6452ebf67d	Make spec more robust	2014-04-11 19:08:55 +10:00
Rohan Mitchell	47ac097eb7	Do not show deleted variants on shopfront	2014-04-11 19:08:55 +10:00