raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-06 02:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,570 Commits 16 Branches 455 Tags
27e992ebcbe3cbcf2dd4e4e10f4c991f0e2a14ca
Commit Graph

100 Commits

Author SHA1 Message Date
Rob H
1abbc7fa86 Switch data injection for BPE over to AMS 2014-08-08 14:05:50 +10:00
Rohan Mitchell
19118da82e Remove old landing page cruft 2014-07-17 14:26:07 +10:00
Rohan Mitchell
159d0a9dbe Remove most references to suburbs - previously used by new_landing_page, no longer used. 2014-07-17 14:26:04 +10:00
Rohan Mitchell
aa5767cd30 Remove paypal image button from checkout, fix redirect to paypal 2014-06-27 11:52:36 +10:00
Will Marshall
64cca8cf36 Enabling map on production 2014-06-24 16:01:06 +10:00
Rohan Mitchell
84cd56cfdc Admin can list and create producer properties 2014-06-18 15:28:41 +10:00
Will Marshall
f7c71568df Merge branch 'laura_and_will' 
Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb
 2014-06-13 12:42:14 +10:00
Rohan Mitchell
9dc02e5eac Add product soft-delete API action 2014-06-12 14:59:26 +10:00
Will Marshall
75f1bf4f54 Merging in master 2014-06-10 14:53:49 +10:00
Will Marshall
c32776c6b8 Disabling maps in production 2014-06-06 14:04:47 +10:00
Will Marshall
82ab14a33e Starting on on the map 2014-06-06 14:04:45 +10:00
Will Marshall
476eeef69d Starting on on the map 2014-06-05 12:18:26 +10:00
Rohan Mitchell
aa53d82386 Add stub page for managing enterprise relationships 2014-05-21 11:29:11 +10:00
Will Marshall
df82627bd1 Starting to rework login behaviour when hitting /admin 2014-05-20 15:47:00 +10:00
Will Marshall
4e4667c33d Adding groups 2014-05-20 12:18:27 +10:00
Will Marshall
b907616749 Renaming our partials 2014-05-02 14:47:12 +10:00
Will Marshall
0f6bd7049c Starting to build out producers Angular page 2014-04-30 12:52:47 +10:00
Will Marshall
4ca148ee93 Starting on the producers controller 2014-04-30 12:05:53 +10:00
Will Marshall
c33fa03736 Merging into master 2014-04-29 10:35:05 +10:00
Will Marshall
f9b7b602da Moving from darkswarm to home 2014-04-24 16:53:00 +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
Will Marshall
16251fe5ea Merging with master 2014-04-23 14:43:39 +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
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
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
Rob H
8e54bf1e2e Enterprise users are aurthorised to view BOM 2014-04-04 09:11:56 +11:00
Will Marshall
e48a25983a Starting a working forgot password system 2014-03-27 15:11:11 +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
451e76b33f Tweaking our paypal express plumbing further 2014-03-07 15:27:52 +11:00
Rob H
fc65eefcfd Add basic order cycle API 2014-03-05 12:00:26 +11:00
Will Marshall
6a861de1e1 Reworking the checkout form some more 2014-02-18 14:50:50 +11:00
Will Marshall
5c498735b0 Moving from new to edit 2014-02-14 14:26:31 +11:00
Will Marshall
b11533a629 Renaming ShopController to Shop::ShopController 2014-02-07 16:52:18 +11:00
Will Marshall
26e4adf7a6 Adding the routes, controller, new action and some tests 2014-02-07 13:53:36 +11:00
Rob H
4e9ae7549e Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page 2014-01-16 13:20:07 +08:00
Will Marshall
4d03f65766 Reworking everything to use RABL 2014-01-07 15:06:47 +11:00
Will Marshall
4db8f755bf Getting an order cycle update function in place like a boss 2013-12-11 12:42:02 +11:00
Will Marshall
63dfa0b696 Getting the test framework set up for Angular, setting up a products fetch stub 2013-12-06 15:24:42 +11:00
Will Marshall
4543e08872 Renaming everything to Shop 2013-12-05 13:40:05 +11:00
Will Marshall
9efd7c2d69 Getting the darkswarm build flow up and running. Like a boss 2013-12-04 13:09:30 +11:00
Will Marshall
b3bf3a8378 Adding the plumbing for Customers reports, and one tiny refactor to products 2013-11-22 14:56:57 +11:00
Will Marshall
5772fa9589 Boilerplate for the new Product and Inventory report, sans any functionality 2013-11-20 10:34:18 +11:00
Rohan Mitchell
27b8c4508f Split product distribution editing into its own admin page 2013-11-13 15:22:17 +11:00
Rohan Mitchell
647e1d196c Position enterprise groups 2013-10-30 14:46:49 +11:00
Rohan Mitchell
a6fa73ec13 List enterprise groups 2013-10-30 10:42:32 +11:00
Rohan Mitchell
89f93cae77 Rename namespaced includes from open_food_web to open_food_network 2013-10-18 17:43:18 +11:00