594 Commits

Author	SHA1	Message	Date
Will Marshall	b757629bfa	Minor test tweaks	2014-05-29 11:52:46 +10:00
Rohan Mitchell	cc2498bb9b	Fix spec fails - group buy and available on removed from new product form	2014-05-24 18:26:02 +10:00
Rohan Mitchell	acbe49b8de	Revert primary taxons	2014-05-24 17:13:01 +10:00
Will Marshall	0a8f5d91ba	Adding primary taxon to admin forms	2014-05-24 09:29:26 +10:00
Rohan Mitchell	79393476b0	Revert "Adding primary taxon to admin forms" ... This reverts commit 110a6f2d14.	2014-05-24 09:07:56 +10:00
Will Marshall	110a6f2d14	Adding primary taxon to admin forms	2014-05-23 15:59:06 +10:00
Rohan Mitchell	9b15c213d1	When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges	2014-05-23 11:28:00 +10:00
Will Marshall	015403c282	Merge branch 'new_shop'	2014-05-22 12:40:48 +10:00
Will Marshall	272cb0469f	Setting up after_login redirects	2014-05-22 12:40:46 +10:00
Will Marshall	c69a4a5f1a	Adding social media links	2014-05-22 12:12:10 +10:00
Rohan Mitchell	a16f726377	Extract have_relationship test	2014-05-22 11:32:37 +10:00
Rohan Mitchell	c2f762d570	Enterprise user can only see relationships involving their enterprises	2014-05-22 11:27:19 +10:00
Rohan Mitchell	06955a024f	Enterprise user can only create relationships with their own enterprises as parent	2014-05-22 11:02:03 +10:00
Will Marshall	67e72f4504	Setting up after_login redirects	2014-05-22 10:42:44 +10:00
Rohan Mitchell	48a7b9c3f8	Fix specs from 'X permits Y' table format change	2014-05-22 08:50:52 +10:00
Rohan Mitchell	5d0680234d	Admin can delete enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	b9a9937541	Attempting to create a relationship with invalid data shows an error message	2014-05-21 11:29:11 +10:00
Rohan Mitchell	9b2a80c6b5	Admin can create enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5f4e4ebeb0	Admin can list enterprise relationships	2014-05-21 11:29:11 +10:00
Will Marshall	685ba3f63a	Fixing my modal and the tests	2014-05-20 12:18:28 +10:00
Will Marshall	61cf35a5b9	Adding attr_accessors and paperclip file uploads	2014-05-20 12:18:28 +10:00
Will Marshall	0958602418	Starting on migrations and admin forms	2014-05-20 12:18:27 +10:00
Rob H	fd6f4d04df	Merge branch 'master' into ent-makeover	2014-05-15 17:05:05 +10:00
Will Marshall	da95df5ab3	patching one dud spec	2014-05-15 15:41:01 +10:00
Rob H	7cdfb4bab2	Add methods and fees to sidebar on enterprise edit page	2014-05-15 14:52:19 +10:00
Rohan Mitchell	a2205d3f93	Make order cycles spec consistent	2014-05-14 15:50:25 +10:00
Rob H	31334be615	Tidy up of new dashboard, add 'CREATE NEW' button at top right	2014-05-14 11:31:42 +10:00
Will Marshall	5b2e9e9c30	Final set of regression issues	2014-05-09 16:43:57 +10:00
Will Marshall	573d479e08	Fixing test regressions	2014-05-09 16:43:57 +10:00
Will Marshall	631bef223c	Refactoring checkout test	2014-05-09 16:42:51 +10:00
Will Marshall	f25617dde7	Tweaks for laura, reworking authentication workflow, tidying up checkout	2014-05-09 16:42:51 +10:00
Will Marshall	9903e42811	Adding reset password stuff	2014-05-09 14:26:07 +10:00
Will Marshall	1297520051	Authentication steps test	2014-05-09 14:13:39 +10:00
Will Marshall	c52457505e	Fixing issues with offcanvas	2014-05-09 12:18:05 +10:00
Will Marshall	1e6783148d	Merging	2014-05-09 10:16:26 +10:00
Will Marshall	05f5e5562f	Adding menu helper, removing admin path	2014-05-09 10:05:09 +10:00
Will Marshall	3b1fcca39b	Splitting out the accordion stuff for checkout	2014-05-09 09:56:54 +10:00
Rohan Mitchell	87b605b604	Remove specific default_wait_time setting in BOM - this value is globally increased in spec_helper	2014-05-09 08:55:44 +10:00
Will Marshall	998fb07330	Splitting out the accordion stuff for checkout	2014-05-08 16:07:56 +10:00
Rob H	169d5669f1	Amend specs	2014-05-07 13:34:47 +10:00
Rob H	dcf048d631	Merge branch 'temp' into ng-cleanup	2014-05-07 13:08:13 +10:00
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +10:00
Rob H	2e7cf612d6	Fix broken BOM spec	2014-05-07 12:30:06 +10:00
Will Marshall	549b41d6fe	Patching a spec issue with occlusion	2014-05-06 18:28:55 +10:00
Will Marshall	1e7e1a3127	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork ... Conflicts: spec/features/consumer/shopping/checkout_spec.rb	2014-05-02 16:12:41 +10:00
Rohan Mitchell	901c9abe38	Increase wait time for failing spec	2014-05-02 15:39:17 +10:00
Will Marshall	bbb70342b3	Merging	2014-05-02 15:35:43 +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