By creating this pull request, I grant the project maintainers an unlimited,
perpetual license to use, modify, and redistribute these contributions under any terms they
choose, including both the AGPLv3 and the Fossorial Commercial license terms. I
represent that I have the right to grant this license for all contributed content.
Description
Hybrid mode
Change integration api port to 3004
Multi site resources
Bugfixes
🔄 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/fosrl/pangolin/pull/1322
**Author:** [@oschwartz10612](https://github.com/oschwartz10612)
**Created:** 8/23/2025
**Status:** ✅ Merged
**Merged:** 8/24/2025
**Merged by:** [@oschwartz10612](https://github.com/oschwartz10612)
**Base:** `main` ← **Head:** `dev`
---
### 📝 Commits (10+)
- [`f0138fa`](https://github.com/fosrl/pangolin/commit/f0138fad4f93582a0dadf3c57afb1b95d308893e) Improve gerbil logging
- [`36d0b83`](https://github.com/fosrl/pangolin/commit/36d0b83ed38e98103061665b2bf0413b0227dc0b) Fix errors again
- [`9b1cd5f`](https://github.com/fosrl/pangolin/commit/9b1cd5f79c4ed64d0fdec42ff5f425ba3cb5cf21) Ignore the config dir
- [`39c5101`](https://github.com/fosrl/pangolin/commit/39c5101957a721d51d67a609644923d5be173875) Merge branch 'main' into dev
- [`0151f8a`](https://github.com/fosrl/pangolin/commit/0151f8a6a91cf9aa4c45752eb7dd530e2ba0d4cd) Fix bad sourcePort
- [`ea6f803`](https://github.com/fosrl/pangolin/commit/ea6f803e78362c1a99fb453fe77f9345954d2ac7) Add createdAt to org
- [`6d359b6`](https://github.com/fosrl/pangolin/commit/6d359b6bb95042ac8d027fabc259edadb9b417ee) Add createdAt to org insert
- [`f75169f`](https://github.com/fosrl/pangolin/commit/f75169fc26b5d577cf4a92259ff4f85d0bdc4247) Add missing langs
- [`e85b772`](https://github.com/fosrl/pangolin/commit/e85b772ca5f14505ea80268e42fa9021e6c961e1) update versions
- [`529d1c9`](https://github.com/fosrl/pangolin/commit/529d1c9f667b05cf0a58ca64632fbb4f30840a17) modified: .github/workflows/cicd.yml
### 📊 Changes
**234 files changed** (+17881 additions, -5267 deletions)
<details>
<summary>View changed files</summary>
📝 `.dockerignore` (+1 -0)
📝 `.github/dependabot.yml` (+22 -0)
📝 `.github/workflows/cicd.yml` (+1 -1)
📝 `.github/workflows/linting.yml` (+1 -1)
📝 `.github/workflows/test.yml` (+1 -1)
📝 `.gitignore` (+9 -0)
📝 `.nvmrc` (+1 -1)
📝 `CONTRIBUTING.md` (+2 -2)
📝 `Dockerfile` (+11 -6)
📝 `Dockerfile.dev` (+1 -1)
➖ `Dockerfile.sqlite` (+0 -41)
📝 `Makefile` (+6 -6)
📝 `README.md` (+3 -3)
➕ `cli/commands/resetUserSecurityKeys.ts` (+72 -0)
📝 `cli/commands/setAdminCredentials.ts` (+3 -1)
📝 `cli/index.ts` (+2 -0)
📝 `config/config.example.yml` (+16 -36)
➖ `config/db/db.sqlite.bak` (+0 -0)
➕ `config/traefik/dynamic_config.yml` (+53 -0)
➕ `config/traefik/traefik_config.yml` (+34 -0)
_...and 80 more files_
</details>
### 📄 Description
## Community Contribution License Agreement
By creating this pull request, I grant the project maintainers an unlimited,
perpetual license to use, modify, and redistribute these contributions under any terms they
choose, including both the AGPLv3 and the Fossorial Commercial license terms. I
represent that I have the right to grant this license for all contributed content.
## Description
- Hybrid mode
- Change integration api port to 3004
- Multi site resources
- Bugfixes
---
<sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
📋 Pull Request Information
Original PR: https://github.com/fosrl/pangolin/pull/1322
Author: @oschwartz10612
Created: 8/23/2025
Status: ✅ Merged
Merged: 8/24/2025
Merged by: @oschwartz10612
Base:
main← Head:dev📝 Commits (10+)
f0138faImprove gerbil logging36d0b83Fix errors again9b1cd5fIgnore the config dir39c5101Merge branch 'main' into dev0151f8aFix bad sourcePortea6f803Add createdAt to org6d359b6Add createdAt to org insertf75169fAdd missing langse85b772update versions529d1c9modified: .github/workflows/cicd.yml📊 Changes
234 files changed (+17881 additions, -5267 deletions)
View changed files
📝
.dockerignore(+1 -0)📝
.github/dependabot.yml(+22 -0)📝
.github/workflows/cicd.yml(+1 -1)📝
.github/workflows/linting.yml(+1 -1)📝
.github/workflows/test.yml(+1 -1)📝
.gitignore(+9 -0)📝
.nvmrc(+1 -1)📝
CONTRIBUTING.md(+2 -2)📝
Dockerfile(+11 -6)📝
Dockerfile.dev(+1 -1)➖
Dockerfile.sqlite(+0 -41)📝
Makefile(+6 -6)📝
README.md(+3 -3)➕
cli/commands/resetUserSecurityKeys.ts(+72 -0)📝
cli/commands/setAdminCredentials.ts(+3 -1)📝
cli/index.ts(+2 -0)📝
config/config.example.yml(+16 -36)➖
config/db/db.sqlite.bak(+0 -0)➕
config/traefik/dynamic_config.yml(+53 -0)➕
config/traefik/traefik_config.yml(+34 -0)...and 80 more files
📄 Description
Community Contribution License Agreement
By creating this pull request, I grant the project maintainers an unlimited,
perpetual license to use, modify, and redistribute these contributions under any terms they
choose, including both the AGPLv3 and the Fossorial Commercial license terms. I
represent that I have the right to grant this license for all contributed content.
Description
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.