Skip to content
Permalink
Branch: master
Commits on Sep 10, 2019
  1. Add a unit test for #731

    leofeyer committed Sep 10, 2019
  2. Support hyphens in custom template names (see #731)

    leofeyer committed Sep 10, 2019
    Description
    -----------
    
    This PR fixes #725, however, since the underlying problem is caused by a wrong template naming scheme, I am not sure whether we should merge this.
    
    @contao/developers WDYT?
    
    Commits
    -------
    
    14fc66c3 Support hyphens in custom template names (see #725)
  3. Revert some changes now that the debug mode does not require the /pre…

    leofeyer committed Sep 10, 2019
    …view.php fragment anymore
Commits on Sep 8, 2019
  1. Correctly fix #1438

    leofeyer committed Sep 8, 2019
Commits on Sep 7, 2019
  1. Revert "Always set the default template in the database (see #1438)"

    leofeyer committed Sep 7, 2019
    This reverts commit d3c4261bb8006c60abce8e56def5abddb65739a1.
Commits on Sep 6, 2019
Commits on Sep 5, 2019
  1. Merge branch '4.8'

    leofeyer committed Sep 5, 2019
    # Conflicts:
    #	CHANGELOG.md
    #	calendar-bundle/src/Resources/contao/languages/zh/tl_calendar.xlf
    #	calendar-bundle/src/Resources/contao/languages/zh/tl_calendar_events.xlf
    #	calendar-bundle/src/Resources/contao/languages/zh/tl_calendar_feed.xlf
    #	core-bundle/src/Resources/config/services.yml
    #	core-bundle/src/Resources/contao/config/constants.php
    #	core-bundle/src/Resources/contao/languages/ja/default.xlf
    #	core-bundle/src/Resources/contao/languages/ja/exception.xlf
    #	core-bundle/src/Resources/contao/languages/ja/tl_form.xlf
    #	core-bundle/src/Resources/contao/languages/ja/tl_form_field.xlf
    #	core-bundle/src/Resources/contao/languages/ja/tl_page.xlf
    #	core-bundle/src/Resources/contao/languages/nl/default.xlf
    #	core-bundle/src/Resources/contao/languages/nl/exception.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_form_field.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_image_size_item.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_layout.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_maintenance.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_style_sheet.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_theme.xlf
    #	core-bundle/src/Resources/contao/languages/nl/tl_undo.xlf
    #	core-bundle/src/Resources/contao/languages/zh/countries.xlf
    #	core-bundle/src/Resources/contao/languages/zh/default.xlf
    #	core-bundle/src/Resources/contao/languages/zh/exception.xlf
    #	core-bundle/src/Resources/contao/languages/zh/modules.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_article.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_content.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_files.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_form.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_form_field.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_image_size.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_image_size_item.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_layout.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_maintenance.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_member.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_member_group.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_module.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_opt_in.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_opt_in_related.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_page.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_settings.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_style.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_style_sheet.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_templates.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_theme.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_undo.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_user.xlf
    #	core-bundle/src/Resources/contao/languages/zh/tl_user_group.xlf
    #	faq-bundle/src/Resources/contao/languages/zh/tl_faq.xlf
    #	faq-bundle/src/Resources/contao/languages/zh/tl_faq_category.xlf
    #	installation-bundle/src/Resources/translations/messages.ja.xlf
    #	installation-bundle/src/Resources/translations/messages.nl.xlf
    #	installation-bundle/src/Resources/translations/messages.zh.xlf
    #	news-bundle/src/Resources/contao/languages/nl/tl_news.xlf
    #	news-bundle/src/Resources/contao/languages/zh/tl_news.xlf
    #	news-bundle/src/Resources/contao/languages/zh/tl_news_archive.xlf
    #	news-bundle/src/Resources/contao/languages/zh/tl_news_feed.xlf
    #	newsletter-bundle/src/Resources/contao/languages/cs/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/de/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/es/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/fr/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/it/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/ja/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/lv/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/nl/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/pl/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/pt/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/ru/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/sl/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/sr/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/tr/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/zh/tl_newsletter.xlf
    #	newsletter-bundle/src/Resources/contao/languages/zh/tl_newsletter_channel.xlf
    #	newsletter-bundle/src/Resources/contao/languages/zh/tl_newsletter_recipients.xlf
  2. Version 4.8.2

    leofeyer committed Sep 5, 2019
  3. Update the README.md file

    leofeyer committed Sep 5, 2019
  4. Merge branch '4.4' into 4.8

    leofeyer committed Sep 5, 2019
    # Conflicts:
    #	core-bundle/src/Resources/contao/config/constants.php
    #	core-bundle/src/Resources/contao/themes/flexible/main.css
    #	core-bundle/src/Resources/contao/themes/flexible/src/main.css
    #	installation-bundle/src/Resources/translations/messages.zh.xlf
    #	listing-bundle/src/Resources/contao/modules/ModuleListing.php
    #	manager-bundle/src/Resources/contao-manager/doctrine.yml
  5. Version 4.4.43

    leofeyer committed Sep 5, 2019
Commits on Sep 4, 2019
Commits on Sep 3, 2019
Commits on Sep 2, 2019
  1. Fix various minor things

    leofeyer committed Sep 2, 2019
  2. Fix various minor things

    leofeyer committed Sep 2, 2019
You can’t perform that action at this time.