Merge branch '4.0' into 4.1

coreshop · Jan 20, 2025 · 28c75de · 28c75de
2 parents 69b9d56 + 6c1d106
commit 28c75de
Show file tree

Hide file tree

Showing 135 changed files with 202 additions and 202 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@coreshop.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@coreshop.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ We use GitHub issues exclusively to track all bugs and features.
 
 * [Open an issue](https://github.com/coreshop/CoreShop/issues) here on GitHub. 
 If you can, **please provide a fix and create a pull request (PR) instead**; this will automatically create an issue for you.
-* Report security issues only to info@coreshop.org 
+* Report security issues only to info@coreshop.com 
 * Please be patient as not all items will be tested immediately - remember, CoreShop is open source and free of charge. 
 * Occasionally we'll close issues if they appear stale or are too vague - please don't take this personally! 
 Please feel free to re-open issues we've closed if there's something we've missed and they still need to be addressed.

diff --git a/LICENSE.md b/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/AddressBundle/LICENSE.md b/src/CoreShop/Bundle/AddressBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/AddressBundle/composer.json b/src/CoreShop/Bundle/AddressBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/LICENSE.md b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/ConfigurationBundle/LICENSE.md b/src/CoreShop/Bundle/ConfigurationBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/ConfigurationBundle/composer.json b/src/CoreShop/Bundle/ConfigurationBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/CoreBundle/LICENSE.md b/src/CoreShop/Bundle/CoreBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/CoreBundle/composer.json b/src/CoreShop/Bundle/CoreBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/CurrencyBundle/LICENSE.md b/src/CoreShop/Bundle/CurrencyBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/CurrencyBundle/composer.json b/src/CoreShop/Bundle/CurrencyBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/CustomerBundle/LICENSE.md b/src/CoreShop/Bundle/CustomerBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/CustomerBundle/composer.json b/src/CoreShop/Bundle/CustomerBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/FrontendBundle/LICENSE.md b/src/CoreShop/Bundle/FrontendBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/views/Mail/layout.html.twig b/src/CoreShop/Bundle/FrontendBundle/Resources/views/Mail/layout.html.twig
@@ -218,8 +218,8 @@
                                                                                         Phone: +43 660 36 177 85</p>
                                                                                     <p style="color: #0a0a0a; font-family: Helvetica,Arial,sans-serif; font-weight: 400; padding: 0; margin: 0; text-align: left; margin-bottom: 10px; font-size: 16px; line-height: 1.3;">
                                                                                         Email: <a
-                                                                                                href="mailto:info@coreshop.org"
-                                                                                                style="text-decoration: none; font-family: Helvetica,Arial,sans-serif; font-weight: 400; padding: 0; margin: 0; text-align: left; line-height: 1.3; color: #2199e8;">info@coreshop.org</a>
+                                                                                                href="mailto:info@coreshop.com"
+                                                                                                style="text-decoration: none; font-family: Helvetica,Arial,sans-serif; font-weight: 400; padding: 0; margin: 0; text-align: left; line-height: 1.3; color: #2199e8;">info@coreshop.com</a>
                                                                                     </p></th>
                                                                             </tr>
                                                                         </table>

diff --git a/src/CoreShop/Bundle/FrontendBundle/composer.json b/src/CoreShop/Bundle/FrontendBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/IndexBundle/LICENSE.md b/src/CoreShop/Bundle/IndexBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/IndexBundle/composer.json b/src/CoreShop/Bundle/IndexBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/InventoryBundle/LICENSE.md b/src/CoreShop/Bundle/InventoryBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/InventoryBundle/composer.json b/src/CoreShop/Bundle/InventoryBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/LocaleBundle/LICENSE.md b/src/CoreShop/Bundle/LocaleBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/LocaleBundle/composer.json b/src/CoreShop/Bundle/LocaleBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/MenuBundle/LICENSE.md b/src/CoreShop/Bundle/MenuBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/MenuBundle/composer.json b/src/CoreShop/Bundle/MenuBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/MessengerBundle/LICENSE.md b/src/CoreShop/Bundle/MessengerBundle/LICENSE.md
@@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 Please see also (files in this directory):  
 [GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - gpl-3.0.txt](gpl-3.0.txt)  
diff --git a/src/CoreShop/Bundle/MessengerBundle/composer.json b/src/CoreShop/Bundle/MessengerBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/MoneyBundle/LICENSE.md b/src/CoreShop/Bundle/MoneyBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/MoneyBundle/composer.json b/src/CoreShop/Bundle/MoneyBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/NotificationBundle/LICENSE.md b/src/CoreShop/Bundle/NotificationBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/NotificationBundle/composer.json b/src/CoreShop/Bundle/NotificationBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/OptimisticEntityLockBundle/LICENSE.md b/src/CoreShop/Bundle/OptimisticEntityLockBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json b/src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/OrderBundle/LICENSE.md b/src/CoreShop/Bundle/OrderBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/OrderBundle/composer.json b/src/CoreShop/Bundle/OrderBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/PaymentBundle/LICENSE.md b/src/CoreShop/Bundle/PaymentBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):  

diff --git a/src/CoreShop/Bundle/PaymentBundle/composer.json b/src/CoreShop/Bundle/PaymentBundle/composer.json
@@ -12,8 +12,8 @@
   "authors": [
     {
       "name": "CoreShop Team",
-      "email": "info@coreshop.org",
-      "homepage": "https://www.coreshop.org/",
+      "email": "info@coreshop.com",
+      "homepage": "https://www.coreshop.com/",
       "role": "Developer"
     },
     {

diff --git a/src/CoreShop/Bundle/PayumBundle/LICENSE.md b/src/CoreShop/Bundle/PayumBundle/LICENSE.md
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Alternatively, commercial and supported versions of the program - also known as
 Commercial Distributions - must be used in accordance with the terms and conditions
 contained in a separate written agreement between you and CoreShop GmbH.
-For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.
+For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.com.
 
 
 Please see also (files in this directory):