Skip to content

Commit

Permalink
Merge branch 'release/2.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
aschempp committed Dec 21, 2016
2 parents b4414ff + 791f6a0 commit 9c59472
Show file tree
Hide file tree
Showing 1,660 changed files with 129,402 additions and 73,099 deletions.
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# Do not ignore ".gitignore"
!.gitignore
!.tx
.tx/config
.tx/source/*
!README.md
!composer.json
!.scrutinizer.yml
Expand All @@ -22,3 +20,8 @@ system/drivers/*
!system/modules
system/modules/*
!system/modules/isotope*

# Gulp and node modules
!gulpfile.js
!package.json
node_modules/
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ language: php
php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1

env:
- CONTAO_VERSION="3.5.*"
Expand All @@ -10,14 +13,12 @@ sudo: false

install:
- mysql -e 'CREATE DATABASE isotope_core_testsuite;'
- composer self-update
- composer update
- composer update --ignore-platform-reqs
- composer create-project -s dev contao/core:${CONTAO_VERSION} contao
- cp -R system/modules/isotope contao/system/modules/isotope
- cp -R system/modules/isotope_reports contao/system/modules/isotope_reports
- cp -R system/modules/isotope_rules contao/system/modules/isotope_rules
- cp -R vendor/terminal42/contao-conditionalselectmenu contao/system/modules/conditionalselectmenu
- cp -R vendor/terminal42/contao-namespace-class-loader contao/system/modules/_autoload
- cp -R vendor/terminal42/dcawizard contao/system/modules/dcawizard
- cp -R vendor/codefog/contao-haste contao/system/modules/haste
- cp -R vendor/menatwork/contao-multicolumnwizard contao/system/modules/multicolumnwizard
Expand All @@ -29,5 +30,6 @@ install:
- cp test/fixtures/travis/langconfig.php ../../config/langconfig.php
- cp test/fixtures/travis/localconfig.php ../../config/localconfig.php
- cp test/fixtures/travis/pathconfig.php ../../config/pathconfig.php
- cd test

script: phpunit --configuration test/phpunit.xml --bootstrap test/bootstrap.php ./test
script: phpunit
223 changes: 223 additions & 0 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
[main]
host = https://www.transifex.com
type = XLIFF

[isotope.v2_4-isotope-default]
source_file = system/modules/isotope/languages/en/default.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/default.xlf

[isotope.v2_4-isotope-exception]
source_file = system/modules/isotope/languages/en/exception.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/exception.xlf

[isotope.v2_4-isotope-explain]
source_file = system/modules/isotope/languages/en/explain.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/explain.xlf

[isotope.v2_4-isotope-iso_upgrade]
source_file = system/modules/isotope/languages/en/iso_upgrade.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/iso_upgrade.xlf

[isotope.v2_4-isotope-modules]
source_file = system/modules/isotope/languages/en/modules.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/modules.xlf

[isotope.v2_4-isotope-tl_iso_address]
source_file = system/modules/isotope/languages/en/tl_iso_address.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_address.xlf

[isotope.v2_4-isotope-tl_iso_attribute]
source_file = system/modules/isotope/languages/en/tl_iso_attribute.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_attribute.xlf

[isotope.v2_4-isotope-tl_iso_attribute_option]
source_file = system/modules/isotope/languages/en/tl_iso_attribute_option.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_attribute_option.xlf

[isotope.v2_4-isotope-tl_iso_baseprice]
source_file = system/modules/isotope/languages/en/tl_iso_baseprice.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_baseprice.xlf

[isotope.v2_4-isotope-tl_iso_config]
source_file = system/modules/isotope/languages/en/tl_iso_config.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_config.xlf

[isotope.v2_4-isotope-tl_iso_document]
source_file = system/modules/isotope/languages/en/tl_iso_document.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_document.xlf

[isotope.v2_4-isotope-tl_iso_download]
source_file = system/modules/isotope/languages/en/tl_iso_download.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_download.xlf

[isotope.v2_4-isotope-tl_iso_gallery]
source_file = system/modules/isotope/languages/en/tl_iso_gallery.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_gallery.xlf

[isotope.v2_4-isotope-tl_iso_group]
source_file = system/modules/isotope/languages/en/tl_iso_group.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_group.xlf

[isotope.v2_4-isotope-tl_iso_integrity]
source_file = system/modules/isotope/languages/en/tl_iso_integrity.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_integrity.xlf

[isotope.v2_4-isotope-tl_iso_label]
source_file = system/modules/isotope/languages/en/tl_iso_label.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_label.xlf

[isotope.v2_4-isotope-tl_iso_orderstatus]
source_file = system/modules/isotope/languages/en/tl_iso_orderstatus.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_orderstatus.xlf

[isotope.v2_4-isotope-tl_iso_payment]
source_file = system/modules/isotope/languages/en/tl_iso_payment.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_payment.xlf

[isotope.v2_4-isotope-tl_iso_product]
source_file = system/modules/isotope/languages/en/tl_iso_product.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_product.xlf

[isotope.v2_4-isotope-tl_iso_product_category]
source_file = system/modules/isotope/languages/en/tl_iso_product_category.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_product_category.xlf

[isotope.v2_4-isotope-tl_iso_product_collection]
source_file = system/modules/isotope/languages/en/tl_iso_product_collection.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_product_collection.xlf

[isotope.v2_4-isotope-tl_iso_product_price]
source_file = system/modules/isotope/languages/en/tl_iso_product_price.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_product_price.xlf

[isotope.v2_4-isotope-tl_iso_producttype]
source_file = system/modules/isotope/languages/en/tl_iso_producttype.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_producttype.xlf

[isotope.v2_4-isotope-tl_iso_related_category]
source_file = system/modules/isotope/languages/en/tl_iso_related_category.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_related_category.xlf

[isotope.v2_4-isotope-tl_iso_related_product]
source_file = system/modules/isotope/languages/en/tl_iso_related_product.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_related_product.xlf

[isotope.v2_4-isotope-tl_iso_shipping]
source_file = system/modules/isotope/languages/en/tl_iso_shipping.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_shipping.xlf

[isotope.v2_4-isotope-tl_iso_tax_class]
source_file = system/modules/isotope/languages/en/tl_iso_tax_class.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_tax_class.xlf

[isotope.v2_4-isotope-tl_iso_tax_rate]
source_file = system/modules/isotope/languages/en/tl_iso_tax_rate.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_iso_tax_rate.xlf

[isotope.v2_4-isotope-tl_maintenance]
source_file = system/modules/isotope/languages/en/tl_maintenance.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_maintenance.xlf

[isotope.v2_4-isotope-tl_member]
source_file = system/modules/isotope/languages/en/tl_member.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_member.xlf

[isotope.v2_4-isotope-tl_module]
source_file = system/modules/isotope/languages/en/tl_module.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_module.xlf

[isotope.v2_4-isotope-tl_nc_notification]
source_file = system/modules/isotope/languages/en/tl_nc_notification.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_nc_notification.xlf

[isotope.v2_4-isotope-tl_page]
source_file = system/modules/isotope/languages/en/tl_page.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_page.xlf

[isotope.v2_4-isotope-tl_settings]
source_file = system/modules/isotope/languages/en/tl_settings.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_settings.xlf

[isotope.v2_4-isotope-tl_user]
source_file = system/modules/isotope/languages/en/tl_user.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_user.xlf

[isotope.v2_4-isotope-tl_user_group]
source_file = system/modules/isotope/languages/en/tl_user_group.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tl_user_group.xlf

[isotope.v2_4-isotope-tokens]
source_file = system/modules/isotope/languages/en/tokens.xlf
source_lang = en
file_filter = system/modules/isotope/languages/<lang>/tokens.xlf

[isotope.v2_4-isotope_reports-default]
source_file = system/modules/isotope_reports/languages/en/default.xlf
source_lang = en
file_filter = system/modules/isotope_reports/languages/<lang>/default.xlf

[isotope.v2_4-isotope_reports-modules]
source_file = system/modules/isotope_reports/languages/en/modules.xlf
source_lang = en
file_filter = system/modules/isotope_reports/languages/<lang>/modules.xlf

[isotope.v2_4-isotope_reports-tl_iso_orderstatus]
source_file = system/modules/isotope_reports/languages/en/tl_iso_orderstatus.xlf
source_lang = en
file_filter = system/modules/isotope_reports/languages/<lang>/tl_iso_orderstatus.xlf

[isotope.v2_4-isotope_reports-tl_user]
source_file = system/modules/isotope_reports/languages/en/tl_user.xlf
source_lang = en
file_filter = system/modules/isotope_reports/languages/<lang>/tl_user.xlf

[isotope.v2_4-isotope_rules-default]
source_file = system/modules/isotope_rules/languages/en/default.xlf
source_lang = en
file_filter = system/modules/isotope_rules/languages/<lang>/default.xlf

[isotope.v2_4-isotope_rules-modules]
source_file = system/modules/isotope_rules/languages/en/modules.xlf
source_lang = en
file_filter = system/modules/isotope_rules/languages/<lang>/modules.xlf

[isotope.v2_4-isotope_rules-tl_iso_rule]
source_file = system/modules/isotope_rules/languages/en/tl_iso_rule.xlf
source_lang = en
file_filter = system/modules/isotope_rules/languages/<lang>/tl_iso_rule.xlf
Loading

0 comments on commit 9c59472

Please sign in to comment.