[PR #1227] [MERGED] Merge master to 2.x #1354

New issue

Closed

opened 2026-02-25 21:38:01 +03:00 by kerem · 0 comments

kerem commented

2026-02-25 21:38:01 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/cypht-org/cypht/pull/1227
Author: @Shadow243
Created: 9/8/2024
Status: ✅ Merged
Merged: 9/8/2024
Merged by: @marclaporte

Base: 2.x ← Head: merge-master

📝 Commits (10+)

7191ac6 Check for null in quota-root. Some servers yield null values here
3837da7 Fixed attachment dir when config type is set to DB
7576d55 Update release token
9f95e96 Merge pull request #1209 from Shadow243/update-release-token
e399da5 Udpdate docker version to 2.3.0
53d3f98 Additionally check for existence of array key
f617afa Merge pull request #1211 from Shadow243/update-docker-version-to-2-3-0
1fdbfff Merge pull request #1202 from indridieinarsson/quota_issue
18dc913 Merge pull request #1205 from josaphatim/fixed-user-setting-db
cbe79f5 Fix Docker theme css path

📊 Changes

37 files changed (+67 additions, -149 deletions)

View changed files

📝 .env.example (+0 -1)
📝 .github/tests/.env (+0 -1)
📝 .gitignore (+1 -0)
📝 .travis/.env (+0 -1)
📝 INSTALL (+2 -3)
📝 config/2fa.php (+0 -4)
📝 config/app.php (+8 -32)
📝 config/carddav.php (+0 -10)
📝 config/dynamic_login.php (+0 -4)
📝 config/github.php (+0 -4)
📝 config/ldap.php (+0 -4)
📝 config/recaptcha.php (+0 -4)
📝 config/themes.php (+0 -4)
📝 config/wordpress.php (+0 -4)
📝 docker-compose.dev.yaml (+2 -2)
📝 docker/docker-compose.yaml (+1 -1)
📝 docker/docker-entrypoint.sh (+0 -2)
📝 index.php (+1 -1)
📝 lib/auth.php (+1 -1)
📝 lib/ini_set.php (+1 -1)

...and 17 more files

📄 Description

Preparing release

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/cypht-org/cypht/pull/1227 **Author:** [@Shadow243](https://github.com/Shadow243) **Created:** 9/8/2024 **Status:** ✅ Merged **Merged:** 9/8/2024 **Merged by:** [@marclaporte](https://github.com/marclaporte) **Base:** `2.x` ← **Head:** `merge-master` --- ### 📝 Commits (10+) - [`7191ac6`](https://github.com/cypht-org/cypht/commit/7191ac69d86c7221355f924128887b73ec27198b) Check for null in quota-root. Some servers yield null values here - [`3837da7`](https://github.com/cypht-org/cypht/commit/3837da714ba7e3d3a49a723369dd71b9cbce1641) Fixed attachment dir when config type is set to DB - [`7576d55`](https://github.com/cypht-org/cypht/commit/7576d5556ac0c592ca6d9c6677f8ccc8f66c3092) Update release token - [`9f95e96`](https://github.com/cypht-org/cypht/commit/9f95e96f6768c2e6b0266141844e5c2cdbff9aea) Merge pull request #1209 from Shadow243/update-release-token - [`e399da5`](https://github.com/cypht-org/cypht/commit/e399da5a5fbdcbe6840b157e26f76820a5cae59d) Udpdate docker version to 2.3.0 - [`53d3f98`](https://github.com/cypht-org/cypht/commit/53d3f98be284000b0199bb9383aaf572ab1fd46a) Additionally check for existence of array key - [`f617afa`](https://github.com/cypht-org/cypht/commit/f617afa316a6c1c15592a400c7b60dd9f17d7b5c) Merge pull request #1211 from Shadow243/update-docker-version-to-2-3-0 - [`1fdbfff`](https://github.com/cypht-org/cypht/commit/1fdbfffc8512064f5a75378052749b89e9bd1f15) Merge pull request #1202 from indridieinarsson/quota_issue - [`18dc913`](https://github.com/cypht-org/cypht/commit/18dc91356f840578949b9612776f6947d055fb2b) Merge pull request #1205 from josaphatim/fixed-user-setting-db - [`cbe79f5`](https://github.com/cypht-org/cypht/commit/cbe79f5b4b5fa712ed839fc7926261f460c439a2) Fix Docker theme css path ### 📊 Changes **37 files changed** (+67 additions, -149 deletions) <details> <summary>View changed files</summary> 📝 `.env.example` (+0 -1) 📝 `.github/tests/.env` (+0 -1) 📝 `.gitignore` (+1 -0) 📝 `.travis/.env` (+0 -1) 📝 `INSTALL` (+2 -3) 📝 `config/2fa.php` (+0 -4) 📝 `config/app.php` (+8 -32) 📝 `config/carddav.php` (+0 -10) 📝 `config/dynamic_login.php` (+0 -4) 📝 `config/github.php` (+0 -4) 📝 `config/ldap.php` (+0 -4) 📝 `config/recaptcha.php` (+0 -4) 📝 `config/themes.php` (+0 -4) 📝 `config/wordpress.php` (+0 -4) 📝 `docker-compose.dev.yaml` (+2 -2) 📝 `docker/docker-compose.yaml` (+1 -1) 📝 `docker/docker-entrypoint.sh` (+0 -2) 📝 `index.php` (+1 -1) 📝 `lib/auth.php` (+1 -1) 📝 `lib/ini_set.php` (+1 -1) _...and 17 more files_ </details> ### 📄 Description Preparing release --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>