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
12,629 Commits 18 Branches 453 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

8189 Commits

Author SHA1 Message Date
Rohan Mitchell
ef3155a16a Pull product listing fee calculations out of serializer loop 2015-06-04 16:27:32 +10:00
Continuous Integration
6051c81959 Auto-merge from CI [skip ci] 2015-06-04 15:39:43 +10:00
Rohan Mitchell
27bc28ffa4 Index variants by id 2015-06-04 12:09:34 +10:00
Rohan Mitchell
85d1d67dac Sort orders as required by spec, fixes intermittent fail 2015-06-04 09:43:36 +10:00
Continuous Integration
a1425c5e07 Auto-merge from CI [skip ci] 2015-06-04 07:22:43 +10:00
Maikel Linke
5d77a48ef3 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into show-order-without-current-distributor 2015-06-03 20:36:12 +10:00
Rob Harrington
e93736b123 Ordering managed orders by id to fix spec 2015-06-03 18:16:07 +08:00
Rob Harrington
359328a96e Producers and distributors lists include self where appropriate 2015-06-03 16:18:44 +08:00
Rob Harrington
dbd81e60a1 Fixing customer index feature spec, only checking shop when something has been selected 2015-06-03 16:18:09 +08:00
Rob Harrington
7c9b4dbc3e Resolving unmerged section in bulk order management template 2015-06-03 15:33:04 +08:00
Rob Harrington
439d122e93 Merge branch 'master' into customers 
Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	db/schema.rb
	spec/javascripts/unit/bulk_order_management_spec.js.coffee
 2015-06-03 15:19:40 +08:00
Maikel Linke
d2a61dc096 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text 2015-06-03 16:37:25 +10:00
Rohan Mitchell
0569ef0505 Only record analytics in production. Also record them in admin backend. 2015-06-03 16:36:31 +10:00
Rohan Mitchell
17d123db63 ng-cloak producers page 2015-06-03 16:28:43 +10:00
Rohan Mitchell
41b348f594 Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak 2015-06-03 15:05:51 +10:00
Rohan Mitchell
8afffdae9a Fix error when product does not have a master variant 2015-06-03 12:13:42 +10:00
Rohan Mitchell
22230294ab Merge branch 'master' into optimise-shopfront 2015-06-03 10:07:42 +10:00
Maikel Linke
2853885f26 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text 2015-06-03 09:47:37 +10:00
Liv Galendez
db19303f1a Added asterisk to new field Owner since it seems to be required also 2015-06-02 18:23:41 +10:00
Liv Galendez
2c22d4e774 Merge https://github.com/openfoodfoundation/openfoodnetwork into indicate-required-fields-for-new-enterprise-form 2015-06-02 18:11:17 +10:00
Liv Galendez
5fe31e6333 Added asterisks to required fields in new enterprise creation form. 2015-06-02 18:03:16 +10:00
Rohan Mitchell
fee854a3f8 Merge branch 'master' into redesign 2015-05-29 17:37:18 +10:00
Rohan Mitchell
e3085d9224 Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails 2015-05-29 17:36:56 +10:00
Rohan Mitchell
3dbc2e0382 Merge branch 'master' into folklabs-producer-emails 2015-05-29 17:36:11 +10:00
Rohan Mitchell
a22da1ae51 Merge branch 'ng-cloak' into combined/bulk-product-edit-and-ng-cloak 2015-05-29 16:54:01 +10:00
Maikel Linke
159b33e2db Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit 2015-05-29 16:52:18 +10:00
Maikel Linke
0d3cdb9c69 Expand All button to show all variants in BPE 2015-05-29 16:51:55 +10:00
Rohan Mitchell
5c3a59acab ng-cloak order cycles selector, tabs and shopfront 2015-05-29 16:39:41 +10:00
Rohan Mitchell
50ae331d94 ng-cloak mobile menu 2015-05-29 16:03:16 +10:00
Maikel Linke
fe27b1d446 text changes to the registration wizard 2015-05-29 15:24:17 +10:00
Rohan Mitchell
6f513fee77 Merge branch 'master' into redesign 2015-05-29 15:20:21 +10:00
Rohan Mitchell
7f73a4cc9b Fix column/row mixup 2015-05-29 15:19:35 +10:00
Maikel Linke
503b687ed1 Display distributor banner only if current_distributor is present 2015-05-29 15:19:05 +10:00
Rohan Mitchell
952353da8c Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit 
Conflicts:
	spec/features/admin/bulk_product_update_spec.rb
 2015-05-29 15:08:30 +10:00
Rohan Mitchell
e5b3736e86 Merge branch 'single-order-patches' into combined/single-order-patches-and-bulk-product-edit 2015-05-29 14:36:51 +10:00
Continuous Integration
c14de4e97f Auto-merge from CI [skip ci] 2015-05-29 14:29:23 +10:00
Rohan Mitchell
d478cc1f69 Serialize taxons and relatives in expected format 2015-05-29 14:03:44 +10:00
Continuous Integration
dccc9fb479 Auto-merge from CI [skip ci] 2015-05-29 12:44:44 +10:00
Rohan Mitchell
3f4f8afacd EnterpriseRelationship.relatives does not show duplicates 2015-05-29 12:19:38 +10:00
Rohan Mitchell
69c54e1d70 Only load activated relatives for EnterpriseInjectionData 2015-05-29 12:08:21 +10:00
Rohan Mitchell
cdbf02ca20 EnterpriseRelationship.relatives can find activated enterprises only 2015-05-29 12:07:43 +10:00
Rohan Mitchell
4ce9ea05f0 Merge branch 'master' into require_standard_variant 2015-05-29 10:12:14 +10:00
Rohan Mitchell
c75e14b383 Small edits 2015-05-29 09:55:40 +10:00
Rohan Mitchell
32b140ac88 Revert "Update group signup header copy" 
This reverts commit 0a8bfdb872.
 2015-05-29 09:54:09 +10:00
Rohan Mitchell
7486daa2a3 Merge branch 'master' into require_standard_variant 
Conflicts:
	spec/controllers/spree/admin/variants_controller_spec.rb
	spec/lib/open_food_network/permissions_spec.rb
	spec/lib/open_food_network/products_and_inventory_report_spec.rb
	spec/models/enterprise_spec.rb
 2015-05-28 15:08:13 +10:00
Rohan Mitchell
8a79741c0e Update pricing tables and detail formatting 2015-05-28 14:58:46 +10:00
Continuous Integration
1d08ae89da Auto-merge from CI [skip ci] 2015-05-28 14:31:25 +10:00
Rohan Mitchell
1cf62e01e9 Edit case study text 2015-05-28 14:27:36 +10:00
Rohan Mitchell
0a8bfdb872 Update group signup header copy 2015-05-28 14:08:58 +10:00
Rohan Mitchell
92d67327dd Add groups case studies 2015-05-28 14:07:17 +10:00