From fcd0fe91a00026fe027229b38435a83e59e220b7 Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Wed, 2 Sep 2015 15:13:48 +0200 Subject: [PATCH 1/4] [TYPO3] Remove AdditionalConfiguration.php This file is part of the configuration for TYPO3. --- Typo3.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/Typo3.gitignore b/Typo3.gitignore index 5781fcc3..029d7b1f 100644 --- a/Typo3.gitignore +++ b/Typo3.gitignore @@ -8,7 +8,6 @@ /typo3conf/temp_CACHED* /typo3conf/temp_fieldInfo.php /typo3conf/deprecation_*.log -/typo3conf/AdditionalConfiguration.php # Ignore system folders, you should have them symlinked. # If not comment out the following entries. /typo3 From 6fec0f51e560f6d8c8c116d0d2c8438c4dd4d89e Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Wed, 2 Sep 2015 15:16:43 +0200 Subject: [PATCH 2/4] [TYPO3] Add temporary files to .gitignore These temporary files should never be commited. --- Typo3.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Typo3.gitignore b/Typo3.gitignore index 029d7b1f..e8200c33 100644 --- a/Typo3.gitignore +++ b/Typo3.gitignore @@ -8,6 +8,8 @@ /typo3conf/temp_CACHED* /typo3conf/temp_fieldInfo.php /typo3conf/deprecation_*.log +/typo3conf/ENABLE_INSTALL_TOOL +/FIRST_INSTALL # Ignore system folders, you should have them symlinked. # If not comment out the following entries. /typo3 From 370abeac7c3db94fd506dc8cfbc5c0faeac47fd7 Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Wed, 2 Sep 2015 15:21:48 +0200 Subject: [PATCH 3/4] [TYPO3] Support basic TYPO3 composer distribution --- Typo3.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Typo3.gitignore b/Typo3.gitignore index e8200c33..0a7f9929 100644 --- a/Typo3.gitignore +++ b/Typo3.gitignore @@ -15,6 +15,7 @@ /typo3 /typo3_src /typo3_src-* +/Packages /.htaccess /index.php # Ignore temp directory. From e6d0ffa6f011c0b7b3135955b72d438e89b217a4 Mon Sep 17 00:00:00 2001 From: Josef Glatz Date: Wed, 2 Sep 2015 15:37:33 +0200 Subject: [PATCH 4/4] [TYPO3] Add ext:realurls's autoconfig file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If you are using the common used ext:realurl without a custom extConf the auto generated config file shouldn’t be added to scm. --- Typo3.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/Typo3.gitignore b/Typo3.gitignore index 0a7f9929..d66ef8c0 100644 --- a/Typo3.gitignore +++ b/Typo3.gitignore @@ -9,6 +9,7 @@ /typo3conf/temp_fieldInfo.php /typo3conf/deprecation_*.log /typo3conf/ENABLE_INSTALL_TOOL +/typo3conf/realurl_autoconf.php /FIRST_INSTALL # Ignore system folders, you should have them symlinked. # If not comment out the following entries.