Commit Graph
311 Commits
Author SHA1 Message Date
Joshen Lim 8d211846f6 Add billing breakdown 2023-07-05 17:03:40 +08:00
Joshen Lim 53182aef4a Address comments from part 1 2023-07-05 16:10:35 +08:00
Joshen Lim e2db478645 remove sorting on payment methods 2023-07-05 13:12:42 +08:00
Joshen Lim 6f6f4fcb05 Merge branch 'master' into feat/org-level-billing-part-2 2023-07-05 12:13:58 +08:00
Joshen Lim 7941a83037 Bring changes from master and resolve conflicts 2023-07-05 11:40:11 +08:00
Joshen Lim 2402245d25 fix 2023-07-05 11:33:04 +08:00
Joshen Lim 3d2c38c184 fix 2023-07-05 11:29:12 +08:00
Joshen Lim 9e67f2b86b fix 2023-07-05 11:24:38 +08:00
Joshen Lim b2301aada1 Address comments 2023-07-05 11:03:00 +08:00
Joshen Lim ebcd567d48 Small style fix 2023-07-04 18:01:03 +08:00
Joshen Lim abc05d8e56 Update based on new org usage endpoint 2023-07-04 17:54:02 +08:00
Alaister Young 5f761e63da Merge pull request #15527 from supabase/fix/vercel-project-count
fix: vercel project count
2023-07-04 17:47:34 +10:00
Joshen Lim 0c4750338f Bring changes in from part 1 and resolve conflicts 2023-07-04 15:33:26 +08:00
Joshen Lim 8ed88eb7b8 Merge master resolve conflicts 2023-07-04 15:22:08 +08:00
Joshen Lim 99accb50ef fix 2023-07-04 14:50:18 +08:00
Joshen Lim c742ea8c73 Fix 2023-07-04 14:05:19 +08:00
Joshen Lim 2ccb94552c Remove iso timestamp start and end from audit log resource key 2023-07-04 12:34:16 +08:00
Alaister Young b2a9ce0e22 add team_slug type 2023-07-04 14:29:16 +10:00
Joshen Lim faa5a28a4b Small update 2023-07-04 12:17:09 +08:00
Joshen Lim e03d99a326 Merge branch 'feat/org-level-billing' into feat/org-level-billing-part-2 2023-07-03 19:18:53 +08:00
Joshen Lim b4a3e48bb9 Update settings page to use new scaffold layout component 2023-07-03 19:18:40 +08:00
Alaister Young 68077138df add link to configure vercel integration 2023-07-03 21:18:32 +10:00
Joshen Lim b44d61b69e Merge branch 'feat/org-level-billing' into feat/org-level-billing-part-2 2023-07-03 18:27:57 +08:00
Joshen Lim 23e7c845fa Pull master and resolve conflicts 2023-07-03 18:27:38 +08:00
Joshen Lim 11cdc82aaa Update based on endpoint changes 2023-07-03 18:13:24 +08:00
Joshen Lim aeae79c2d8 Bring changes from master in and resolve conflicts 2023-07-03 17:24:41 +08:00
Joshen Lim 290a61c86e Resolve conflict 2023-07-03 16:25:18 +08:00
Joshen Lim 6ed4973f42 Have all usage charts on org billing usage use new daily stats endpoint 2023-07-03 16:18:31 +08:00
Jonathan Summers-Muir 0dd7b878c2 Merge pull request #14926 from supabase/feat/vercel-integration-v2
feat: vercel integration v2
2023-07-03 13:39:22 +08:00
Joshen Lim df188a1189 Add plan upgrade side panel 2023-07-03 13:24:26 +08:00
Joshen Lim cc32db3281 Add payment methods to org billing v2 2023-07-03 12:00:18 +08:00
Joshen Lim 0ed5e40c4c Add and refactor the other components to org billing for billing v2 2023-07-02 18:47:28 +02:00
Joshen Lim 1a3f73e5c2 Scaffold new billing tab for org v2 2023-07-02 18:46:29 +02:00
Joshen Lim 12b6c1d2b1 Remove IS_PLATFORM check in buckets query 2023-07-02 11:55:28 +08:00
Alaister Young 70c5492bbc add error toast if integration fails to install 2023-06-30 21:44:58 +10:00
Alaister Young afefd239dc fix incorrect query key on VercelProjectConnectionsQuery 2023-06-30 21:04:35 +10:00
Jonathan Summers-Muir 8d383a35d6 Merge branch 'master' into feat/vercel-integration-v2 2023-06-30 11:14:08 +08:00
Kevin Grüneberg 748ea88482 feat: org level migration 2023-06-28 23:25:33 +02:00
Kevin Grüneberg e0a6dbab76 feat: transfer project to another org 2023-06-28 17:01:18 +02:00
Joshen Lim a016286ef6 Fix conflict 2023-06-28 20:13:15 +08:00
Alaister Young a8e24c7f53 Merge branch 'master' into feat/vercel-integration-v2 2023-06-28 21:41:56 +10:00
Joshen Lim b4adc456da Improve error handling 2023-06-28 17:42:56 +08:00
Joshen Lim c8edaae3e7 Address conflicts 2023-06-28 16:53:51 +08:00
Joshen Lim 1c6b232080 Merge pull request #15277 from supabase/feat/oauth-apps-crud
Feat/oauth apps crud
2023-06-28 16:49:32 +08:00
Joshen Lim adbbf1bba7 Add revoke authorized app + update endpoints with latest changes 2023-06-28 12:07:32 +08:00
Alaister Young 9b55f93232 adds pausing state 2023-06-27 23:16:27 +10:00
Alaister Young e8094ae8b7 feedback from #15212 2023-06-27 19:10:15 +10:00
Alaister Young 3abe40c890 Merge branch 'master' into chore/orgs-and-projects-to-react-query 2023-06-27 16:46:02 +10:00
Joshen Lim 171a40475a Remove mock 2023-06-27 14:44:01 +08:00
Joshen Lim 9b1d295b3f Add log count 2023-06-27 14:37:05 +08:00