raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,954 Commits 18 Branches 453 Tags
5a5cbbd3181a71494de522c287a165950e9f98aa
Commit Graph

2244 Commits

Author SHA1 Message Date
Will Marshall
99d743f7cf Some very basic specs 2014-04-18 16:35:06 +10:00
Will Marshall
66d5f08b99 Adding custom filtering to home page 2014-04-18 15:17:12 +10:00
Will Marshall
6753b96f29 Adding darkswarm variant of home page, getting Angular skeleton into place, taking shit off window 2014-04-18 13:01:36 +10:00
Will Marshall
c6395a686a Adding flash notifications 2014-04-17 15:08:01 +10:00
Rob H
1b5080ceb4 Remove render 2014-04-17 12:28:28 +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
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
aa1c28b163 Move enterprises api controller out of spree namespace 2014-04-11 19:08:55 +10:00
Will Marshall
6e35dc7168 Merging with master 2014-04-11 13:09:22 +10:00
Rob H
e114aecfd0 Merge branch 'master' into bom 2014-04-10 16:30:13 +10:00
Will Marshall
36a4e34dff Preprocessing order attributes, returning path 2014-04-09 15:04:17 +10:00
Rohan Mitchell
19ca8e142a Do not show deleted products on shopfront 2014-04-09 15:02:40 +10:00
Will Marshall
b5550c048a Starting on JSON checkout, moving Order properties to Order.order 2014-04-09 14:33:45 +10:00
Will Marshall
8a45b6c012 Removing nothing special text and patching change password form slightly more 2014-04-08 18:07:55 +10:00
Will Marshall
4447730505 Removing nothing special text and patching change password form slightly more 2014-04-07 14:52:01 +10:00
Rob H
8e54bf1e2e Enterprise users are aurthorised to view BOM 2014-04-04 09:11:56 +11:00
Will Marshall
5d36dc5b4f Moving User Account to darkswarm 2014-03-28 16:02:32 +11:00
Will Marshall
12b1a1b0e9 Switching our recover password form to Darkswarm 2014-03-28 16:02:31 +11:00
Will Marshall
e48a25983a Starting a working forgot password system 2014-03-27 15:11:11 +11:00
Will Marshall
2be9ad7dd0 Starting with our own passwords controller 2014-03-27 13:52:02 +11:00
Will Marshall
40d1563cd9 Adding our own user registrations controller, reworking sidebar a touch 2014-03-21 15:18:27 +11:00
Will Marshall
74fb266748 Adding some requirement filters to the Orders controller 2014-03-21 15:18:27 +11:00
Rohan Mitchell
638e922ae2 Do not allow customer to purchase the obsolete master of a product 2014-03-20 10:56:46 +11:00
Will Marshall
51b6ac3e68 Fixing one regression bug 2014-03-18 17:03:09 +11:00
Will Marshall
49789c865e No longer copying old ship address from pickup, adding phone to custom shipping address 2014-03-18 16:47:28 +11:00
Will Marshall
0cc108206b Reworking the top details so it works in all pages 2014-03-14 17:06:03 +11:00
Will Marshall
a954f2c21a Basic Darkswarm version of the Order Confirmation page 2014-03-14 16:11:40 +11:00
Will Marshall
dc95d764fe Fixing some edge cases in the addresses 2014-03-14 11:56:25 +11:00
Will Marshall
3370865a01 Adding group siblings to the shop page 2014-03-13 14:50:06 +11:00
Will Marshall
9c655a855e Redirecting to the shop page when a distributor is selected 2014-03-13 11:47:55 +11:00
Will Marshall
451e76b33f Tweaking our paypal express plumbing further 2014-03-07 15:27:52 +11:00
Will Marshall
40c986892e Patching the paypal test 2014-03-07 15:18:26 +11:00
Will Marshall
df435c0a38 Adding Paypal plumbing 2014-03-07 15:10:20 +11:00
Will Marshall
5790392430 Bypassing the stage check on the Paypal callbacks 2014-03-07 14:10:49 +11:00
Will Marshall
84955d3647 Merging master 2014-03-06 16:53:03 +11:00
Will Marshall
d677116ea3 Overring before_address to conform to our new checkout as necessary 2014-03-06 16:24:08 +11:00
Rob H
200e3fef77 Merge branch 'master' into bom 2014-03-06 12:52:36 +11:00
Rohan Mitchell
637ccc113b Do not show products that have no stock available to the current distribution 2014-03-05 13:54:02 +11:00
Rohan Mitchell
ec6f70c145 On product list view, only show variants that are a member of the current order cycle 2014-03-05 13:54:02 +11:00
Rob H
fc65eefcfd Add basic order cycle API 2014-03-05 12:00:26 +11:00
Will Marshall
b5019f12b4 Fixing up a couple of bugs introduced to the old step workflow 2014-03-04 15:07:00 +11:00
Will Marshall
1d5addb06e Patching up our checkout flow so we don't try to create shipments before we have valid shipping addresses 2014-02-28 13:41:02 +11:00
Will Marshall
86a8b926f3 Adding conditions to the autopopulator for shipping address 2014-02-28 11:53:45 +11:00
Will Marshall
3db601f362 Merge branch 'master' into checkout 2014-02-27 16:29:21 +11:00
Will Marshall
d6c71d5416 Fixing a nil bug in the referrer handling on login 2014-02-27 16:24:10 +11:00
Will Marshall
19fa7200f3 Fixing the login redirection issue 2014-02-27 14:47:56 +11:00