Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: COmanage/match
base: hotfix-1.0.x
Choose a base ref
...
head repository: COmanage/match
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
6 contributors
Showing 4,476 changed files with 203,758 additions and 271,089 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions NOTICE
View file
@@ -65,9 +65,9 @@ files and utilities for further information:
Apache 2.0
https://fonts.google.com/icons?selected=Material+Icons

Noto Sans (app/webroot/css/fonts/notosans_*)
SIL Open Font License
https://fonts.google.com/noto/specimen/Noto+Sans
Open Sans (app/webroot/css/fonts/opensans)
Apache 2.0
https://fonts.google.com/specimen/Open+Sans

noty (app/webroot/js/jquery/noty)
MIT License
11 changes: 7 additions & 4 deletions app/composer.json
View file
@@ -6,11 +6,10 @@
"license": "MIT",
"require": {
"php": ">=7.3",
"adodb/adodb-php": "^5.21",
"cakephp/cakephp": "^4.3",
"cakephp/cakephp": "^4.4",
"cakephp/migrations": "^3.2",
"cakephp/plugin-installer": "^1.3",
"components/jquery": "~3.6.0",
"components/jquery": "~3.7",
"doctrine/dbal": "^3.3",
"mobiledetect/mobiledetectlib": "^2.8",
"twbs/bootstrap": "^5.1"
@@ -77,6 +76,10 @@
},
"prefer-stable": true,
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"cakephp/plugin-installer": true
}
}
}