asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: merge develop

Browse Source
This commit is contained in:
Sebastian Rindom
2021-04-13 12:16:40 +02:00
parent a468c451e8
commit 2982a8e682
19 changed files with 0 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/medusa-file-spaces/package.json
View File

@@ -40,11 +40,7 @@
"aws-sdk": "^2.710.0", "aws-sdk": "^2.710.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
<<<<<<< HEAD
"medusa-core-utils": "^1.1.4",
=======
"medusa-core-utils": "^1.1.5", "medusa-core-utils": "^1.1.5",
>>>>>>> origin/develop
"medusa-test-utils": "^1.1.8", "medusa-test-utils": "^1.1.8",
"stripe": "^8.50.0" "stripe": "^8.50.0"
}, },

6
packages/medusa-fulfillment-webshipper/CHANGELOG.md
View File

@@ -3,7 +3,6 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.7...medusa-fulfillment-webshipper@1.1.8) (2021-04-13) ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.7...medusa-fulfillment-webshipper@1.1.8) (2021-04-13)
@@ -15,11 +14,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
### Features ### Features
* adds support for certificate of origin ([f21dae8](https://github.com/medusajs/medusa/commit/f21dae827ad64522fd1f4d6317740c6b0ded0536)) * adds support for certificate of origin ([f21dae8](https://github.com/medusajs/medusa/commit/f21dae827ad64522fd1f4d6317740c6b0ded0536))
=======
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-fulfillment-webshipper@1.1.7...medusa-fulfillment-webshipper@1.1.8) (2021-04-09)
**Note:** Version bump only for package medusa-fulfillment-webshipper
>>>>>>> origin/develop

4
packages/medusa-payment-adyen/CHANGELOG.md
View File

@@ -3,11 +3,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-payment-adyen@1.1.7...medusa-payment-adyen@1.1.8) (2021-04-13) ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-payment-adyen@1.1.7...medusa-payment-adyen@1.1.8) (2021-04-13)
=======
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-payment-adyen@1.1.7...medusa-payment-adyen@1.1.8) (2021-04-09)
>>>>>>> origin/develop
**Note:** Version bump only for package medusa-payment-adyen **Note:** Version bump only for package medusa-payment-adyen

4
packages/medusa-payment-klarna/CHANGELOG.md
View File

@@ -3,11 +3,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.8...medusa-payment-klarna@1.1.9) (2021-04-13) ## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.8...medusa-payment-klarna@1.1.9) (2021-04-13)
=======
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-payment-klarna@1.1.8...medusa-payment-klarna@1.1.9) (2021-04-09)
>>>>>>> origin/develop
### Bug Fixes ### Bug Fixes

4
packages/medusa-payment-klarna/package.json
View File

@@ -40,11 +40,7 @@
"axios": "^0.21.0", "axios": "^0.21.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
<<<<<<< HEAD
"medusa-core-utils": "^1.1.4",
=======
"medusa-core-utils": "^1.1.5", "medusa-core-utils": "^1.1.5",
>>>>>>> origin/develop
"medusa-test-utils": "^1.1.8" "medusa-test-utils": "^1.1.8"
}, },
"gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c" "gitHead": "d78a7ce85876e0bfd9a4bfebe4f5743921961e9c"

4
packages/medusa-plugin-add-ons/CHANGELOG.md
View File

@@ -3,11 +3,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-add-ons@1.1.7...medusa-plugin-add-ons@1.1.8) (2021-04-13) ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-add-ons@1.1.7...medusa-plugin-add-ons@1.1.8) (2021-04-13)
=======
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-add-ons@1.1.7...medusa-plugin-add-ons@1.1.8) (2021-04-09)
>>>>>>> origin/develop
**Note:** Version bump only for package medusa-plugin-add-ons **Note:** Version bump only for package medusa-plugin-add-ons

6
packages/medusa-plugin-brightpearl/CHANGELOG.md
View File

@@ -3,7 +3,6 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.11](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.10...medusa-plugin-brightpearl@1.1.11) (2021-04-13) ## [1.1.11](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.10...medusa-plugin-brightpearl@1.1.11) (2021-04-13)
@@ -11,11 +10,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
* bp swaps ([e105d4e](https://github.com/medusajs/medusa/commit/e105d4edde5793f40e867291606b3db5e44dc24f)) * bp swaps ([e105d4e](https://github.com/medusajs/medusa/commit/e105d4edde5793f40e867291606b3db5e44dc24f))
* typo ([37ab52b](https://github.com/medusajs/medusa/commit/37ab52b19514fb1dfd864f0c218efd7ad205ff30)) * typo ([37ab52b](https://github.com/medusajs/medusa/commit/37ab52b19514fb1dfd864f0c218efd7ad205ff30))
=======
## [1.1.11](https://github.com/medusajs/medusa/compare/medusa-plugin-brightpearl@1.1.10...medusa-plugin-brightpearl@1.1.11) (2021-04-09)
**Note:** Version bump only for package medusa-plugin-brightpearl
>>>>>>> origin/develop

4
packages/medusa-plugin-contentful/CHANGELOG.md
View File

@@ -3,11 +3,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.8...medusa-plugin-contentful@1.1.9) (2021-04-13) ## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.8...medusa-plugin-contentful@1.1.9) (2021-04-13)
=======
## [1.1.9](https://github.com/medusajs/medusa/compare/medusa-plugin-contentful@1.1.8...medusa-plugin-contentful@1.1.9) (2021-04-09)
>>>>>>> origin/develop
### Bug Fixes ### Bug Fixes

4
packages/medusa-plugin-contentful/package.json
View File

@@ -39,11 +39,7 @@
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"contentful-management": "^5.27.1", "contentful-management": "^5.27.1",
"express": "^4.17.1", "express": "^4.17.1",
<<<<<<< HEAD
"medusa-core-utils": "^1.1.4",
=======
"medusa-core-utils": "^1.1.5", "medusa-core-utils": "^1.1.5",
>>>>>>> origin/develop
"medusa-test-utils": "^1.1.8", "medusa-test-utils": "^1.1.8",
"redis": "^3.0.2" "redis": "^3.0.2"
}, },

4
packages/medusa-plugin-economic/CHANGELOG.md
View File

@@ -3,11 +3,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.7...medusa-plugin-economic@1.1.8) (2021-04-13) ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.7...medusa-plugin-economic@1.1.8) (2021-04-13)
=======
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-economic@1.1.7...medusa-plugin-economic@1.1.8) (2021-04-09)
>>>>>>> origin/develop
**Note:** Version bump only for package medusa-plugin-economic **Note:** Version bump only for package medusa-plugin-economic

4
packages/medusa-plugin-economic/package.json
View File

@@ -39,11 +39,7 @@
"axios": "^0.19.2", "axios": "^0.19.2",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
<<<<<<< HEAD
"medusa-core-utils": "^1.1.4",
=======
"medusa-core-utils": "^1.1.5", "medusa-core-utils": "^1.1.5",
>>>>>>> origin/develop
"medusa-test-utils": "^1.1.8", "medusa-test-utils": "^1.1.8",
"moment": "^2.27.0" "moment": "^2.27.0"
}, },

4
packages/medusa-plugin-mailchimp/CHANGELOG.md
View File

@@ -3,11 +3,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.7...medusa-plugin-mailchimp@1.1.8) (2021-04-13) ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.7...medusa-plugin-mailchimp@1.1.8) (2021-04-13)
=======
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-mailchimp@1.1.7...medusa-plugin-mailchimp@1.1.8) (2021-04-09)
>>>>>>> origin/develop
**Note:** Version bump only for package medusa-plugin-mailchimp **Note:** Version bump only for package medusa-plugin-mailchimp

4
packages/medusa-plugin-mailchimp/package.json
View File

@@ -40,11 +40,7 @@
"cors": "^2.8.5", "cors": "^2.8.5",
"express": "^4.17.1", "express": "^4.17.1",
"mailchimp-api-v3": "^1.14.0", "mailchimp-api-v3": "^1.14.0",
<<<<<<< HEAD
"medusa-core-utils": "^1.1.4",
=======
"medusa-core-utils": "^1.1.5", "medusa-core-utils": "^1.1.5",
>>>>>>> origin/develop
"medusa-test-utils": "^1.1.8" "medusa-test-utils": "^1.1.8"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"

4
packages/medusa-plugin-permissions/CHANGELOG.md
View File

@@ -3,11 +3,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-permissions@1.1.7...medusa-plugin-permissions@1.1.8) (2021-04-13) ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-permissions@1.1.7...medusa-plugin-permissions@1.1.8) (2021-04-13)
=======
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-permissions@1.1.7...medusa-plugin-permissions@1.1.8) (2021-04-09)
>>>>>>> origin/develop
**Note:** Version bump only for package medusa-plugin-permissions **Note:** Version bump only for package medusa-plugin-permissions

4
packages/medusa-plugin-permissions/package.json
View File

@@ -32,11 +32,7 @@
"medusa-interfaces": "1.x" "medusa-interfaces": "1.x"
}, },
"dependencies": { "dependencies": {
<<<<<<< HEAD
"medusa-core-utils": "^1.1.4",
=======
"medusa-core-utils": "^1.1.5", "medusa-core-utils": "^1.1.5",
>>>>>>> origin/develop
"medusa-test-utils": "^1.1.8", "medusa-test-utils": "^1.1.8",
"mongoose": "^5.8.0" "mongoose": "^5.8.0"
}, },

4
packages/medusa-plugin-twilio-sms/CHANGELOG.md
View File

@@ -3,11 +3,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.7...medusa-plugin-twilio-sms@1.1.8) (2021-04-13) ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.7...medusa-plugin-twilio-sms@1.1.8) (2021-04-13)
=======
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-twilio-sms@1.1.7...medusa-plugin-twilio-sms@1.1.8) (2021-04-09)
>>>>>>> origin/develop
**Note:** Version bump only for package medusa-plugin-twilio-sms **Note:** Version bump only for package medusa-plugin-twilio-sms

4
packages/medusa-plugin-twilio-sms/package.json
View File

@@ -35,11 +35,7 @@
"dependencies": { "dependencies": {
"@babel/plugin-transform-classes": "^7.9.5", "@babel/plugin-transform-classes": "^7.9.5",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
<<<<<<< HEAD
"medusa-core-utils": "^1.1.4",
=======
"medusa-core-utils": "^1.1.5", "medusa-core-utils": "^1.1.5",
>>>>>>> origin/develop
"medusa-test-utils": "^1.1.8", "medusa-test-utils": "^1.1.8",
"twilio": "^3.49.1" "twilio": "^3.49.1"
}, },

4
packages/medusa-plugin-wishlist/CHANGELOG.md
View File

@@ -3,11 +3,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<<<<<<< HEAD
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-wishlist@1.1.7...medusa-plugin-wishlist@1.1.8) (2021-04-13) ## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-wishlist@1.1.7...medusa-plugin-wishlist@1.1.8) (2021-04-13)
=======
## [1.1.8](https://github.com/medusajs/medusa/compare/medusa-plugin-wishlist@1.1.7...medusa-plugin-wishlist@1.1.8) (2021-04-09)
>>>>>>> origin/develop
**Note:** Version bump only for package medusa-plugin-wishlist **Note:** Version bump only for package medusa-plugin-wishlist

4
packages/medusa-plugin-wishlist/package.json
View File

@@ -37,11 +37,7 @@
"dependencies": { "dependencies": {
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"express": "^4.17.1", "express": "^4.17.1",
<<<<<<< HEAD
"medusa-core-utils": "^1.1.4",
=======
"medusa-core-utils": "^1.1.5", "medusa-core-utils": "^1.1.5",
>>>>>>> origin/develop
"medusa-test-utils": "^1.1.8" "medusa-test-utils": "^1.1.8"
}, },
"gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd" "gitHead": "0646bd395a6056657cb0aa93c13699c4a9dbbcdd"