Commit 744a9d42 authored by Jens Giessmann's avatar Jens Giessmann

Merge branch 'feature/5-9-0-patch' into 'master'

Feature/5 9 0 patch

See merge request !22
parents e29c5b15 01602b3a
Pipeline #83478 passed with stages
in 14 minutes and 18 seconds
This diff is collapsed.
{ {
"require": { "require": {
"bedezign/yii2-audit": "^1.1.1", "bedezign/yii2-audit": "^1.2.0",
"2amigos/yii2-usuario": "^1.6.0", "2amigos/yii2-usuario": "^1.6.0",
"lajax/yii2-translate-manager": "^1.6.0", "lajax/yii2-translate-manager": "^1.6.0",
"dmstr/lajax-yii2-translate-manager-addons": "^1.0.0", "dmstr/lajax-yii2-translate-manager-addons": "^1.0.0",
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
"yiisoft/yii2-bootstrap": "2.*", "yiisoft/yii2-bootstrap": "2.*",
"yiisoft/yii2-redis": "^2.0.5", "yiisoft/yii2-redis": "^2.0.5",
"yiisoft/yii2-twig": "^2.1.0", "yiisoft/yii2-twig": "^2.1.0",
"yiisoft/yii2-symfonymailer": "^3.0" "yiisoft/yii2-symfonymailer": "^3.0",
"ckeditor/ckeditor": "4.22.1"
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "3.*", "friendsofphp/php-cs-fixer": "3.*",
...@@ -55,7 +56,6 @@ ...@@ -55,7 +56,6 @@
"bower-asset/yii2-pjax": "2.0.7", "bower-asset/yii2-pjax": "2.0.7",
"bower-asset/jquery-growl": ">=1.3.3,<=1.3.4", "bower-asset/jquery-growl": ">=1.3.3,<=1.3.4",
"bower-asset/json-editor": "*", "bower-asset/json-editor": "*",
"bedezign/yii2-audit": "~1.0.12 || >=1.1.2",
"dmstr/yii2-active-record-permissions": "<1.2.2", "dmstr/yii2-active-record-permissions": "<1.2.2",
"fxp/composer-asset-plugin": "*", "fxp/composer-asset-plugin": "*",
"dmstr/yii2-web": "<1.1.1", "dmstr/yii2-web": "<1.1.1",
...@@ -71,6 +71,11 @@ ...@@ -71,6 +71,11 @@
"name": "dmstr-forks/loveorigami-yii2-notification-wrapper", "name": "dmstr-forks/loveorigami-yii2-notification-wrapper",
"type": "vcs", "type": "vcs",
"url": "https://github.com/dmstr-forks/loveorigami-yii2-notification-wrapper.git" "url": "https://github.com/dmstr-forks/loveorigami-yii2-notification-wrapper.git"
},
"bedezign/yii2-audit": {
"name": "dmstr-forks/bedezign-yii2-audit",
"type": "vcs",
"url": "https://github.com/dmstr-forks/bedezign-yii2-audit.git"
} }
} }
} }
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