Commit 67a1a7ff authored by Tino Goratsch's avatar Tino Goratsch

Merge branch 'release/v4.4.1'

parents f42f3c28 46f08dd7
......@@ -14,7 +14,7 @@ interface BootstrapInterface extends HttpKernelInterface
/**
* Contains the current ACP3 version string
*/
const VERSION = '4.4.0';
const VERSION = '4.4.1';
/**
* Performs some startup checks
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0",
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1",
"mibe/feedwriter": "^1.0"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0",
"acp3/module-categories": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1",
"acp3/module-categories": "^4.4.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -10,7 +10,34 @@
<div id="tab-1" class="tab-pane fade in active">
{include file="asset:System/Partials/form_group.select.tpl" options=$mode required=true label={lang t="menus|page_type"}}
{include file="asset:System/Partials/form_group.input_text.tpl" name="title" value=$form.title required=true maxlength=120 label={lang t="menus|title"}}
{include file="asset:Menus/Partials/create_menu_item.tpl"}
<div class="form-group">
<label for="block-id" class="col-sm-2 control-label required">{lang t="menus|menu_bar"}</label>
<div class="col-sm-10">
<select class="form-control" name="block_id" id="block-id" required>
{foreach $blocks as $row}
<option value="{$row.id}"{$row.selected}>{$row.title}</option>
{/foreach}
</select>
</div>
</div>
<div class="form-group">
<label for="parent-id" class="col-sm-2 control-label required">{lang t="menus|superior_page"}</label>
<div class="col-sm-10">
<select class="form-control" name="parent_id" id="parent-id">
<option value="">{lang t="menus|no_superior_page"}</option>
{foreach $menuItems as $blocks}
<optgroup label="{$blocks.title}">
{foreach $blocks.items as $row}
<option value="{$row.id}"{$row.selected}>{$row.spaces}{$row.title}</option>
{/foreach}
</optgroup>
{/foreach}
</select>
</div>
</div>
{include file="asset:System/Partials/form_group.button_group.tpl" options=$display required=true label={lang t="menus|display_item"}}
</div>
<div id="tab-2" class="tab-pane fade">
<div id="module-container" class="form-group">
......@@ -51,5 +78,6 @@
{include file="asset:System/Partials/form_group.submit.tpl" form_token=$form_token back_url={uri args="acp/menus"}}
{javascripts}
{include_js module="menus" file="admin/items.create"}
{include_js module="menus" file="manage-menu-item"}
{/javascripts}
{/block}
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,13 +17,13 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0",
"acp3/module-categories": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1",
"acp3/module-categories": "^4.4.1"
},
"suggest": {
"acp3/module-seo": "Provides additional SEO capabilities"
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0",
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1",
"thepixeldeveloper/sitemap": "^4.4.2"
},
"autoload": {
......
......@@ -18,11 +18,11 @@
"require": {
"composer/semver": "^1.4",
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-users": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-users": "^4.4.1"
},
"autoload": {
"psr-4": {
......
......@@ -17,11 +17,11 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0"
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1"
},
"suggest": {
"acp3/module-captcha": "Provides basic protection against spam bots."
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0",
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1",
"ckeditor/ckeditor": "dev-full/4.5.x"
},
"autoload": {
......
......@@ -17,12 +17,12 @@
"prefer-stable": true,
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0",
"acp3/setup": "^4.4.0",
"acp3/module-errors": "^4.4.0",
"acp3/module-permissions": "^4.4.0",
"acp3/module-system": "^4.4.0",
"acp3/module-users": "^4.4.0",
"acp3/core": "^4.4.1",
"acp3/setup": "^4.4.1",
"acp3/module-errors": "^4.4.1",
"acp3/module-permissions": "^4.4.1",
"acp3/module-system": "^4.4.1",
"acp3/module-users": "^4.4.1",
"tinymce/tinymce": "^4.4"
},
"autoload": {
......
......@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
## [4.4.1] - 2016-11-15
### Fixed
- Fixed the menu item management
## [4.4.0] - 2016-11-13
### Added
- [#49](https://github.com/ACP3/cms/issues/49) Added the ability to use a custom menu item title when creating a menu item via the articles module
......@@ -187,7 +191,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- It should be possible again to save ACL roles
- Silenced a possible PHP warning when trying to login with incorrect credentials
[Unreleased]: https://github.com/ACP3/cms/compare/v4.4.0...HEAD
[Unreleased]: https://github.com/ACP3/cms/compare/v4.4.1...HEAD
[4.4.1]: https://github.com/ACP3/cms/compare/v4.4.0...v4.4.1
[4.4.0]: https://github.com/ACP3/cms/compare/v4.3.6...v4.4.0
[4.3.6]: https://github.com/ACP3/cms/compare/v4.3.5...v4.3.6
[4.3.5]: https://github.com/ACP3/cms/compare/v4.3.4...v4.3.5
......
......@@ -20,7 +20,7 @@
},
"require": {
"acp3/composer-installer": "*",
"acp3/core": "^4.4.0"
"acp3/core": "^4.4.1"
},
"extra": {
"installer-name": "installation"
......
{
"name": "acp3-cms",
"version": "4.4.0",
"version": "4.4.1",
"description": "The ACP3 CMS is a highly customizable and easy to use Web Content Management System based on PHP and MySQL.",
"main": "",
"directories": {},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment