1262 Commits

Author	SHA1	Message	Date
Will Marshall	eab9c28d2e	Adding groups to this branch, also tidying up the shop stuff for Laura	2014-05-16 14:00:33 +10:00
Will Marshall	9f169e6ef8	Adding a basic stub of the primary taxon	2014-05-16 10:23:31 +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
Will Marshall	eae12da24a	Adding distributors display to producers page	2014-05-15 12:20:17 +10:00
Will Marshall	575ce9fe01	Adding producers to home and distributors to producers	2014-05-15 12:02:58 +10:00
Rohan Mitchell	a2205d3f93	Make order cycles spec consistent	2014-05-14 15:50:25 +10:00
Rohan Mitchell	6c5172c567	Add EnterpriseRelationship. An Enterprise can find its relatives.	2014-05-14 15:50:25 +10:00
Will Marshall	5f712a8984	Removing code	2014-05-14 15:16:29 +10:00
Will Marshall	151702d685	Catching order cycle expiry and redirecting	2014-05-14 11:51: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	a3b5ba2257	Adding a spec for visiblity filtering	2014-05-13 16:38:52 +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
Rohan Mitchell	5a0cc1b6db	Increase capybara default_wait_time to 30 s, now we know it's not the primary cause of spec slowdown	2014-05-09 16:39:39 +10:00
Rob H	05e01d02c4	Merge branch 'master' into ent-makeover	2014-05-09 15:58:17 +10:00
Rob H	5b54f220a0	Fix failing BOM ng-spec	2014-05-09 15:56:29 +10:00
Rob H	a0d54a4318	Fix failing BOM ng-spec	2014-05-09 15:51:22 +10:00
Rohan Mitchell	b801480024	Increase capybara default_wait_time to 30 s, now we know it's not the primary cause of spec slowdown	2014-05-09 15:09:00 +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	0df2eabf95	Moving useless assets	2014-05-09 10:32:39 +10:00
Will Marshall	1e6783148d	Merging	2014-05-09 10:16:26 +10:00
Will Marshall	d9f462ba81	Moving useless assets	2014-05-09 10:12:40 +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	4ebc22f438	Remove capybara-screenshot, which appears to have been slowing down the build dramatically	2014-05-09 08:56:10 +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
Will Marshall	d5648bd993	Removing some garbage, adding admin link	2014-05-08 11:50:57 +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
Rob H	d7b232aefd	Split dirtyProducts out into its own service	2014-05-07 11:25:09 +10:00
Rohan Mitchell	607045f858	Fix inconsistent spec fail - sorting	2014-05-07 09:27:08 +10:00
Will Marshall	1823dac694	Patching to trigger	2014-05-06 18:35:04 +10:00
Will Marshall	549b41d6fe	Patching a spec issue with occlusion	2014-05-06 18:28:55 +10:00
Will Marshall	3542799349	Removing pointless foundation crud, reworking the login	2014-05-06 18:28:20 +10:00
Will Marshall	1774bc1e19	Adding producers filtering and more Angular magic	2014-05-05 15:43:11 +10:00
Will Marshall	27728d6f0e	Adding our first request spec	2014-05-05 12:10:14 +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
Rob H	5a2a43a060	Create angularjs admin module	2014-05-02 15:56:20 +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