Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature 1711 custom mail templates #61

Merged
merged 6 commits into from
Dec 11, 2023
+1,679 −6,539
Merged

Feature 1711 custom mail templates #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
520d322
Merge pull request #56 from it-at-m/ZMS-1693-roave-security-advisories
tobias74 Dec 7, 2023
d1cb928
feat(ZMS-1633): merge into main
manjencic Dec 7, 2023
c6959b8
Merge branch 'main' of https://github.com/it-at-m/eappointment into main
manjencic Dec 7, 2023
7c4db27
feat(ZMS-1629): commit reverted
manjencic Dec 7, 2023
7f7426c
Merge pull request #58 from it-at-m/feature-1629-commit-reverted
manjencic Dec 7, 2023
0f98d18
feat(ZMS-1711): use custom provider template
manjencic Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions mellon/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"require-dev": {
"phpmd/phpmd": "^2.8.0",
"squizlabs/php_codesniffer": "*",
"phpunit/phpunit": "^9.5.4"
"phpunit/phpunit": "^9.5.4",
"roave/security-advisories": "dev-latest"
},
"require": {
"php": ">=7.0.0",
Expand All @@ -36,4 +37,4 @@
}
}
]
}
}
2 changes: 1 addition & 1 deletion zmsadmin/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
],
"config": {
"platform": {
"php": "7.3"
"php": "8.0"
},
"allow-plugins": {
"php-http/discovery": true
Expand Down
199 changes: 35 additions & 164 deletions zmsadmin/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading