Merge branch 'patch-1' of https://github.com/richardhj/contao into pa…

…tch-1

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -0,0 +1,11 @@
+---
+name: 🐞 Bug report
+about: Report errors and problems
+
+---
+
+**Affected version(s)**
+
+**Description**  
+
+**How to reproduce**  

.github/ISSUE_TEMPLATE/2_Feature_request.md

@@ -0,0 +1,9 @@
+---
+name: 🚀 Feature request
+about: RFC and ideas for new features and improvements
+
+---
+
+**Description**  
+
+**Example**  

.github/ISSUE_TEMPLATE/3_Security_issue.md

@@ -0,0 +1,11 @@
+---
+name: ⛔ Security issue
+about: Report a security issue
+
+---
+
+⚠ PLEASE DO NOT DISCLOSE SECURITY-RELATED ISSUES PUBLICLY!
+
+If you have found a security issue in Contao, please send the details to security [at] contao.org and do not disclose it publicly until we can provide a fix for it.
+
+More information: https://contao.org/en/support.html#security

CHANGELOG.md

@@ -1,52 +1 @@
 # Change log
-
-## 4.6.0-RC1 (2018-07-16)
-
- * Add two factor authentication for the back end login (see contao/core-bundle#1545).
- * Add the "markAsCopy" config option to the DCA (see contao/core-bundle#586).
- * Sort the custom layout sections by their position (see contao/core-bundle#1529).
- * Make the DropZone error messages translatable (see contao/core-bundle#1320).
- * Do not stack the buttons if the screen is wide enough (see contao/core#8816).
- * Remove registrations that are not activated within 24 hours (see contao/core-bundle#1512).
- * Remove the "number of columns" field from the login module (see contao/core-bundle#1577).
- * Also use the file meta data in the download element (see contao/core-bundle#1459).
- * Purge the system log by default after 7 days (see contao/core-bundle#1512).
- * Use "noreferrer noopener" for links that open in a new window (see contao/core-bundle#1125).
- * Do not store IP addresses in tl_log (see contao/core-bundle#1512).
- * Append the module ID to the form field IDs to prevent duplicate IDs (see contao/core-bundle#1493).
- * Add the page picker to the meta fields in file manager (see contao/core-bundle#1568).
- * Remove the "flash movie" front end module.
- * Add extended video support (see contao/core-bundle#1348).
- * Pass all search result data to the search template (see contao/core-bundle#1558).
- * Auto-clear the session form data (see contao/core-bundle#1550).
- * Add abstract controllers for fragment content elements and front end modules (see contao/core-bundle#1376).
- * Handle manifest.json files in public bundle folders (see contao/core-bundle#1510).
- * Introduce auto cache tag invalidation on DCAs for better DX (see contao/core-bundle#1478).
- * Throw a "page not found" exception if a download file does not exist (see contao/core#8375).
- * Allow multi-root and multi-page searches (see contao/core-bundle#1462).
- * Handle case-sensitive file names in the file manager (see contao/core-bundle#1433).
- * Simplify the slug handling when auto-creating aliases (see contao/core-bundle#1334).
- * Do not notify the admin via e-mail if an account is locked (see contao/core-bundle#7728).
- * Only start the session if needed to find data in FORM_DATA (see contao/core-bundle#1471).
- * Add template blocks to be_login.html5 (see contao/core-bundle#1424).
- * Improve cache busting of the .css and .js files (see contao/core-bundle#1404).
- * Add a translator insert tag (see contao/core-bundle#1400).
- * Distinguish between error 401 and 403 (see contao/core-bundle#1381).
- * Enable drag and drop for the file manger (see contao/core-bundle#1394).
- * Add drag and drop file upload for the file tree (see contao/core-bundle#1386).
- * Hide the end time of open-ended events in the back end form (see contao/calendar-bundle#23).
- * Link to the event if no image link has been defined (see contao/news-bundle#30).
- * Hide running non-recurring events (see contao/calendar-bundle#30).
- * Pass the number of events to the main template (see contao/calendar-bundle#32).
- * Make the calendar model available in the event reader (see contao/core#8869).
- * Remove subscriptions that are not activated within 24 hours (see contao/core-bundle#1512).
- * Append the parent ID to the form field IDs to prevent duplicate IDs (see contao/core-bundle#1493).
- * Replace `<div class="quote">` with `<blockquote>` (see contao/core#2244).
- * Support sorting enclosures (see contao/calendar-bundle#16).
- * Migrate the search module settings (see contao/installation-bundle#89).
- * Enable the FOS cache bundle (see contao/manager-bundle#67).
- * Add a default robots.txt file (see contao/manager-bundle#56).
- * Link to the news article if no image link has been defined (see contao/news-bundle#30).
- * Show the 404 page if an external news is opened in the news reader (see contao/news-bundle#33).
- * Add a custom text field to the subscribe module (see contao/core-bundle#1512).
- * Use type="email" in the default template (see contao/newsletter-bundle#20).

calendar-bundle/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for helping us to improve Contao.
+
+This repository is a read-only copy of the calendar-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open an issue here instead: https://github.com/contao/contao
+
+Thank you for your help!

calendar-bundle/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for contributing to Contao.
+
+This repository is a read-only copy of the calendar-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open a pull request here instead: https://github.com/contao/contao
+
+Thank you for your contribution!

calendar-bundle/composer.json

@@ -29,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-4.6": "4.6.x-dev"
+            "dev-master": "4.7.x-dev"
         },
         "contao-manager-plugin": "Contao\\CalendarBundle\\ContaoManager\\Plugin"
     },

comments-bundle/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for helping us to improve Contao.
+
+This repository is a read-only copy of the comments-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open an issue here instead: https://github.com/contao/contao
+
+Thank you for your help!

comments-bundle/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for contributing to Contao.
+
+This repository is a read-only copy of the comments-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open a pull request here instead: https://github.com/contao/contao
+
+Thank you for your contribution!

comments-bundle/composer.json

@@ -23,7 +23,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-4.6": "4.6.x-dev"
+            "dev-master": "4.7.x-dev"
         },
         "contao-manager-plugin": "Contao\\CommentsBundle\\ContaoManager\\Plugin"
     },

composer.json

@@ -122,7 +122,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-4.6": "4.6.x-dev"
+            "dev-master": "4.7.x-dev"
         },
         "contao-manager-plugin": {
             "contao/calendar-bundle": "Contao\\CalendarBundle\\ContaoManager\\Plugin",

core-bundle/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for helping us to improve Contao.
+
+This repository is a read-only copy of the core-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open an issue here instead: https://github.com/contao/contao
+
+Thank you for your help!

core-bundle/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for contributing to Contao.
+
+This repository is a read-only copy of the core-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open a pull request here instead: https://github.com/contao/contao
+
+Thank you for your contribution!

core-bundle/composer.json

@@ -111,7 +111,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-4.6": "4.6.x-dev"
+            "dev-master": "4.7.x-dev"
         },
         "contao-manager-plugin": "Contao\\CoreBundle\\ContaoManager\\Plugin"
     },

faq-bundle/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for helping us to improve Contao.
+
+This repository is a read-only copy of the faq-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open an issue here instead: https://github.com/contao/contao
+
+Thank you for your help!

faq-bundle/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for contributing to Contao.
+
+This repository is a read-only copy of the faq-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open a pull request here instead: https://github.com/contao/contao
+
+Thank you for your contribution!

faq-bundle/composer.json

@@ -29,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-4.6": "4.6.x-dev"
+            "dev-master": "4.7.x-dev"
         },
         "contao-manager-plugin": "Contao\\FaqBundle\\ContaoManager\\Plugin"
     },

installation-bundle/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for helping us to improve Contao.
+
+This repository is a read-only copy of the installation-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open an issue here instead: https://github.com/contao/contao
+
+Thank you for your help!

installation-bundle/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for contributing to Contao.
+
+This repository is a read-only copy of the installation-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open a pull request here instead: https://github.com/contao/contao
+
+Thank you for your contribution!

installation-bundle/composer.json

@@ -30,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-4.6": "4.6.x-dev"
+            "dev-master": "4.7.x-dev"
         },
         "contao-manager-plugin": "Contao\\InstallationBundle\\ContaoManager\\Plugin"
     },

listing-bundle/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for helping us to improve Contao.
+
+This repository is a read-only copy of the listing-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open an issue here instead: https://github.com/contao/contao
+
+Thank you for your help!

listing-bundle/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for contributing to Contao.
+
+This repository is a read-only copy of the listing-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open a pull request here instead: https://github.com/contao/contao
+
+Thank you for your contribution!

listing-bundle/composer.json

@@ -23,7 +23,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-4.6": "4.6.x-dev"
+            "dev-master": "4.7.x-dev"
         },
         "contao-manager-plugin": "Contao\\ListingBundle\\ContaoManager\\Plugin"
     },

manager-bundle/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for helping us to improve Contao.
+
+This repository is a read-only copy of the manager-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open an issue here instead: https://github.com/contao/contao
+
+Thank you for your help!

manager-bundle/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for contributing to Contao.
+
+This repository is a read-only copy of the manager-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open a pull request here instead: https://github.com/contao/contao
+
+Thank you for your contribution!

manager-bundle/composer.json

@@ -40,7 +40,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-4.6": "4.6.x-dev"
+            "dev-master": "4.7.x-dev"
         },
         "contao-manager-plugin": "Contao\\ManagerBundle\\ContaoManager\\Plugin"
     },

news-bundle/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for helping us to improve Contao.
+
+This repository is a read-only copy of the news-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open an issue here instead: https://github.com/contao/contao
+
+Thank you for your help!

news-bundle/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for contributing to Contao.
+
+This repository is a read-only copy of the news-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open a pull request here instead: https://github.com/contao/contao
+
+Thank you for your contribution!

news-bundle/composer.json

@@ -29,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-4.6": "4.6.x-dev"
+            "dev-master": "4.7.x-dev"
         },
         "contao-manager-plugin": "Contao\\NewsBundle\\ContaoManager\\Plugin"
     },

newsletter-bundle/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for helping us to improve Contao.
+
+This repository is a read-only copy of the newsletter-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open an issue here instead: https://github.com/contao/contao
+
+Thank you for your help!

newsletter-bundle/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+⚠ THIS IS THE WRONG REPOSITORY!
+
+Thank you for contributing to Contao.
+
+This repository is a read-only copy of the newsletter-bundle directory in the main Contao repository. It is used by Composer to allow developers to depend on specific Contao bundles.
+
+Please open a pull request here instead: https://github.com/contao/contao
+
+Thank you for your contribution!

newsletter-bundle/composer.json

@@ -23,7 +23,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-4.6": "4.6.x-dev"
+            "dev-master": "4.7.x-dev"
         },
         "contao-manager-plugin": "Contao\\NewsletterBundle\\ContaoManager\\Plugin"
     },