Merge branch 'test' into prod

acdh-oeaw · Sep 19, 2023 · 5a927fc · 5a927fc
2 parents ddc5f9f + 453dc17
commit 5a927fc
Show file tree

Hide file tree

Showing 27 changed files with 358 additions and 340 deletions.
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Pack Build
         uses: dfreilich/pack-action@v2.1.1
         with:
-          args: 'build tmp-cnb-image --builder heroku/buildpacks:20'
+          args: 'build tmp-cnb-image --builder heroku/builder:22'
       - name: Suggest default port 5000 within image
         run: |
           echo -n "$SECRETS_CONTEXT" | jq -r '[to_entries[]|select(.key|startswith("K8S_SECRET_"))]|map("\(.key|sub("K8S_SECRET_"; ""))=\(.value|tostring|@sh)")|.[]' > secrets.env 

diff --git a/.user.ini b/.user.ini
@@ -0,0 +1,3 @@
+; Enable modules which are required for CakePHP
+extension=intl
+extension=mbstring
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,26 @@
 # Release notes
 
+## Version 2023-09
+*Release date: 2023-09-19* 
+
+### Changes
+- Changed Mapbox API keys to developer independent keys #28
+- Added (Mapbox) attribution to map on main page #78
+- Migrated to Heroku 22 (Ubuntu 22.04 LTS)
+
+### Small changes
+- Upgraded course add-edit map (institution location view/selector) to Mapbox 2.9.1
+- Reduced amount of text which is logged when generating search list (GenSearchListCommand)
+- Upgraded CakePHP to 4.4.17
+- Upgraded Composer to 2.6.3
+- Composer update for both API's
+- Centralized PHP path setting for cli scripts
+
+### Bug fixes
+- Fixed deprecation warning: passing null into ucfirst at users view
+- Fixed: Emails from the application are rejected by Gmail #69 
+
+
 ## Version 2023-08/2
 *Release date: 2023-08-02*
 
@@ -21,7 +42,7 @@
 - Upgraded PhpUnit to 9.6.9
 - Upgraded Composer to 2.5.8
 - Upgraded CakePHP CodeSniffer to 4.7.0
-- Info page - Content restructuring #23 - partitially
+- Info page - Content restructuring #23
 - Added focus to email field at login page
 
 

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-2023-08/2
+2023-09
diff --git a/api/v1 b/api/v1
diff --git a/api/v2 b/api/v2
diff --git a/composer.json b/composer.json
@@ -6,6 +6,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
+        "ext-intl": "*",
         "ext-curl": "*",
         "cakephp/authentication": "^2.0",
         "cakephp/authorization": "^2.0",
@@ -55,11 +56,8 @@
             "App\\Console\\Installer::postInstall"
         ],
         "check": [
-            "@test",
-            "@cs-check"
+            "@test"
         ],
-        "cs-check": "phpcs --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
-        "cs-fix": "phpcbf --colors --standard=vendor/cakephp/cakephp-codesniffer/CakePHP src/ tests/",
         "test": [
             "phpunit --colors=always --configuration phpunit.xml.dist"
         ]
@@ -72,4 +70,4 @@
             "dealerdirect/phpcodesniffer-composer-installer": true
         }
     }
-}
+}