Skip to content
This repository has been archived by the owner on Oct 19, 2024. It is now read-only.

Switch to Trolley for Modrinth Payments #727

Merged
merged 14 commits into from
Oct 11, 2023
Merged

Switch to Trolley for Modrinth Payments #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f6da325
most of trolley
Geometrically Sep 21, 2023
33ea8cd
Switch to trolley for payments
Geometrically Oct 10, 2023
709cc5b
run prepare
Geometrically Oct 10, 2023
de262bc
Merge branch 'master' into trolley-wip
Geometrically Oct 10, 2023
d1e004d
fix clippy
Geometrically Oct 10, 2023
1dc2557
fix more
Geometrically Oct 10, 2023
87a7db3
Fix most tests + bitflags
Geometrically Oct 10, 2023
fa64418
Update src/auth/flows.rs
Geometrically Oct 10, 2023
7eeeafb
Finish trolley
Geometrically Oct 11, 2023
adb4e06
Merge remote-tracking branch 'origin/trolley-wip' into trolley-wip
Geometrically Oct 11, 2023
2a55208
Merge branch 'master' into trolley-wip
Geometrically Oct 11, 2023
3809953
run prep for merge
Geometrically Oct 11, 2023
9ec068e
Update src/queue/payouts.rs
Geometrically Oct 11, 2023
b7d75bb
Merge branch 'master' into trolley-wip
Geometrically Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ WHITELISTED_MODPACK_DOMAINS='["cdn.modrinth.com", "github.com", "raw.githubuserc

ALLOWED_CALLBACK_URLS='["localhost", ".modrinth.com", "127.0.0.1"]'

PAYPAL_API_URL=https://api-m.sandbox.paypal.com/v1/
PAYPAL_CLIENT_ID=none
PAYPAL_CLIENT_SECRET=none
TROLLEY_ACCESS_KEY=none
TROLLEY_SECRET_KEY=none
TROLLEY_WEBHOOK_SIGNATURE=none

GITHUB_CLIENT_ID=none
GITHUB_CLIENT_SECRET=none
Expand Down
4 changes: 3 additions & 1 deletion .idea/labrinth.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading