[PR #29] [MERGED] merge: develop #37

New issue

Closed

opened 2026-03-03 18:51:43 +03:00 by kerem · 0 comments

kerem commented

2026-03-03 18:51:43 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/oxygenpay/oxygen/pull/29
Author: @swift1337
Created: 8/17/2023
Status: ✅ Merged
Merged: 8/17/2023
Merged by: @swift1337

Base: main ← Head: develop

📝 Commits (3)

1204b51 fix(auth): google auth (#27)
dd7169e Fix login page (#28)
a76367e Merge branch 'main' into develop

📊 Changes

8 files changed (+71 additions, -32 deletions)

View changed files

📝 internal/db/repository/users.sql.go (+11 -6)
📝 internal/service/user/service_google.go (+3 -1)
📝 pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_parameters.go (+3 -5)
📝 pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_responses.go (+2 -4)
📝 pkg/api-kms/v1/client/wallet/wallet_client.go (+7 -7)
📝 scripts/queries/users.sql (+5 -4)
📝 ui-dashboard/src/app.tsx (+18 -3)
📝 ui-dashboard/src/pages/login-page/login-page.tsx (+22 -2)

📄 Description

No description provided

_{🔄 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/oxygenpay/oxygen/pull/29 **Author:** [@swift1337](https://github.com/swift1337) **Created:** 8/17/2023 **Status:** ✅ Merged **Merged:** 8/17/2023 **Merged by:** [@swift1337](https://github.com/swift1337) **Base:** `main` ← **Head:** `develop` --- ### 📝 Commits (3) - [`1204b51`](https://github.com/oxygenpay/oxygen/commit/1204b51e64ff2564d29bd3f846c84f57ab43a065) fix(auth): google auth (#27) - [`dd7169e`](https://github.com/oxygenpay/oxygen/commit/dd7169e072c81b949fff7b5e0a15d95ac5f018d8) Fix login page (#28) - [`a76367e`](https://github.com/oxygenpay/oxygen/commit/a76367ee349e9f7c8b060a561eff6983b3fa219d) Merge branch 'main' into develop ### 📊 Changes **8 files changed** (+71 additions, -32 deletions) <details> <summary>View changed files</summary> 📝 `internal/db/repository/users.sql.go` (+11 -6) 📝 `internal/service/user/service_google.go` (+3 -1) 📝 `pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_parameters.go` (+3 -5) 📝 `pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_responses.go` (+2 -4) 📝 `pkg/api-kms/v1/client/wallet/wallet_client.go` (+7 -7) 📝 `scripts/queries/users.sql` (+5 -4) 📝 `ui-dashboard/src/app.tsx` (+18 -3) 📝 `ui-dashboard/src/pages/login-page/login-page.tsx` (+22 -2) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>