github-starred/pangolin
2
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-07-16 06:08:33 -05:00
Code Issues 1.6k Packages Projects Releases 79 Wiki Activity

[PR #2983] [MERGED] 1.18.2-s.1 #18283

New Issue
Closed
opened 2026-05-18 18:28:31 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-18 18:28:31 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/fosrl/pangolin/pull/2983
Author: @oschwartz10612
Created: 5/3/2026
Status: ✅ Merged
Merged: 5/3/2026
Merged by: @oschwartz10612

Base: main ← Head: dev

📝 Commits (10+)

  • 8e1905a Exclude local/private/CGNAT IPs from COUNTRY=ALL and ASN=ALL/AS0 geo-blocking rules
  • b2c8311 Merge branch 'fosrl:dev' into dev
  • c90e405 Merge pull request #2843 from Blacks-Army/dev
  • bcd1642 Try to speed up
  • 81b8a8a Fix ns cert generation
  • eb515a8 consolidate orgidps in import list
  • 1a926a7 Handle trial limit lifecycle
  • c33e295 Add a banner showing that you are on a trial
  • 584be4d Add badge
  • 1cc0e9b consolidate org idps in login form

📊 Changes

13 files changed (+597 additions, -88 deletions)

View changed files

📝 messages/en-US.json (+4 -0)
📝 server/private/routers/billing/hooks/handleCustomerCreated.ts (+8 -0)
📝 server/private/routers/billing/subscriptionLifecycle.ts (+1 -1)
📝 server/private/routers/certificates/createCertificate.ts (+7 -8)
📝 server/private/routers/org/sendTrialNotification.ts (+31 -11)
📝 server/routers/badger/verifySession.ts (+50 -7)
📝 server/routers/idp/validateOidcCallback.ts (+28 -33)
📝 src/app/[orgId]/settings/(private)/billing/page.tsx (+29 -2)
📝 src/components/DismissableBanner.tsx (+13 -9)
📝 src/components/OrgIdpTable.tsx (+89 -15)
📝 src/components/SmartLoginForm.tsx (+2 -2)
➕ src/components/SmartLoginOrgSelector.tsx (+297 -0)
➕ src/components/TrialBillingBanner.tsx (+38 -0)

📄 Description

  • Exclude local/private/CGNAT IPs from COUNTRY=ALL and ASN=ALL/AS0 geo-blocking rules
  • Try to speed up
  • Fix ns cert generation
  • consolidate orgidps in import list
  • Handle trial limit lifecycle
  • Add a banner showing that you are on a trial
  • Add badge
  • consolidate org idps in login form

🔄 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/2983 **Author:** [@oschwartz10612](https://github.com/oschwartz10612) **Created:** 5/3/2026 **Status:** ✅ Merged **Merged:** 5/3/2026 **Merged by:** [@oschwartz10612](https://github.com/oschwartz10612) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`8e1905a`](https://github.com/fosrl/pangolin/commit/8e1905a695add77d18ca8a2e16cd4c40437bbca9) Exclude local/private/CGNAT IPs from COUNTRY=ALL and ASN=ALL/AS0 geo-blocking rules - [`b2c8311`](https://github.com/fosrl/pangolin/commit/b2c8311b2676700afbc3667d721eb1a04e6a3483) Merge branch 'fosrl:dev' into dev - [`c90e405`](https://github.com/fosrl/pangolin/commit/c90e405105263d4a320827b4de88bb23a442afe8) Merge pull request #2843 from Blacks-Army/dev - [`bcd1642`](https://github.com/fosrl/pangolin/commit/bcd164219f3a3cd226261ea15c15b89462dac039) Try to speed up - [`81b8a8a`](https://github.com/fosrl/pangolin/commit/81b8a8a9e3504c464ff91a0344e9962d5c06614d) Fix ns cert generation - [`eb515a8`](https://github.com/fosrl/pangolin/commit/eb515a8f7fd3ca348b73343c1b460744a5f335a7) consolidate orgidps in import list - [`1a926a7`](https://github.com/fosrl/pangolin/commit/1a926a7127c95d89b343f46b8cd609caeefeeadb) Handle trial limit lifecycle - [`c33e295`](https://github.com/fosrl/pangolin/commit/c33e295ce7b6d18bf8067f6c73d44fec445c8077) Add a banner showing that you are on a trial - [`584be4d`](https://github.com/fosrl/pangolin/commit/584be4dbd2642a93d615112be2a2f7e8ca44af42) Add badge - [`1cc0e9b`](https://github.com/fosrl/pangolin/commit/1cc0e9b689c3a719e8b20ffef86c2d67c7ad4654) consolidate org idps in login form ### 📊 Changes **13 files changed** (+597 additions, -88 deletions) <details> <summary>View changed files</summary> 📝 `messages/en-US.json` (+4 -0) 📝 `server/private/routers/billing/hooks/handleCustomerCreated.ts` (+8 -0) 📝 `server/private/routers/billing/subscriptionLifecycle.ts` (+1 -1) 📝 `server/private/routers/certificates/createCertificate.ts` (+7 -8) 📝 `server/private/routers/org/sendTrialNotification.ts` (+31 -11) 📝 `server/routers/badger/verifySession.ts` (+50 -7) 📝 `server/routers/idp/validateOidcCallback.ts` (+28 -33) 📝 `src/app/[orgId]/settings/(private)/billing/page.tsx` (+29 -2) 📝 `src/components/DismissableBanner.tsx` (+13 -9) 📝 `src/components/OrgIdpTable.tsx` (+89 -15) 📝 `src/components/SmartLoginForm.tsx` (+2 -2) ➕ `src/components/SmartLoginOrgSelector.tsx` (+297 -0) ➕ `src/components/TrialBillingBanner.tsx` (+38 -0) </details> ### 📄 Description - **Exclude local/private/CGNAT IPs from COUNTRY=ALL and ASN=ALL/AS0 geo-blocking rules** - **Try to speed up** - **Fix ns cert generation** - **consolidate orgidps in import list** - **Handle trial limit lifecycle** - **Add a banner showing that you are on a trial** - **Add badge** - **consolidate org idps in login form** --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-05-18 18:28:31 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
api
authentication
bug
config
dependencies
docker
documentation
enhancement
good first issue
help wanted
Improvement
Look Into
needs investigating
networking
new feature
non-critical bug
potential bug
pull-request
Mirrored from GitHub Pull Request
 question
reverse proxy
Security
stale
ui
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/pangolin#18283
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?