Tuan Dang 30b2b85446 Fix merge conflicts

2023-02-13 15:24:19 +07:00

..

auth.ts

Finish MFA v1 and refactor all tokens into separate TokenService with modified collection

2023-01-23 22:10:15 +07:00

bot.ts

Finish MFA v1 and refactor all tokens into separate TokenService with modified collection

2023-01-23 22:10:15 +07:00

index.ts

Move service token data routes and controllers to v2

2023-01-03 09:33:00 +07:00

integration.ts

Add support and docs for AWS parameter store and secret manager

2023-02-11 01:40:18 +07:00

integrationAuth.ts

Add support and docs for AWS parameter store and secret manager

2023-02-11 01:40:18 +07:00

inviteOrg.ts

Continue developing service token v2

2023-01-01 07:10:47 +07:00

key.ts

Remove accept statuses

2023-01-04 21:14:25 +07:00

membership.ts

Add deny api/get envs api

2023-01-29 21:12:41 -08:00

membershipOrg.ts

Continue developing service token v2

2023-01-01 07:10:47 +07:00

organization.ts

add workspace-memberships api

2023-02-11 15:16:33 -08:00

password.ts

Finish preliminary backwards-compatible transition from user encryption scheme v1 to v2 with argon2 and protected key

2023-01-30 19:38:13 +07:00

secret.ts

Remove accept statuses

2023-01-04 21:14:25 +07:00

serviceToken.ts

Remove accept statuses

2023-01-04 21:14:25 +07:00

signup.ts

Finish preliminary backwards-compatible transition from user encryption scheme v1 to v2 with argon2 and protected key

2023-01-30 19:38:13 +07:00

stripe.ts

Create route and controller v1/v2 folder structure separation

2022-12-26 21:02:39 -05:00

user.ts

Continue developing service token v2

2023-01-01 07:10:47 +07:00

userAction.ts

Resolve merge conflicts

2023-01-03 15:59:37 +07:00

workspace.ts

Remove accept statuses

2023-01-04 21:14:25 +07:00