raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,534 Commits 18 Branches 451 Tags
86dee82acbba966ef799e00aadce0077f2fd2b43
Commit Graph

300 Commits

Author SHA1 Message Date
Will Marshall
c69a4a5f1a Adding social media links 2014-05-22 12:12:10 +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
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
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
f25617dde7 Tweaks for laura, reworking authentication workflow, tidying up checkout 2014-05-09 16:42:51 +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
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
bbb70342b3 Merging 2014-05-02 15:35:43 +10:00
Rob H
ceada3596b Merge master into cleanup 2014-05-02 14:43:06 +10:00
Rohan Mitchell
1d5f0042d4 Remove sleeps - these should be covered by increased capybara wait time now 2014-05-02 14:25:32 +10:00
Rohan Mitchell
930bc2b7ce Set increased Capybara.default_wait_time globally 2014-05-02 14:25:32 +10:00
Rohan Mitchell
c9aefa507a Remove chili 2014-05-02 14:25:32 +10:00
Will Marshall
705e247eb8 Tweaking the bulk order management spec again 2014-05-02 12:41:04 +10:00
Will Marshall
8c319334db Cleaning out the spree auth stuff 2014-05-02 12:34:19 +10:00
Will Marshall
d7f8d2f5c7 Reworking some broken tests 2014-04-29 15:13:59 +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
Rohan Mitchell
91d9b546d2 Merge branch 'foreign-keys' 2014-04-25 16:06:54 +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
d16d970952 BPE uses soft-delete 2014-04-24 13:20:16 +10:00
Rob H
2e51518b5b CMS spec being weird 2014-04-24 11:28:53 +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
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
Rob H
20a5278a75 Merge branch 'master' into bom 2014-04-17 09:23:08 +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
Rob H
e114aecfd0 Merge branch 'master' into bom 2014-04-10 16:30:13 +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
Rohan Mitchell
e792107d7b Make order cycle specs more robust 2014-04-09 15:02:40 +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