Merge tag '2.0.0-alpha15'

Update to work with DCG edit/overrideAl

Author: stefanheimes

.check-author.yml

@@ -26,6 +26,9 @@ mapping:
   "Ingolf Steinhardt <info@e-spin.de>":
     - "xantippe <info@e-spin.de>"
     - "zonky2 <info@e-spin.de>"
+  "binron <rtb@gmx.ch>": "binron <rtb@gmx.ch>"
+  "Jeremie Constant <j.constant@imi.de>":
+    - "JeremieConstant <j.constant@imi.de>"
 
 copy-left:
   "Christoph Wiechert <christoph.wiechert@4wardmedia.de>": MetaModels/Widgets/PickerWidget.php

.gitattributes

@@ -1,5 +1,6 @@
-.check-author.yml
+.check-author.yml export-ignore
 .gitattributes export-ignore
+.github export-ignore
 .gitignore export-ignore
 .travis.yml export-ignore
 build.default.properties export-ignore

.travis.yml

@@ -5,13 +5,15 @@ php:
   - "5.5"
   - "5.6"
   - "7.0"
+  - "7.1"
 
 env:
   - CONTAO_VERSION=~3.5.0
 
 sudo: false
 
-install:
+before_script:
+  - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - travis_retry composer self-update && composer --version
   - travis_retry composer require contao/core $CONTAO_VERSION --no-update
   - travis_retry composer update --prefer-dist --no-interaction

README.md

@@ -16,28 +16,18 @@ To present the data on the screen (i.e. website, RSS feed, etc.), you define ren
 
 Filtering data in list views needs configuration of filter settings. Filter settings are a very complex topic, as they can be nested (AND/OR conditions i.e.) and be of various nature.
 
-History
-------------------
-Metamodels are the replacement for the famous Catalog extension for [Contao CMS](https://github.com/contao/core).
-
-As the catalog extension was growing too complex too maintain and most support for extendability was rather hacky, we decided it was time to take everything we learned during the development of Catalog 1 and Catalog 2 to provide you with Catalog 3 which shall be even more flexible and very easy to extend with own classes.
-
-As development did go on nicely, we realized that an easy migration from Catalog to the new version will not very likely be possible both in implementation and learning curve but that this will be a very own and unique extension reensembling only of the name with it's ancestor.
-Therefore we rebranded everything as "MetaModels".
-
 How to use it.
 --------------
 
 ### Composer
 
 MetaModels and all its dependencies are available through the great [composer extension](https://c-c-a.org/ueber-composer) 
 
-When your Contao Installation is composered, you can simply installing metamodels by adding following packages
+When your Contao Installation is composered, you can simply installing MetaModels by adding following package
 
-* MetaModels/core 
 * MetaModels/bundle_all 
 
-If you do not need all attributes & filters, feel free to just install the core and grab some filter and attributes of your choice. (Or another [bundle](https://github.com/MetaModels?query=bundle)
+If you do not need all attributes & filters, feel free to just install the core (MetaModels/core) and grab some filter and attributes of your choice. (Or another [bundle](https://github.com/MetaModels?query=bundle))
 
 ### Nightly
 
@@ -49,15 +39,27 @@ Docs:
 -----------
 
 * [The official MetaModel Documentation (en)](http://metamodels.readthedocs.org/en/latest/index.html)
-* [The official MetaModel Documentation - feel free to contribute!](https://github.com/MetaModels/docs)
+* [The official MetaModel Documentation (de)](http://metamodels.readthedocs.org/de/latest/index.html)
+
+Feel free to contribute the MetaModel Documentation in [EN](https://github.com/MetaModels/docs) or [DE](https://github.com/MetaModels/docs-de)
 
 Ressources:
 -----------
 
-* [MetaModels Contao Wiki](http://de.contaowiki.org/MetaModels)
-* [MetaModels Contao Community Subforum](https://community.contao.org/de/forumdisplay.php?149-MetaModels)
+* [MetaModels Website](https://now.metamodel.me)
+* [MetaModels Contao Wiki [DE]](http://de.contaowiki.org/MetaModels)
+* [MetaModels Contao Community Subforum [DE]](https://community.contao.org/de/forumdisplay.php?149-MetaModels)
 * [MetaModels IRC Channel on freenode #contao.mm](irc://chat.freenode.net/#contao.mm)
 
+History
+------------------
+Metamodels are the replacement for the famous Catalog extension for [Contao CMS](https://github.com/contao/core).
+
+As the catalog extension was growing too complex too maintain and most support for extendability was rather hacky, we decided it was time to take everything we learned during the development of Catalog 1 and Catalog 2 to provide you with Catalog 3 which shall be even more flexible and very easy to extend with own classes.
+
+As development did go on nicely, we realized that an easy migration from Catalog to the new version will not very likely be possible both in implementation and learning curve but that this will be a very own and unique extension reensembling only of the name with it's ancestor.
+Therefore we rebranded everything as "MetaModels".
+
 Who did it?
 -----------
 

build.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    <!--
-     This project is using the Contao Community Alliance Build System (CCABS)
+<!--
+This project is using the PHP code quality project (PHPCQ).
 
-     For documentation visit:
-       https://github.com/contao-community-alliance/build-system
+For documentation visit:
+  https://github.com/phpcq/phpcq
 
-    -->
+-->
 <project name="metamodels-core" default="build">
     <import file="vendor/phpcq/phpcq/phpcq.main.xml" />
 </project>

composer.json

@@ -33,7 +33,7 @@
     "php": ">=5.4",
     "contao/core": "^3.5.5",
     "contao-community-alliance/composer-plugin": "~2.0",
-    "contao-community-alliance/dc-general": "~2.0",
+    "contao-community-alliance/dc-general": "~2.0@beta",
     "menatwork/contao-multicolumnwizard": "~3.3",
     "contao-community-alliance/meta-palettes": "~1.7",
     "discordier/justtextwidgets": "~1.0",
@@ -78,7 +78,5 @@
       "dev-master": "2.0.x-dev",
       "dev-develop": "2.1.x-dev"
     }
-  },
-  "prefer-stable": true,
-  "minimum-stability": "dev"
+  }
 }

contao/assets/images/icons/locale_1.png

@@ -7,6 +7,6 @@ requires[] = "event-dispatcher"
 ;;
 ; Configure what you want the autoload creator to register
 ;;
-register_namespaces = true
-register_classes    = true
-register_templates  = true
+register_namespaces = false
+register_classes    = false
+register_templates  = false