Merge pull request #21 from contao-themes-net/feature/contao-4.12-sup…

…port add sql files for contao 4.12, update sql files for contao 4.11
contao-themes-net · Oct 4, 2021 · 102d1cc · 102d1cc
2 parents 14d2600 + 95f8c7d
commit 102d1cc
Show file tree

Hide file tree

Showing 7 changed files with 2,172 additions and 893 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [1.7.0](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.7.0) – 2021-10-04
+
+- [feature] add sql files for contao 4.12
+- [fix] sql files for contao 4.11
+
 ## [1.6.1](https://github.com/contao-themes-net/odd-theme-bundle/tree/1.6.1) – 2021-06-22
 
 - [fix] css fix for active nav items in main navigation and sub navigation

diff --git a/composer.json b/composer.json
@@ -37,7 +37,8 @@
     "contao-themes-net/theme-components-bundle": "^1.2"
   },
   "conflict": {
-    "contao/core": "*"
+    "contao/core": "*",
+    "symfony/config": ">=5.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/Module/OddThemeSetup.php b/src/Module/OddThemeSetup.php
@@ -4,7 +4,7 @@
 
 class OddThemeSetup extends \BackendModule
 {
-    const VERSION = '1.6.1';
+    const VERSION = '1.7.0';
 
     protected $strTemplate = 'be_oddtheme_setup';
 

diff --git a/src/templates/odd_theme_contao_demo_4.11.x_installtool.sql b/src/templates/odd_theme_contao_demo_4.11.x_installtool.sql
diff --git a/src/templates/odd_theme_contao_demo_4.11.x_minimal_installtool.sql b/src/templates/odd_theme_contao_demo_4.11.x_minimal_installtool.sql
diff --git a/src/templates/odd_theme_contao_demo_4.12.x_installtool.sql b/src/templates/odd_theme_contao_demo_4.12.x_installtool.sql
diff --git a/src/templates/odd_theme_contao_demo_4.12.x_minimal_installtool.sql b/src/templates/odd_theme_contao_demo_4.12.x_minimal_installtool.sql