Merge branch 'master' into develop

contao · Oct 1, 2019 · ab2c695 · ab2c695
2 parents 7368cac + 32c237d
commit ab2c695
Show file tree

Hide file tree

Showing 13 changed files with 614 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "description": "Contao Official Demo",
     "license": "CC-BY-SA-4.0",
     "require": {
-        "contao/core-bundle":"~4.6.4",
+        "contao/core-bundle":"~4.8.4",
         "contao-community-alliance/composer-plugin":"~3.0"
     },
     "replace": {
@@ -14,7 +14,7 @@
         "contao": {
             "sources": {
                 "src/files/contaodemo": "files/contaodemo",
-                "src/templates/codv4.2.2_contao_4.6.4.sql": "templates/codv4.2.2_contao_4.6.4.sql",
+                "src/templates/codv4.3.0_contao_4.8.4.sql": "templates/codv4.3.0_contao_4.8.4.sql",
                 "src/templates/contaodemo": "templates/contaodemo"
             }
         }

diff --git a/docs/SQL Export.png b/docs/SQL Export.png
diff --git a/docs/Update_COD.md b/docs/Update_COD.md
@@ -0,0 +1,18 @@
+# How to update the COD
+
+## Contao
+- use last version of COD and import fresh SQL template
+- update Contao to new version und update database
+- export database (see configuration `SQL Export.png`, remove `tl_log` entry)
+
+## SQL
+- archive old SQL file (move to folder `sql-archive`)
+- create new SQL file in folder `src\templates\` with format `codvX.X.X_contao_Y.Y.Y.sql` (X.X.X is the new COD version, Y.Y.Y the min Contao version)
+- insert SQL content from export
+
+## `composer.json`
+- define min version für `core-bundle`
+- update referenced SQL file name
+
+## Theme Import
+- use export function in backend and replace file `src\files\contaodemo\contao_official_demo.cto`
diff --git a/src/templates/codv3.5.0_contao_3.5.2.sql → sql-archive/codv3.5.0_contao_3.5.2.sql b/src/templates/codv3.5.0_contao_3.5.2.sql → sql-archive/codv3.5.0_contao_3.5.2.sql
diff --git a/src/templates/codv3.5.1_contao_3.5.3.sql → sql-archive/codv3.5.1_contao_3.5.3.sql b/src/templates/codv3.5.1_contao_3.5.3.sql → sql-archive/codv3.5.1_contao_3.5.3.sql
diff --git a/src/templates/codv3.5.1_contao_3.5.4.sql → sql-archive/codv3.5.1_contao_3.5.4.sql b/src/templates/codv3.5.1_contao_3.5.4.sql → sql-archive/codv3.5.1_contao_3.5.4.sql
diff --git a/src/templates/codv4.0.0_contao_4.4.3.sql → sql-archive/codv4.0.0_contao_4.4.3.sql b/src/templates/codv4.0.0_contao_4.4.3.sql → sql-archive/codv4.0.0_contao_4.4.3.sql
diff --git a/src/templates/codv4.1.0_contao_4.5.8.sql → sql-archive/codv4.1.0_contao_4.5.8.sql b/src/templates/codv4.1.0_contao_4.5.8.sql → sql-archive/codv4.1.0_contao_4.5.8.sql
diff --git a/src/templates/codv4.2.0_contao_4.6.3.sql → sql-archive/codv4.2.0_contao_4.6.3.sql b/src/templates/codv4.2.0_contao_4.6.3.sql → sql-archive/codv4.2.0_contao_4.6.3.sql
diff --git a/src/templates/codv4.2.2_contao_4.6.4.sql → sql-archive/codv4.2.2_contao_4.6.4.sql b/src/templates/codv4.2.2_contao_4.6.4.sql → sql-archive/codv4.2.2_contao_4.6.4.sql
diff --git a/src/files/contaodemo/contao_official_demo.cto b/src/files/contaodemo/contao_official_demo.cto
diff --git a/src/files/contaodemo/theme/scss/_variables.scss b/src/files/contaodemo/theme/scss/_variables.scss
@@ -40,6 +40,7 @@ $inputOnBg:					#fdfdfd;
 $errorColor:					#c20000;
 $confirmColor:					#00adf1;
 
-@function data-quote($input) { /* compile $input in single quotes */
+/* compile $input in single quotes */
+@function data-quote($input) {
 	@return "'" + $input + "'";
 }
diff --git a/src/templates/codv4.3.0_contao_4.8.4.sql b/src/templates/codv4.3.0_contao_4.8.4.sql