Skip to content

Commit c9cdcb1

Browse files
committed
Merge branch 'b-6.5.x' into b-7.0.x
# Conflicts: # CHANGELOG.md # CONTRIBUTING.md # composer.json
2 parents 347fe13 + e0669f9 commit c9cdcb1

File tree

7 files changed

+308
-1355
lines changed

7 files changed

+308
-1355
lines changed

CHANGELOG.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
469469
- [PR-834](https://github.com/OXID-eSales/oxideshop_ce/pull/834)
470470
- [PR-842](https://github.com/OXID-eSales/oxideshop_ce/pull/842)
471471

472-
## [6.12.0] - Unreleased
472+
## [6.12.0] - 2022-08-15
473+
474+
### Changed
475+
- Change OXID eShop Community Edition license
473476

474477
### Deprecated
475478
- Classes:
@@ -1656,8 +1659,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
16561659

16571660
## [6.0-beta.1] - 2016-11-30
16581661

1659-
[7.0.0-rc.1]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.11.0...v7.0.0-rc.1
1660-
[6.12.0]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.11.0...b-6.5.x
1662+
[7.0.0-rc.1]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.12.0...v7.0.0-rc.1
1663+
[6.12.0]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.11.0...v6.12.0
16611664
[6.11.0]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.10.3...v6.11.0
16621665
[6.10.3]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.10.2...v6.10.3
16631666
[6.10.2]: https://github.com/OXID-eSales/oxideshop_ce/compare/v6.10.1...v6.10.2

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Getting involved
22

3-
OXID eShop is available under two different licenses, GPLv3 and a commercial license.
3+
OXID eShop is available under two different licenses, OXID Community License and a commercial license.
44

55
That's why, before contributing for the first time, you must <a href="https://cla-assistant.io/OXID-eSales/oxideshop_ce">sign the Contributor License Agreement</a>.
66
You can find more information about it on the FAQ page OXID Contribution and Contributor Agreement FAQ:

LICENSE

+149-674
Large diffs are not rendered by default.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This repository contains the sources of OXID eShop Community Edition Core Compon
1010

1111
### About OXID eShop:
1212

13-
OXID eShop is a flexible open source e-commerce software with a wide range of functionalities.
13+
OXID eShop is a flexible e-commerce software with a wide range of functionalities.
1414
Thanks to its modular, modern and state-of-the-art architecture, it can be modified, expanded
1515
and customized to individual requirements with the greatest of ease.
1616

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "oxid-esales/oxideshop-ce",
33
"description": "This package contains OXID eShop CE source code.",
4-
"license": "GPL-3.0-only",
54
"type": "oxideshop",
65
"keywords": [
76
"oxid",
87
"modules",
98
"eShop"
109
],
1110
"homepage": "https://www.oxid-esales.com/en/home.html",
11+
"license": "SEE LICENSE IN LICENSE.md",
1212
"require": {
1313
"php": "^8.0",
1414
"ext-dom": "*",

source/COPYING

+149-674
Large diffs are not rendered by default.

source/Setup/Sql/initial_data.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ INSERT INTO `oxcontents` (`OXID`, `OXLOADID`, `OXSHOPID`, `OXSNIPPET`, `OXTYPE`,
160160
('ad542e4999ec01dd3.07214049', 'oxnewsletterplainemail', 1, 1, 0, 1, 1, '', 'Newsletter eShop Plain', '[{ $shop->oxshops__oxname->getRawValue() }] Newsletter Hallo, [{ $user->oxuser__oxsal->value|oxmultilangsal }] [{ $user->oxuser__oxfname->getRawValue() }] [{ $user->oxuser__oxlname->getRawValue() }], vielen Dank für Ihre Anmeldung zu unserem Newsletter. Um den Newsletter freizuschalten klicken Sie bitte auf folgenden Link: [{$subscribeLink}] Ihr [{ $shop->oxshops__oxname->getRawValue() }] Team', 'newsletter confirmation plain', '[{ $shop->oxshops__oxname->getRawValue() }] Newsletter \r\n\r\nHello, [{ $user->oxuser__oxsal->value|oxmultilangsal }] [{ $user->oxuser__oxfname->getRawValue() }] [{ $user->oxuser__oxlname->getRawValue() }], \r\n\r\nthank you for your newsletter subscription. For final registration, please click on this link: \r\n[{$subscribeLink}] \r\n\r\nYour [{ $shop->oxshops__oxname->getRawValue() }] Team', 1, '', '', 1, '', '', '30e44ab83fdee7564.23264141', 'CMSFOLDER_EMAILS', ''),
161161
('f41427a10afab8641.52768563', 'oxnewstlerinfo', 1, 1, 0, 1, 1, '', 'Neuigkeiten bei uns', '<div>Mit dem [{ $oxcmp_shop->oxshops__oxname->value }]-Newsletter alle paar Wochen. <br>\r\nMit Tipps, Infos, Aktionen ... <br>\r\n<br>\r\nDas Abo kann jederzeit durch Austragen der E-Mail-Adresse beendet werden. <br>\r\nEine <span class="newsletter_title">Weitergabe Ihrer Daten an Dritte lehnen wir ab</span>. <br>\r\n<br>\r\nSie bekommen zur Bestätigung nach dem Abonnement eine E-Mail - so stellen wir sicher, dass kein Unbefugter Sie in unseren Newsletter eintragen kann (sog. "Double Opt-In").<br>\r\n<br>\r\n</div>', 'newsletter info', '<p>Stay in touch with the periodic [{ $oxcmp_shop->oxshops__oxname->value }]-newsletter every couple of weeks. We gladly inform you about recent tips, promotions and new products.</p>\r\n<p>You can unsubscribe any time from the newsletter.</p>\r\n<p>We strictly refuse <span class="newsletter_title">transferring your data to 3rd parties</span>.</p>\r\n<p>For subscription we use the so called &quot;double opt-in&quot; procedure to guarantee that no unauthorized person will register with your e-mail address.</p>', 1, '', '', 1, '', '', '30e44ab83fdee7564.23264141', 'CMSFOLDER_USERINFO', ''),
162162
('1074279e67a85f5b1.96907412', 'oxorderinfo', 1, 1, 0, 1, 1, '', 'Wie bestellen?', '<div>Beispieltext:</div>\r\n<div> </div>\r\n<div>[{ $oxcmp_shop->oxshops__oxname->value }], Ihr Online-Shop für ... <br />\r\n<br />\r\nBei uns haben Sie die Wahl aus mehr als ... Artikeln von bester Qualität und namhaften Herstellern. Schauen Sie sich um, stöbern Sie in unseren Angeboten! <br />\r\n[{ $oxcmp_shop->oxshops__oxname->value }] steht Ihnen im Internet rund um die Uhr und 7 Tage die Woche offen.<br />\r\n<br />\r\nWenn Sie eine Bestellung aufgeben möchten, können Sie das:\r\n<ul>\r\n<li class="font11">direkt im Internet über unseren Shop </li>\r\n<li class="font11">per Fax unter [{ $oxcmp_shop->oxshops__oxtelefax->value }] </li>\r\n<li class="font11">per Telefon unter [{ $oxcmp_shop->oxshops__oxtelefon->value }] </li>\r\n<li class="font11">oder per E-Mail unter <a href="mailto:[{ $oxcmp_shop->oxshops__oxowneremail->value }]?subject=Bestellung"><strong>[{ $oxcmp_shop->oxshops__oxowneremail->value }]</strong></a> </li></ul>Telefonisch sind wir für Sie <br />\r\nMontag bis Freitag von 10 bis 18 Uhr erreichbar. <br />\r\nWenn Sie auf der Suche nach einem Artikel sind, der zum Sortiment von [{ $oxcmp_shop->oxshops__oxname->value }] passen könnte, ihn aber nirgends finden, lassen Sie es uns wissen. Gern bemühen wir uns um eine Lösung für Sie. <br />\r\n<br />\r\nSchreiben Sie an <a href="mailto:[{ $oxcmp_shop->oxshops__oxowneremail->value }]?subject=Produktidee"><strong>[{ $oxcmp_shop->oxshops__oxowneremail->value }]</strong></a>.</div>', 'How to order?', '<h1>Text Example</h1>\r\n<h2>[{ $oxcmp_shop->oxshops__oxname->value }], your online store for ...</h2>\r\n<p>With us, you can choose from more than ... products of high quality and reputable manufacturers. Take a look around and browse through our offers!<br />\r\nOn the internet [{ $oxcmp_shop->oxshops__oxname->value }] is open 24/7.</p>\r\n<p>If you want to place an order you can purchase</p>\r\n<ul>\r\n<li class="font11">via our online store</li>\r\n<li class="font11">via fax [{ $oxcmp_shop->oxshops__oxtelefax->value }] </li>\r\n<li class="font11">via telephone [{ $oxcmp_shop->oxshops__oxtelefon->value }] </li>\r\n<li class="font11">or via e-mail <a href="mailto:[{ $oxcmp_shop->oxshops__oxowneremail->value }]?subject=Order"><strong>[{ $oxcmp_shop->oxshops__oxowneremail->value }]</strong></a></li></ul>\r\n<p>By telephone, we are available<br />\r\nMonday to Friday 10 AM thru 6 PM. </p>\r\n<p>If you are looking for an item that did not match the range of [{ $oxcmp_shop->oxshops__oxname->value }], let''s us know. We are happy to find a solution for you.</p>\r\n<p>Write to <a href="mailto:[{ $oxcmp_shop->oxshops__oxowneremail->value }]?subject=Product idea"><strong>[{ $oxcmp_shop->oxshops__oxowneremail->value }]</strong></a></p>', 1, '', '', 1, '', '', '30e44ab83fdee7564.23264141', 'CMSFOLDER_USERINFO', ''),
163-
('67c5bcf75ee346bd9566bce6c8', 'oxcredits', 1, 0, 3, 0, 1, '', 'Credits', '', 'Credits', '<h3>What is OXID eShop?</h3>\r\n<p>OXID eShop is a proven and flexible shopping cart software. Thousands of online businesses worldwide use its extensive functionality to create optimal e-commerce solutions. With its modular, state-of-the-art and standards-based architecture, customization is very easy. OXID eShop is being developed by <a href="http://www.oxid-esales.com">OXID eSales AG</a>, the trusted Open Source e-commerce company.</p>\r\n<h3>OXID eShop Community Edition</h3>\r\n<p>The Community Edition of OXID eShop is distributed under the terms and conditions of the GNU General Public License version 3 (GPLv3). Briefly summarized, the GPL gives you the right to use, modify and share this copy of OXID eShop. If you choose to share OXID eShop, you may only share it under the terms and conditions of the GPL. If you share a modified version of OXID eShop, these modifications must also be placed under the GPL. Read the complete <a href="http://www.gnu.org/licenses/gpl.txt">legal terms and conditions of the GPL</a> or see <a href="http://www.oxid-esales.com/en/products/community-edition/gpl-v3-faq">OXID''s GPLv3 FAQ</a>.</p>\r\n<h3>OXID eShop Professional and Enterprise Edition</h3>\r\n<p>These OXID eShop editions are distributed under OXID Commercial Licenses. For more information, please <a href="http://www.oxid-esales.com/en/company/about-oxid-esales/contact">contact OXID eSales</a>.</p>\r\n<h3>Third-party Software</h3>\r\n<p>This product includes certain free/open source software. A <a href="http://www.oxid-esales.com/en/company/about-oxid-esales/third-party-licenses">complete list of third-party software included in OXID eShop</a> is publicly available.</p>\r\n<h3>Copyright Notice</h3>\r\n<p>Copyright © <a href="http://www.oxid-esales.com">OXID eSales AG</a>, with portions copyright by other parties.</p>\r\n\r\n\r\n\r\n\r\n\r\n<h3>List of Contributions</h3>\r\n<ul>\r\n <li><b>Downloadable Products</b>\r\n <br>contributed by <a href="http://www.marmalade.de" target="_blank">marmalade.de</a>\r\n </li>\r\n\r\n\r\n <li><b>Rich Snippets: RDFa + GoodRelations</b>\r\n <br/>contributed by Daniel Bingel and Prof. Dr. Hepp <a href="http://www.heppnetz.de/projects/goodrelations/" target="_blank">(GoodRelations)</a>.\r\n </li>\r\n\r\n\r\n <li><b>GitHub contributions</b><br>\r\n please visit <a href="https://github.com/OXID-eSales" target="_blank">the GihHub page of OXID eSales AG</a> to find the list of contributors.\r\n</li> \r\n\r\n\r\n</ul>', 1, '', '', 0, '', '', '30e44ab83fdee7564.23264141', 'CMSFOLDER_USERINFO', ''),
163+
('67c5bcf75ee346bd9566bce6c8', 'oxcredits', 1, 0, 3, 0, 1, '', 'Credits', '', 'Credits', 'Please add your text here.', 1, '', '', 0, '', '', '30e44ab83fdee7564.23264141', 'CMSFOLDER_USERINFO', ''),
164164
('ad542e49d6de4a4f4.88594616', 'oxordersendemail', 1, 1, 0, 1, 1, '', 'Ihre Bestellung wurde versandt', 'Guten Tag, [{ $order->oxorder__oxbillsal->value|oxmultilangsal }] [{ $order->oxorder__oxbillfname->value }] [{ $order->oxorder__oxbilllname->value }],<br>\r\n<br>\r\nunser Vertriebszentrum hat soeben folgende Artikel versandt.<br>\r\n<br>', 'your order has been shipped', 'Hello [{ $order->oxorder__oxbillsal->value|oxmultilangsal }] [{ $order->oxorder__oxbillfname->value }] [{ $order->oxorder__oxbilllname->value }],<br />\r\n<br />\r\n<p>\r\nour distribution center just shipped this product:</p><br />', 1, '', '', 1, '', '', '30e44ab83fdee7564.23264141', 'CMSFOLDER_EMAILS', ''),
165165
('ad542e49d856b5b68.98220446', 'oxordersendplainemail', 1, 1, 0, 1, 1, '', 'Ihre Bestellung wurde versandt Plain', 'Guten Tag [{ $order->oxorder__oxbillsal->value|oxmultilangsal }] [{ $order->oxorder__oxbillfname->getRawValue() }] [{ $order->oxorder__oxbilllname->getRawValue() }],\r\n\r\nunser Vertriebszentrum hat soeben folgende Artikel versandt.', 'your order has been shipped plain', '<p>Hello [{ $order->oxorder__oxbillsal->value|oxmultilangsal }] [{ $order->oxorder__oxbillfname->getRawValue() }] [{ $order->oxorder__oxbilllname->getRawValue() }],\r\n\r\nour distribution center just shipped this product:</p>', 1, '', '', 1, '', '', '30e44ab83fdee7564.23264141', 'CMSFOLDER_EMAILS', ''),
166166
('ad542e49c585394e4.36951640', 'oxpricealarmemail', 1, 1, 0, 1, 1, '', 'Wunschpreis', 'Wunschpreis im [{ $shop->oxshops__oxname->value }]!<br>\r\n<br>\r\n[{ $email }] bietet für Artikel [{ $product->oxarticles__oxtitle->value }], Artnum. [{ $product->oxarticles__oxartnum->value }]<br>\r\n<br>\r\nOriginalpreis: [{ $product->getFPrice() }] [{ $currency->name}]<br>\r\nGEBOTEN: [{ $bidprice }] [{ $currency->name}]<br>\r\n<br>\r\n<br>\r\nIhr Shop.<br>', 'wished price', 'Wished price at [{ $shop->oxshops__oxname->value }]!<br>\r\n<br>\r\n[{ $email }] bids for product [{ $product->oxarticles__oxtitle->value }], product # [{ $product->oxarticles__oxartnum->value }]<br>\r\n<br>\r\nOriginal price: [{ $currency->name}][{ $product->getFPrice() }]<br>\r\nBid: [{ $currency->name}][{ $bidprice }]<br>\r\n<br>\r\n<br>\r\nYour store<br>', 1, '', '', 1, '', '', '30e44ab83fdee7564.23264141', 'CMSFOLDER_EMAILS', ''),

0 commit comments

Comments
 (0)