1
0
Fork 0
mirror of synced 2024-08-20 04:31:20 +12:00
Commit graph

18598 commits

Author SHA1 Message Date
Christy Jacob
b36c98af66
Merge pull request #7274 from appwrite/refactor-usage-execution-trigger
Refactor usage execution trigger
2023-12-14 06:16:01 +01:00
德华 刘
dc89501012 chore: linter 2023-12-14 04:51:36 +00:00
德华 刘
1307f73c31 chore: refactor code 2023-12-14 04:49:16 +00:00
Christy Jacob
39d91aecf1
Merge pull request #7273 from appwrite/damodar/pea-15-refactor-maintenance-deletes-worker
PEA-15 Refactor Deletes and maintenance worker
2023-12-14 05:08:11 +01:00
Steven Nguyen
92a307c164
Fix user identity attaching to wrong user
Suppose a user has 2 accounts on Appwrite:

1. joe@example.com
2. joe@gmail.com

Prior to this PR, if joe@example.com created a Google OAuth2 session
using his joe@gmail.com email, a new joe@gmail.com identity would be
created linked to joe@example.com.

This is especially problematic because if the user tried to create a
Google OAuth2 session using joe@gmail.com, Appwrite would lookup the
user via email and find the joe@gmail.com user, but then find an
identity from joe@example.com. This mismatching user ID would then
cause an error.

This PR prevents an identity from being created if the email from the
OAuth2 provider matches another user's email.
2023-12-13 18:45:05 +00:00
Torsten Dittmann
9bc52e8900 fix: commatation in email html 2023-12-13 18:08:36 +01:00
Torsten Dittmann
06cd61e53a Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn 2023-12-13 17:47:37 +01:00
Torsten Dittmann
7645d6c34a fix: email templates 2023-12-13 17:46:14 +01:00
Serhat Aksakal
e56b30e6a6
Update tr.json 2023-12-13 12:10:44 +03:00
Christy Jacob
d1850fca38
Merge pull request #7275 from appwrite/revert-expired-cookie
fix: remove expired cookie
2023-12-13 10:01:59 +01:00
德华 刘
f334168f90 fix: remove expired cookie 2023-12-13 08:45:47 +00:00
Matej Bačo
cc67bcba28 Add group for cloud limit check 2023-12-12 21:33:02 +01:00
shimon
41ae96ea77 change execution usage trigger 2023-12-12 21:55:01 +02:00
shimon
bdf9a64771 change execution usage trigger 2023-12-12 21:21:47 +02:00
Torsten Dittmann
cf87cfab3a Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn 2023-12-12 18:48:26 +01:00
Torsten Dittmann
063db1e2bf feat: add execution aggregation to project usage 2023-12-12 18:48:21 +01:00
Matej Bačo
fc504e3a68 Change collections priority for pricing override 2023-12-12 12:27:04 +01:00
Damodar Lohani
7891f9e74c refactor deletes worker 2023-12-12 11:26:44 +00:00
Damodar Lohani
5512123e04 loop through projects 2023-12-12 11:26:28 +00:00
Damodar Lohani
5c3bd741b4 fix resources 2023-12-12 11:26:14 +00:00
Damodar Lohani
d8fe96e300 set project resource 2023-12-12 11:08:14 +00:00
Damodar Lohani
e5fb743943
Merge pull request #7272 from appwrite/damodar/fla-127-make-maintenance-worker-aware-of-the-projects-plan 2023-12-12 10:47:52 +01:00
Damodar Lohani
9ac57e2e7a remove unused retention 2023-12-12 08:11:01 +00:00
Damodar Lohani
104b8bb366 provide retention time as queue server resource 2023-12-12 08:07:24 +00:00
Steven Nguyen
6d357d617d Add a flag to install and upgrade commands to not start Appwrite
This can be useful for cases where the developer only wants the files
to be generated and doesn't want to start Appwrite.
2023-12-11 23:37:32 +00:00
Torsten Dittmann
3d081e1aa5 fix: allow billingPlan query on teams 2023-12-11 19:48:52 +01:00
Torsten Dittmann
5e74c5bbc4 fix: typo usage 2023-12-11 17:12:43 +01:00
Torsten Dittmann
3485373cd7 chore: generate specs 2023-12-11 16:40:19 +01:00
Torsten Dittmann
7d5f926d9c Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn 2023-12-11 16:37:27 +01:00
Torsten Dittmann
2657247b50 bump: console version 2023-12-11 16:37:14 +01:00
Torsten Dittmann
dc8e8a5002
Merge pull request #7270 from appwrite/feat-usage-project-breakdown
feat: usage breakdown by project
2023-12-11 16:34:06 +01:00
Torsten Dittmann
1794b1395a chore: run formatter 2023-12-11 16:33:15 +01:00
Torsten Dittmann
ba75f69969 feat: usage breakdown by project 2023-12-11 16:19:08 +01:00
Torsten Dittmann
b87231153e chore: bump console version number 2023-12-10 21:38:34 +01:00
Torsten Dittmann
f8878ac039 chore: generate specs 2023-12-10 21:29:32 +01:00
Torsten Dittmann
c37e31e6c3 fix: inconsistent timestamp generation 2023-12-10 20:58:38 +01:00
Torsten Dittmann
6925122791
Merge pull request #7266 from appwrite/feat-project-usage-custom-daterange
feat: project usage custom date range
2023-12-10 12:35:58 +01:00
Damodar Lohani
1836e89dff
Merge pull request #7251 from appwrite/feat-mail-template-override-ur 2023-12-10 11:46:25 +01:00
Torsten Dittmann
95425832ae fix: tests and response models 2023-12-10 11:03:01 +01:00
Torsten Dittmann
bb934080ba feat: project usage custom date range 2023-12-10 10:26:33 +01:00
Damodar Lohani
ffdc662022 fix formatting 2023-12-09 06:41:24 +00:00
Damodar Lohani
e4467521f8
Merge branch 'refactor-usage-sn' into feat-mail-template-override-ur 2023-12-09 07:36:11 +01:00
Christy Jacob
e605beaff2
Merge pull request #7260 from appwrite/fix-cookie-issue
Fix cookie issue
2023-12-09 01:54:56 +01:00
Christy Jacob
4f1d8ed6f4 fix: revert files 2023-12-09 01:36:57 +01:00
Christy Jacob
951a749b50 fix: revert files 2023-12-09 01:19:36 +01:00
Christy Jacob
c21a063642 fix: failing tests 2023-12-09 01:02:13 +01:00
Christy Jacob
28d00668bd fix: failing tests 2023-12-09 00:48:34 +01:00
Christy Jacob
aeeb7e1d55 fix: failing tests 2023-12-09 00:36:01 +01:00
Christy Jacob
75e1779921 fix: failing tests 2023-12-09 00:29:14 +01:00
Christy Jacob
72a2a043cd fix: linter 2023-12-09 00:28:10 +01:00