Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
phd5-app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dmstr
phd5-app
Commits
ca232beb
Commit
ca232beb
authored
Apr 11, 2024
by
Tobias Munk
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into release/5.10.x
parents
aaada562
11b8b083
Pipeline
#85155
passed with stages
in 7 minutes and 39 seconds
Changes
6
Pipelines
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
918 additions
and
261 deletions
+918
-261
CHANGELOG.md
CHANGELOG.md
+2
-1
Dockerfile
Dockerfile
+1
-2
UPGRADING.md
UPGRADING.md
+4
-0
common.php
config/common.php
+3
-1
composer.lock
src/composer.lock
+902
-254
composer.phd5.json
src/composer.phd5.json
+6
-3
No files found.
CHANGELOG.md
View file @
ca232beb
# Changelog
### 5.9.0
(under development)
### 5.9.0
-
updated base image to
`yiisoftware/yii2-php:8.1-fpm-nginx`
-
added debug-by-env variables
`APP_DEBUG_KEY`
,
`APP_DEBUG_TOKEN`
-
added Redis queue id sync event
-
enabled debug module for CLI requests
### 5.8.0
...
...
Dockerfile
View file @
ca232beb
...
...
@@ -7,13 +7,12 @@ RUN apt-get update \
default-mysql-client
\
cron
\
procps
# recommended for dmstr/yii2-resque-module
\
&&
pecl
install
mailparse
\
&&
docker-php-ext-enable mailparse
\
&&
apt-get remove
-y
$PHPIZE_DEPS
\
&&
apt-get clean
\
&&
rm
-rf
/var/lib/apt/lists/
*
/tmp/
*
/var/tmp/
*
RUN
install-php-extensions
\
mailparse
\
ftp
ENV
SUPERVISOR_START_CRON=true \
...
...
UPGRADING.md
View file @
ca232beb
...
...
@@ -15,6 +15,10 @@
-
adjust
`XDEBUG_MODE=develop,coverage`
-
disable yii2-debug module, see https://github.com/yiisoft/yii2-debug/issues/372#issuecomment-498443036
### to 5.9
-
set
`XDEBUG_MODE=develop,coverage`
in tests
### 5.4/5.5 to 5.6
-
upgrade
`"wikimedia/composer-merge-plugin": "~2.0"`
...
...
config/common.php
View file @
ca232beb
...
...
@@ -371,6 +371,7 @@ $common = [
'ignoreLanguageUrlPatterns'
=>
[
// route pattern => url pattern
'#^img/stream#'
=>
'#^img/stream#'
,
'#^img/download#'
=>
'#^img/download#'
,
'#^filefly/api#'
=>
'#^filefly/api#'
],
'languages'
=>
$languages
,
...
...
@@ -482,7 +483,8 @@ $common = [
],
'pages'
=>
[
'class'
=>
PagesModule
::
class
,
'layout'
=>
$boxLayout
'layout'
=>
$boxLayout
,
'pageUseFallbackPage'
=>
false
,
],
'prototype'
=>
[
'class'
=>
PrototypeModule
::
class
,
...
...
src/composer.lock
View file @
ca232beb
This diff is collapsed.
Click to expand it.
src/composer.phd5.json
View file @
ca232beb
...
...
@@ -3,11 +3,12 @@
"bedezign/yii2-audit"
:
"^1.2.4"
,
"2amigos/yii2-usuario"
:
"^1.6.0"
,
"lajax/yii2-translate-manager"
:
"^1.6.0"
,
"
dmstr/lajax-yii2-translate-manager-addons"
:
"^1.0.0
"
,
"
ckeditor/ckeditor"
:
"dev-full/4.21.x as 4.999
"
,
"codemix/yii2-localeurls"
:
"^1.7.1"
,
"codemix/yii2-streamlog"
:
"^1.2.1"
,
"dmstr/lajax-yii2-translate-manager-addons"
:
"^1.0.0"
,
"dmstr/yii2-backend-module"
:
"^2.2.5"
,
"dmstr/yii2-contact-module"
:
"^
2.0.0
"
,
"dmstr/yii2-contact-module"
:
"^
3.0.3
"
,
"dmstr/yii2-cookie-consent"
:
"^1.4.3"
,
"dmstr/yii2-db"
:
"^3.0.1"
,
"dmstr/yii2-helpers"
:
">=0.4.19"
,
...
...
@@ -26,6 +27,7 @@
"loveorigami/yii2-notification-wrapper"
:
"^6.7.2-patch1"
,
"omnilight/yii2-scheduling"
:
"^1.1"
,
"pheme/yii2-settings"
:
"^0.7.0"
,
"php-mime-mail-parser/php-mime-mail-parser"
:
"^8.0"
,
"roave/security-advisories"
:
"dev-master"
,
"schmunk42/yii2-markdocs-module"
:
"^1.0.0"
,
"vlucas/phpdotenv"
:
"^5.5"
,
...
...
@@ -49,7 +51,8 @@
"codeception/module-webdriver"
:
"^3.2.0"
,
"codeception/module-asserts"
:
"^2.0.1"
,
"codeception/module-yii2"
:
"^1.1.0"
,
"captbaritone/mailcatcher-codeception-module"
:
"^3.0.0"
"captbaritone/mailcatcher-codeception-module"
:
"^3.0.0"
,
"hoa/console"
:
"^3.17"
},
"conflict"
:
{
"bower-asset/yii2-pjax"
:
"2.0.7"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment