Merge branch 'hotfix/2.2.2'

isotope · Feb 10, 2015 · 7b6f965 · 7b6f965
2 parents 4eba2c5 + 4a3be0c
commit 7b6f965
Show file tree

Hide file tree

Showing 40 changed files with 165 additions and 60 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,4 +29,4 @@ install:
     - cp test/fixtures/travis/localconfig.php ../../config/localconfig.php
     - cp test/fixtures/travis/pathconfig.php ../../config/pathconfig.php
 
-script: phpunit --configuration test/phpunit.xml
+script: phpunit --configuration test/phpunit.xml --bootstrap test/bootstrap.php ./test
diff --git a/system/modules/isotope/assets/css/backend.css b/system/modules/isotope/assets/css/backend.css
@@ -254,6 +254,11 @@ table.multicolumnwizard .operations {
 }
 .iso_listing_container td.col_images {
     height: 50px;
+    text-align: center;
+}
+
+.iso_listing_container td.col_images img {
+    float: none;
 }
 
 .tl_listing_container .col_order_status {

diff --git a/system/modules/isotope/assets/css/backend.min.css b/system/modules/isotope/assets/css/backend.min.css
diff --git a/system/modules/isotope/dca/tl_module.php b/system/modules/isotope/dca/tl_module.php
@@ -29,7 +29,7 @@
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_orderhistory']             = '{title_legend},name,headline,type;{config_legend},iso_config_ids;{redirect_legend},jumpTo;{template_legend},customTpl,iso_includeMessages;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_orderdetails']             = '{title_legend},name,headline,type;{config_legend},iso_loginRequired;{template_legend},customTpl,iso_collectionTpl,iso_orderCollectionBy,iso_gallery,iso_includeMessages;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_configswitcher']           = '{title_legend},name,headline,type;{config_legend},iso_config_ids;{template_legend},customTpl,iso_includeMessages;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
-$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_productfilter']            = '{title_legend},name,headline,type;{config_legend},iso_category_scope,iso_list_where,iso_enableLimit,iso_filterFields,iso_filterHideSingle,iso_searchFields,iso_searchAutocomplete,iso_sortingFields,iso_listingSortField,iso_listingSortDirection;{template_legend},customTpl,iso_filterTpl,iso_includeMessages,iso_hide_list;{redirect_legend},jumpTo;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
+$GLOBALS['TL_DCA']['tl_module']['palettes']['iso_productfilter']            = '{title_legend},name,headline,type;{config_legend},iso_category_scope,iso_list_where,iso_enableLimit,iso_filterFields,iso_filterHideSingle,iso_searchFields,iso_searchAutocomplete,iso_sortingFields,iso_listingSortField,iso_listingSortDirection;{template_legend},customTpl,iso_filterTpl,iso_includeMessages,iso_hide_list;{redirect_legend},jumpTo;{reference_legend:hide},defineRoot;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_cumulativefilter']         = '{title_legend},name,headline,type;{config_legend},iso_filterFields,iso_filterHideSingle;{template_legend},customTpl,navigationTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_addressbook']              = '{title_legend},name,headline,type;{config_legend},nc_notification;{template_legend},customTpl,memberTpl,tableless,iso_includeMessages;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
 $GLOBALS['TL_DCA']['tl_module']['palettes']['iso_relatedproducts']          = '{title_legend},name,headline,type;{config_legend},iso_related_categories,numberOfItems,perPage;{redirect_legend},iso_addProductJumpTo;{template_legend:hide},customTpl,iso_list_layout,iso_gallery,iso_cols,iso_use_quantity,iso_includeMessages,iso_emptyMessage,iso_buttons;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';

diff --git a/system/modules/isotope/docs/CHANGELOG-2.1.md b/system/modules/isotope/docs/CHANGELOG-2.1.md
@@ -1,6 +1,20 @@
 Isotope eCommerce Changelog
 ===========================
 
+Version 2.1.11-stable (2015-02-10)
+----------------------------------
+
+### Improved
+- Setting for "reference page" was not visible in the product filter module
+- Product group popup does no longer apply the active group filter
+
+### Fixed
+- Composer installer could not find namespace class loader dependency
+- Taxes for shipping address were not applied before checkout
+- Gallery only included the last JavaScript template on AJAX request (#1357)
+- Possible message when product has no price attribute (#1353)
+
+
 Version 2.1.10-stable (2015-01-13)
 ----------------------------------
 

diff --git a/system/modules/isotope/docs/CHANGELOG-2.2.md b/system/modules/isotope/docs/CHANGELOG-2.2.md
@@ -1,6 +1,17 @@
 Isotope eCommerce Changelog
 ===========================
 
+Version 2.2.2-stable (2015-02-10)
+---------------------------------
+
+### Improved
+- Backend product images are resized proportionally instead of cropped
+
+### Fixed
+- Product filter did not support attribute options from foreignKey
+- Product links did not always point to pages in the current root (#1346)
+
+
 Version 2.2.1-stable (2015-01-20)
 ---------------------------------
 

diff --git a/system/modules/isotope/languages/de/default.php b/system/modules/isotope/languages/de/default.php
@@ -170,7 +170,7 @@
 $GLOBALS['TL_LANG']['MSC']['timePeriod']['years'] = 'Jahre';
 $GLOBALS['TL_LANG']['MSC']['isotopeIntroductionLegend'] = 'Einführung';
 $GLOBALS['TL_LANG']['MSC']['isotopeIntroduction'][0] = 'Willkommen zu Isotope eCommerce';
-$GLOBALS['TL_LANG']['MSC']['isotopeIntroduction'][1] = 'Isotope ist die prämierte Open Source eCommerce Lösung für Contao.';
+$GLOBALS['TL_LANG']['MSC']['isotopeIntroduction'][1] = 'Isotope ist die führende Open Source eCommerce Lösung für Contao.';
 $GLOBALS['TL_LANG']['MSC']['isotopeIntroduction'][2] = 'Auf dieser Seite werden die meisten Einstellungen vorgenommen. <strong>Sie sollten am Ende der Seite starten und sich Schritt für Schritt von rechts unten nach links oben arbeiten.</strong>';
 $GLOBALS['TL_LANG']['MSC']['isotopeIntroduction'][3] = 'Besuchen Sie die offizielle <a href="http://isotopeecommerce.org" target="_blank">Isotope eCommerce Website</a> für aktuelle News, Konfigurationsanleitungen und unsere Spendenkampagnen. Vielen Dank dass Sie uns etwas zurückgeben!';
 $GLOBALS['TL_LANG']['MSC']['isotopeIntroduction'][4] = 'Das Isotope eCommerce Team';

diff --git a/system/modules/isotope/languages/de/tl_iso_attribute_option.php b/system/modules/isotope/languages/de/tl_iso_attribute_option.php
@@ -24,7 +24,17 @@
 $GLOBALS['TL_LANG']['tl_iso_attribute_option']['price'][0] = 'Preisaufschläge oder -abschläge';
 $GLOBALS['TL_LANG']['tl_iso_attribute_option']['price_short'][0] = 'Preis';
 $GLOBALS['TL_LANG']['tl_iso_attribute_option']['published'][0] = 'Veröffentlicht';
+$GLOBALS['TL_LANG']['tl_iso_attribute_option']['published'][1] = 'Diese Option im Produkt verfügbar machen.';
 $GLOBALS['TL_LANG']['tl_iso_attribute_option']['new'][0] = 'Neue Option';
+$GLOBALS['TL_LANG']['tl_iso_attribute_option']['new'][1] = 'Neue Option erstellen.';
+$GLOBALS['TL_LANG']['tl_iso_attribute_option']['edit'][0] = 'Option bearbeiten';
+$GLOBALS['TL_LANG']['tl_iso_attribute_option']['edit'][1] = 'Option ID %s bearbeiten.';
+$GLOBALS['TL_LANG']['tl_iso_attribute_option']['copy'][0] = 'Option kopieren';
+$GLOBALS['TL_LANG']['tl_iso_attribute_option']['copy'][1] = 'Option ID %s kopieren.';
+$GLOBALS['TL_LANG']['tl_iso_attribute_option']['delete'][0] = 'Option löschen';
+$GLOBALS['TL_LANG']['tl_iso_attribute_option']['delete'][1] = 'Option ID %s löschen.';
+$GLOBALS['TL_LANG']['tl_iso_attribute_option']['show'][0] = 'Option-Details';
+$GLOBALS['TL_LANG']['tl_iso_attribute_option']['show'][1] = 'Details der Option ID %s anzeigen.';
 $GLOBALS['TL_LANG']['tl_iso_attribute_option']['label_legend'] = 'Typ und Beschriftung';
 $GLOBALS['TL_LANG']['tl_iso_attribute_option']['price_legend'] = 'Preisänderung';
 $GLOBALS['TL_LANG']['tl_iso_attribute_option']['publish_legend'] = 'Veröffentlichung';
diff --git a/system/modules/isotope/languages/de/tl_iso_gallery.php b/system/modules/isotope/languages/de/tl_iso_gallery.php
@@ -42,6 +42,8 @@
 $GLOBALS['TL_LANG']['tl_iso_gallery']['lightbox_watermark_image'][1] = 'Wählen Sie ein Bild aus, wenn Sie den Lightboxbildern ein Wasserzeichen hinzufügen wollen.';
 $GLOBALS['TL_LANG']['tl_iso_gallery']['lightbox_watermark_position'][0] = 'Lightboxbild-Wasserzeichen-Position';
 $GLOBALS['TL_LANG']['tl_iso_gallery']['lightbox_watermark_position'][1] = 'Wählen Sie die Position für das Wasserzeichen aus.';
+$GLOBALS['TL_LANG']['tl_iso_gallery']['customTpl'][0] = 'Eigenes Galerie-Template';
+$GLOBALS['TL_LANG']['tl_iso_gallery']['customTpl'][1] = 'Hier können Sie das Standard Galerie-Template überschreiben.';
 $GLOBALS['TL_LANG']['tl_iso_gallery']['new'][0] = 'Neue Galerie';
 $GLOBALS['TL_LANG']['tl_iso_gallery']['new'][1] = 'Neue Galerie erstellen';
 $GLOBALS['TL_LANG']['tl_iso_gallery']['edit'][0] = 'Galerie bearbeiten';
@@ -55,6 +57,8 @@
 $GLOBALS['TL_LANG']['tl_iso_gallery']['name_legend'] = 'Name & Typ';
 $GLOBALS['TL_LANG']['tl_iso_gallery']['size_legend'] = 'Bildgrößen';
 $GLOBALS['TL_LANG']['tl_iso_gallery']['watermark_legend'] = 'Wasserzeichen';
+$GLOBALS['TL_LANG']['tl_iso_gallery']['lightbox_legend'] = 'Lightbox/Mediabox';
+$GLOBALS['TL_LANG']['tl_iso_gallery']['template_legend'] = 'Template-Einstellungen';
 $GLOBALS['TL_LANG']['tl_iso_gallery']['none'] = 'Keine Link-Aktion';
 $GLOBALS['TL_LANG']['tl_iso_gallery']['reader'] = 'Link zu den Produktdetails';
 $GLOBALS['TL_LANG']['tl_iso_gallery']['lightbox'] = 'Lightbox/Mediabox öffnen';