raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-20 00:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 15 Branches 453 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

21845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristina Lim
c3d4288692 Fix translation for closed/closes in subscription update modal 2019-05-07 14:52:03 +08:00
Syed Usama Amer
f71df770d0 added social links 2019-05-06 23:28:14 -05:00
Maikel Linke
38c9ecd44f Update pricing copy for Australian business model 2019-05-07 14:24:31 +10:00
Maikel Linke
0cf964e1bd Update About URL 2019-05-07 11:23:48 +10:00
Matt-Yorkley
6a8a67560b Fix API authentication 2019-05-07 00:36:08 +01:00
Matt-Yorkley
6bdc5d4438 Fix maps performance 2019-05-07 00:36:08 +01:00
Pau Perez
f940397781 Test empty variants_attrs in bulk_update 
This covers the scenario we saw in
https://app.bugsnag.com/katuma/katuma/errors/5cd0595bece0b7001984f64c?event_id=5cd0595b0038be3b070d0000&i=sk&m=nw.
There is some other context we might be missing that makes it not
possible to reproduce.

I guess then, that this is an isolated case that does not prevent us
from deploying v2.0.0.
 2019-05-06 22:23:37 +02:00
dependabot[bot]
010953cc6b Bump deface from 1.0.0 to 1.0.2 
Bumps [deface](https://github.com/spree/deface) from 1.0.0 to 1.0.2.
- [Release notes](https://github.com/spree/deface/releases)
- [Changelog](https://github.com/spree/deface/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/spree/deface/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 19:16:37 +00:00
Kristina Lim
56bc497fe2 Simplify code for enterprise serializer for OCs 2019-05-06 23:49:55 +08:00
lin-d-hop
7b87e609c4 Set master variant price in products controller 
Set master variant price in products controller

Code climate tidy up

Syntax improvement

Revert "Remove non-functional Price field from Edit Product screen"

This reverts commit 585072302c.

Syntax improvement

fixing revert

Revert "Remove non-functional Price field from Edit Product screen"

This reverts commit 585072302c.

fixing conflicts
 2019-05-06 14:20:01 +01:00
Transifex-Openfoodnetwork
0e954e50d8 Updating translations for config/locales/nb.yml 2019-05-06 21:35:17 +10:00
Kristina Lim
7593168341 Update code style for Enterpise.not_ready_for_checkout 
This was changed into multiple lines for readability.
 2019-05-06 18:37:28 +08:00
Kristina Lim
c0a5bcce92 Update some comments in Enterprise and OrderCycle models 2019-05-06 18:35:01 +08:00
Kristina Lim
4430c88a95 Eager-load some data for admin order cycle pages 2019-05-06 15:41:29 +08:00
Kristina Lim
f14e7e97b1 Do not check need to warn of invalid OCs unless request is HTML 2019-05-06 15:41:29 +08:00
Kristina Lim
781afc1015 Change OC :suppliers and :distributors to associations 2019-05-06 13:43:44 +10:00
Kristina Lim
71bff0dd5b Reduce the number of queries in Enterprise.not_ready_for_checkout 2019-05-06 13:43:44 +10:00
lin-d-hop
10fba9b39f Add translation to order cycle spinner 
lazy text
 2019-05-05 19:12:53 +01:00
lin-d-hop
585072302c Remove non-functional Price field from Edit Product screen 
Update initializer to override Product Price as required field.

Revert "Update initializer to override Product Price as required field."

This reverts commit 1bfca09c5cf9245fbc3d30a23e9d80ac545adcf5.
 2019-05-05 16:41:54 +01:00
Matt-Yorkley
3323ac7650 Fix duplicate error messages 2019-05-05 13:30:38 +01:00
Pau Pérez Fabregat
b443f5ece9 Merge pull request #3789 from hughbric/remove_payment_enterprise_id_refs 
references to payment_enterprise_id removed, new migration created
 2019-05-05 12:30:19 +01:00
Matt-yorkley
bc349faf8c Fix on_hand failure 2019-05-05 12:00:46 +01:00
Matt-Yorkley
c04c54ebf6 Refactor importer setup and fix shipping_category usage 2019-05-05 12:00:46 +01:00
Matt-Yorkley
fd31a76fba Test shipping_category presence validation 2019-05-05 12:00:46 +01:00
Matt-Yorkley
dee9521f77 shipping_category now required for products 2019-05-05 12:00:46 +01:00
Luis Ramos
17f126d80c Merge pull request #3788 from stveep/3249-display-name-on-edit-variant-page 
Add display_name and display_as to admin edit variant page
 2019-05-05 11:31:27 +01:00
jazzdragon
37d15a1be3 Add classes to indicate collapsible is for medium screens or smaller 2019-05-04 20:12:12 -07:00
jazzdragon
623471290e Make sure styling doesn't get messed up if resizing down and back up 2019-05-04 19:52:08 -07:00
jazzdragon
a876f81f0a Make collapsible always visible on large screen 2019-05-04 19:48:30 -07:00
jazzdragon
271330d2fc Add collapsible elements and styles 2019-05-04 19:43:46 -07:00
stveep
7090281da5 Reorganise defaces so that display name fields come first 2019-05-04 21:48:32 +01:00
Pau Pérez Fabregat
958b144948 Merge pull request #3787 from eelcodevlieger/issue_3777-Make_all_map_icons_green 
issue 3777 - Make all map icons green
 2019-05-04 19:54:02 +02:00
Pau Pérez Fabregat
e3d9cab02b Merge pull request #3785 from kkoomin/3687-missing-translation-on-demand 
changed string into translation key & add 'infinity' key
 2019-05-04 19:01:39 +02:00
stveep
a959702905 Add display_name and display_as to admin edit variant page 2019-05-04 17:20:12 +01:00
Michael Hughes
9e56198092 references to payment_enterprise_id removed, new migration created 2019-05-04 16:32:48 +01:00
Eelco de Vlieger
4b2114c1e4 issue 3777 - Make all map icons green 2019-05-04 14:44:16 +01:00
kkoomin
f65ce82778 changed string into translation key & add 'infinity' key 2019-05-04 14:40:45 +01:00
Luis Ramos
6f0d155508 Merge pull request #3742 from openfoodfoundation/2-0-stable 
Merge 2-0-stable to master
 2019-05-04 00:06:27 +01:00
Luis Ramos
4afa0cdca1 Merge pull request #3589 from kristinalim/fix/2788-ship_address_changed 
2788 [Subscriptions] Fix address issues when syncing subscriptions and orders
 2019-05-03 23:48:32 +01:00
Luis Ramos
4f0930b77c Merge pull request #3717 from luisramos0/2-0-update-aws-sdk 
[Spree Upgrade] Update to spree revision that depends on aws-sdk 1.11.1
 2019-05-03 23:47:30 +01:00
luisramos0
53788625db Update to spree revision that depends on aws-sdk 1.11.1 making ofn gemfile.lock compatile with ofn/spree 2-0-4 gemspec 2019-05-03 13:16:25 +01:00
Luis Ramos
22a60e4fa9 Merge pull request #3769 from amers185/fix_rebase_error 
Closes translation bug for enterprise fee settings
v1.31.0 		2019-05-03 12:53:52 +01:00
luisramos0
d7596b4066 Merge branch 'master' into fix_rebase_error 2019-05-03 12:10:57 +01:00
Pau Pérez Fabregat
969d3e863a Merge pull request #3768 from luisramos0/2-0-fix-on-demand 
[Spree Upgrade] Migrate spree_variants.on_demand to spree_stock_items.backorderable
 2019-05-03 10:52:16 +02:00
Luis Ramos
637e99367d Merge pull request #3747 from luisramos0/2-0-vo-ctrl-bug 
[Spree Upgrade] Fix bug in Variant Overrides controller
 2019-05-02 17:31:13 +01:00
luisramos0
4a9570b1a1 Merge branch '2-0-stable' into fix/2788-ship_address_changed 2019-05-02 16:17:53 +01:00
Luis Ramos
3b2e614c57 Merge pull request #3734 from luisramos0/2-0-validate-distribution 
Removing a variant from OC will prevent user with that variant in the cart from checking out
 2019-05-02 16:12:41 +01:00
Pau Pérez Fabregat
046d6ebdfc Merge pull request #3771 from luisramos0/2-0-stable-May2 
[Spree Upgrade] LAST merge master into 2-0-stable 🎉
 2019-05-02 14:26:24 +02:00
luisramos0
85cf4fa3e6 Merge branch 'master' into 2-0-stable-May2 2019-05-02 11:27:53 +01:00
Luis Ramos
edaf2479dc Merge pull request #3741 from luisramos0/2-0-stable-Apr15 
[Spree Upgrade] Merging master into 2-0-stable (1st run in Apr2019)
 2019-05-02 11:26:54 +01:00