1
0
Fork 0
mirror of synced 2024-07-04 06:00:53 +12:00
Commit graph

18638 commits

Author SHA1 Message Date
Christy Jacob 276a12e0f7
Merge pull request #7316 from appwrite/update-console
chore: update console
2023-12-21 23:06:25 +04:00
德华 刘 9ee949104f chore: update console 2023-12-21 19:05:18 +00:00
Christy Jacob ffa4bfd1f6
Merge pull request #7315 from appwrite/update-console
chore: update console
2023-12-21 19:57:53 +04:00
德华 刘 fac204b34e chore: update console 2023-12-21 15:57:38 +00:00
德华 刘 042c8f8f47 chore: update console 2023-12-21 15:53:29 +00:00
Christy Jacob aa9e9aa1ed
Merge pull request #7314 from appwrite/update-console
Update console
2023-12-21 19:03:34 +04:00
德华 刘 6303029f8a chore: update console 2023-12-21 15:02:28 +00:00
Christy Jacob 45df2d3058
Merge pull request #7313 from appwrite/update-console
chore: update console
2023-12-21 17:14:01 +04:00
Shimon Newman 099308fef5
Merge pull request #7298 from appwrite/refactor-hamster-usage
combining network inbound
2023-12-21 15:05:40 +02:00
shimon ba44e06af6 metrics adjustments
after and projectId additions
2023-12-21 15:04:29 +02:00
德华 刘 a47dcac424 chore: update console 2023-12-21 12:54:35 +00:00
shimon 24d3aa499a metrics adjustments
after and projectId additions
2023-12-21 14:32:10 +02:00
shimon 4e24e3cdc2 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into refactor-hamster-usage
 Conflicts:
	src/Appwrite/Platform/Tasks/CalcTierStats.php
2023-12-21 14:25:06 +02:00
shimon eff578bb36 metrics adjustments
after and projectId additions
2023-12-21 14:07:24 +02:00
shimon 9a2f97b613 metrics adjustments
after and projectId additions
2023-12-21 13:45:57 +02:00
Christy Jacob 5cd94041dc
Merge pull request #7312 from appwrite/1.4.x
Sync main with 1.4.x
2023-12-21 11:40:35 +04:00
Matej Bačo 9c510dace8 Update console 2023-12-20 13:30:15 +01:00
Matej Bačo 56a374e0af Upgrade console 2023-12-20 12:41:07 +01:00
Matej Bačo ccfd856e8e Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn 2023-12-20 12:31:56 +01:00
Matej Bačo 0529cffa4b Improve logging 2023-12-20 12:31:35 +01:00
Eldad A. Fux 1023f24d0b
Merge pull request #7310 from appwrite/fix-deletes-worker
fix deletes worker
2023-12-20 12:28:36 +01:00
Damodar Lohani bfbcecd069 fix deletes worker 2023-12-20 11:26:57 +00:00
Matej Bačo 05f8f8fb9d Fix SMS issue 2023-12-20 12:13:22 +01:00
Matej Bačo 457e47cdd7 Upgrade console 2023-12-20 11:12:16 +01:00
Matej Bačo 683fccc080 Update console 2023-12-19 21:28:51 +01:00
Matej Bačo 42246c5174 Fix console 2023-12-19 18:07:07 +01:00
Matej Bačo b3729507de Add cache to console collection 2023-12-19 18:05:39 +01:00
Matej Bačo b301a58b3e Update console 2023-12-19 14:51:03 +01:00
Matej Bačo 3abb53d3cb
Merge pull request #7301 from appwrite/fix-rename-stats
rename stats collection
2023-12-18 12:06:55 +01:00
Damodar Lohani caa5c4e744 making visibility private 2023-12-18 10:20:00 +00:00
Damodar Lohani 1f558442d9 linter fix 2023-12-18 10:18:40 +00:00
Damodar Lohani 5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00:00
shimon 9f1b356a79 combining network inbound
and network outbound on
hamster script
2023-12-18 11:37:54 +02:00
Torsten Dittmann 76e05983ff
Merge pull request #7293 from appwrite/fix-sms-import
Fix SMS import
2023-12-16 19:12:50 +01:00
Steven Nguyen e41194ee3c
Fix import to match class name
The class is SMS rather than Sms.
2023-12-16 17:42:29 +00:00
Matej Bačo 0aaab63b8c Remove var dumps 2023-12-15 23:37:31 +01:00
Matej Bačo 8c1363529e Add Hooks 2023-12-15 23:19:43 +01:00
Steven Nguyen 6d17f8e877
Fix user last activity not updating
Add back a section of code that was mistakenly removed.
2023-12-15 21:37:26 +00:00
Christy Jacob 0f0d43298e
Merge pull request #7291 from appwrite/update-console
chore: update console
2023-12-15 21:58:28 +01:00
德华 刘 6b6946e39b chore: update console 2023-12-15 20:40:04 +00:00
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