Skip to content

Commits on Source 12

  • Tino Goratsch's avatar
    Merge tag 'v4.12.0' into develop · f0c076ad
    Tino Goratsch authored 
    Tagging version v4.12.0
    f0c076ad
  • Tino Goratsch's avatar
    use an actual constraint for the ACP3 composer installer · 5a3ba1a5
    Tino Goratsch authored
    5a3ba1a5
  • Tino Goratsch's avatar
    added the foundation so that the default theme of the ACP3 can be used as a composer package · ed27a125
    Tino Goratsch authored
    ed27a125
  • Tino Goratsch's avatar
    Merge branch hotfix/v4.12.1 into develop · 6e1e77fe
    Tino Goratsch authored
    6e1e77fe
  • Tino Goratsch's avatar
    Merge tag 'v4.12.2' into develop · f6e2bb7f
    Tino Goratsch authored 
    Tagging version v4.12.2

# Conflicts:
#	ACP3/Modules/ACP3/Acp/composer.json
#	ACP3/Modules/ACP3/Articles/composer.json
#	ACP3/Modules/ACP3/Captcha/composer.json
#	ACP3/Modules/ACP3/Categories/composer.json
#	ACP3/Modules/ACP3/Comments/composer.json
#	ACP3/Modules/ACP3/Contact/composer.json
#	ACP3/Modules/ACP3/Emoticons/composer.json
#	ACP3/Modules/ACP3/Errors/composer.json
#	ACP3/Modules/ACP3/Feeds/composer.json
#	ACP3/Modules/ACP3/Filemanager/composer.json
#	ACP3/Modules/ACP3/Files/composer.json
#	ACP3/Modules/ACP3/Gallery/composer.json
#	ACP3/Modules/ACP3/Guestbook/composer.json
#	ACP3/Modules/ACP3/Menus/composer.json
#	ACP3/Modules/ACP3/News/composer.json
#	ACP3/Modules/ACP3/Newsletter/composer.json
#	ACP3/Modules/ACP3/Permissions/composer.json
#	ACP3/Modules/ACP3/Polls/composer.json
#	ACP3/Modules/ACP3/Search/composer.json
#	ACP3/Modules/ACP3/Seo/composer.json
#	ACP3/Modules/ACP3/System/composer.json
#	ACP3/Modules/ACP3/Users/composer.json
#	ACP3/Modules/ACP3/Wysiwygckeditor/composer.json
#	ACP3/Modules/ACP3/Wysiwygtinymce/composer.json
#	installation/composer.json
    f6e2bb7f
  • Tino Goratsch's avatar
    Merge tag 'v4.12.2' into develop · 788f5961
    Tino Goratsch authored 
    Tagging version v4.12.2

# Conflicts:
#	ACP3/Modules/ACP3/Acp/composer.json
#	ACP3/Modules/ACP3/Articles/composer.json
#	ACP3/Modules/ACP3/Captcha/composer.json
#	ACP3/Modules/ACP3/Categories/composer.json
#	ACP3/Modules/ACP3/Comments/composer.json
#	ACP3/Modules/ACP3/Contact/composer.json
#	ACP3/Modules/ACP3/Emoticons/composer.json
#	ACP3/Modules/ACP3/Errors/composer.json
#	ACP3/Modules/ACP3/Feeds/composer.json
#	ACP3/Modules/ACP3/Filemanager/composer.json
#	ACP3/Modules/ACP3/Files/composer.json
#	ACP3/Modules/ACP3/Gallery/composer.json
#	ACP3/Modules/ACP3/Guestbook/composer.json
#	ACP3/Modules/ACP3/Menus/composer.json
#	ACP3/Modules/ACP3/News/composer.json
#	ACP3/Modules/ACP3/Newsletter/composer.json
#	ACP3/Modules/ACP3/Permissions/composer.json
#	ACP3/Modules/ACP3/Polls/composer.json
#	ACP3/Modules/ACP3/Search/composer.json
#	ACP3/Modules/ACP3/Seo/composer.json
#	ACP3/Modules/ACP3/System/composer.json
#	ACP3/Modules/ACP3/Users/composer.json
#	ACP3/Modules/ACP3/Wysiwygckeditor/composer.json
#	ACP3/Modules/ACP3/Wysiwygtinymce/composer.json
#	installation/composer.json
    788f5961
  • Tino Goratsch's avatar
    added some script to composer and use them with travis · 079366d1
    Tino Goratsch authored
    079366d1
  • Tino Goratsch's avatar
    added some scripts · 9bff7c4e
    Tino Goratsch authored
    9bff7c4e
  • Tino Goratsch's avatar
    updated the changelog · 13548329
    Tino Goratsch authored
    13548329
  • Tino Goratsch's avatar
    version bump · 477ab1d7
    Tino Goratsch authored
    477ab1d7
  • Tino Goratsch's avatar
    changelog update · b91f59e7
    Tino Goratsch authored
    b91f59e7
  • Tino Goratsch's avatar
    Merge branch 'release/v4.13.0' · 0b4e7d70
    Tino Goratsch authored
    0b4e7d70