Skip to content

Commit 75d4c62

Browse files
author
CI bot
committed
Merge remote-tracking branch 'remotes/dev/6.0' into 6.0
2 parents 192d9bc + e580f2c commit 75d4c62

7 files changed

+2762
-1758
lines changed

LICENSE

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
OroCommerce
2-
31
The Open Software License version 3.0
42

5-
Copyright (c) 2015 - 2017, Oro, Inc.
3+
Copyright (c) 2024 Oro Inc.
64

7-
Full license is at: http://opensource.org/licenses/OSL-3.0
5+
Full license is at: http://opensource.org/licenses/OSL-3.0

UPGRADE.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ This file includes only the most important items that should be addressed before
44

55
Please also refer to [CHANGELOG.md](CHANGELOG.md) for a list of significant changes in the code that may affect the upgrade of some customizations.
66

7+
### UNRELEASED (6.0.4)
8+
9+
In addition to the existing YAML-based checkout workflows, a service-based implementation has been added. To switch to the new implementation, set the DI parameter `oro_checkout.use_transition_services` to `true` and reload the workflow definitions with the command `oro:workflow:definitions:load`. YAML-based checkouts are still fully functional and can be used. The service-based implementation should be preferred to simplify checkout customizations and maintainability.
10+
711
### 5.1.0 RC
812

913
Added `.env-app` files support and removed most of the parameters from the config/parameters.yml in favor of environment variables with DSNs. For more details, see [the migration guide](https://doc.oroinc.com/master/backend/setup/dev-environment/env-vars/).

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"authors": [
66
{
77
"name": "Oro, Inc",
8-
"homepage": "https://www.orocommerce.com"
8+
"homepage": "https://oroinc.com/"
99
}
1010
],
1111
"autoload": {
@@ -20,7 +20,7 @@
2020
"repositories": {
2121
"composer": {
2222
"type": "composer",
23-
"url": "https://packagist.orocrm.com"
23+
"url": "https://packagist.oroinc.com"
2424
}
2525
},
2626
"require": {

dev.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"authors": [
66
{
77
"name": "Oro, Inc",
8-
"homepage": "https://www.orocommerce.com"
8+
"homepage": "https://oroinc.com/"
99
}
1010
],
1111
"autoload": {
@@ -237,7 +237,7 @@
237237
},
238238
{
239239
"type": "composer",
240-
"url": "https://packagist.orocrm.com"
240+
"url": "https://packagist.oroinc.com"
241241
}
242242
]
243243
}

0 commit comments

Comments
 (0)