Commit Graph

30723 Commits

Author SHA1 Message Date
Chirag Aggarwal 48fd3b371e Merge branch '1.6.x' into chore-sensitive-check 2025-01-10 23:51:26 +05:30
Chirag Aggarwal acea8812da chore: add senstive attribute to session 2025-01-10 18:21:04 +00:00
Christy Jacob 9b404db87f Merge pull request #9207 from appwrite/fix-abuse-sms
fix sms usage
2025-01-10 23:07:07 +05:30
loks0n 1695e90399 fix: metric 2025-01-10 17:33:08 +00:00
Steven Nguyen c2124d6803 Merge pull request #9200 from ChiragAgg5k/fix-email-otp
fix: disabling of email-otp when user wants to
2025-01-10 07:23:20 -08:00
Matej Bačo efe24db5a1 Fix site starting crashes 2025-01-10 15:28:09 +01:00
Chirag Aggarwal 13597d7c54 chore: abstract token secret hiding to response model 2025-01-10 13:47:38 +00:00
Christy Jacob 5dc04ca8ca Merge pull request #9056 from appwrite/PLA-1958
chore: add audit labels to project resources
2025-01-10 17:57:15 +05:30
Fabian Gruber 26c86d465b Merge branch '1.6.x' into PLA-1958 2025-01-10 13:18:53 +01:00
Christy Jacob f153e1bebf Merge pull request #9138 from appwrite/fix-installation-oauth-collision
Fix: VCS identity collision
2025-01-10 17:08:31 +05:30
Christy Jacob a7fdfc629c Merge pull request #9198 from appwrite/feat-project-sms-usage
feat project sms usage
2025-01-10 15:42:00 +05:30
Jake Barnby 428efdede0 Update lock 2025-01-10 22:32:25 +13:00
Christy Jacob 619b716233 Merge pull request #9192 from ItzNotABug/fix-messaging-test-for-audits
Add assertEventually to messaging provider logs test
2025-01-10 14:50:31 +05:30
Christy Jacob 595e93e59e Merge branch '1.6.x' into fix-messaging-test-for-audits 2025-01-10 14:50:23 +05:30
Jake Barnby 9e5189fa09 Merge remote-tracking branch 'origin/1.6.x' into chore-update-database
# Conflicts:
#	composer.lock
2025-01-10 22:14:06 +13:00
Chirag Aggarwal 642eac098c Merge branch '1.6.x' into fix-email-otp 2025-01-10 14:40:28 +05:30
Jake Barnby a45e0a59dd Update database 2025-01-10 22:05:40 +13:00
Bradley Schofield 8f2cca5b0f Fix Response Models 2025-01-10 16:53:09 +09:00
Jake Barnby 6ebab2f346 Merge pull request #9201 from appwrite/revert-9190-fix-dead-connections
Revert "Fix dead connections"
2025-01-10 20:36:36 +13:00
Jake Barnby b76260ecce Update database 2025-01-10 20:28:50 +13:00
Jake Barnby b88d9c51fb Revert "Fix dead connections" 2025-01-10 20:19:34 +13:00
Bradley Schofield a1c70a6956 Run Formatter, Fix GraphQL 2025-01-10 14:23:04 +09:00
Darshan 4bfd132eee Merge branch '1.6.x' into fix-messaging-test-for-audits 2025-01-10 10:26:30 +05:30
ChiragAgg5k d86984f6cf chore: used config in auth 2025-01-10 08:42:10 +05:30
loks0n ec7f76f9fb fix: stats tests 2025-01-09 21:17:53 +00:00
loks0n a85abdab4a fix: usage tests 2025-01-09 20:11:02 +00:00
loks0n cc7cef59b3 isset over empty 2025-01-09 19:03:25 +00:00
loks0n ee9e4f90c1 chore: specs 2025-01-09 18:57:00 +00:00
loks0n 9687fdb0a5 Merge branch 'feat-project-sms-usage' of https://github.com/appwrite/appwrite into feat-project-sms-usage 2025-01-09 18:33:08 +00:00
loks0n 7c9c3d9214 feat: sms rates 2025-01-09 18:33:07 +00:00
Luke B. Silver 7847dfe9c0 Merge branch '1.6.x' into feat-project-sms-usage 2025-01-09 17:20:52 +00:00
Bradley Schofield 87de19b610 Address Comments 2025-01-10 02:07:56 +09:00
Matej Bačo 0f8ce0e93e Fix Sites 2025-01-09 16:59:40 +00:00
loks0n 76e1b27cef fix: create dummy resource 2025-01-09 16:41:24 +00:00
loks0n 651a3d1d62 test: fix 2025-01-09 16:37:26 +00:00
loks0n d068067a98 feat: project sms usage 2025-01-09 16:35:40 +00:00
Matej Bačo 9089eb4228 New specs 2025-01-09 15:44:13 +00:00
Darshan bce68b2202 fix: benchmark test. 2025-01-09 19:45:03 +05:30
Khushboo Verma 8a260ceece Remove unrelated changes to site deletion 2025-01-09 17:41:45 +05:30
Khushboo Verma 426bcffd1a Resolve merge conflicts 2025-01-09 17:25:24 +05:30
Christy Jacob 4a196562c5 Merge pull request #9191 from ChiragAgg5k/feat-free-sms-limit-authphone 2025-01-08 22:11:34 +05:30
Matej Bačo 9c37c3a740 Fix basic configs 2025-01-08 16:14:33 +00:00
Luke B. Silver 16b32a1069 Merge branch '1.6.x' into feat-free-sms-limit-authphone 2025-01-08 14:07:40 +00:00
Christy Jacob 16b90d723c Merge pull request #9165 from ItzNotABug/add-hostname-to-audits
Add hostname to audits
2025-01-08 19:34:08 +05:30
shimon f4d2583865 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into multi-region-support 2025-01-08 15:54:46 +02:00
shimon 18f17ff9fb remove abuse from deletes worker 2025-01-08 15:54:31 +02:00
Darshan 2ea3bad502 Merge branch '1.6.x' into add-hostname-to-audits 2025-01-08 19:11:23 +05:30
Darshan 0daf4057f3 fix: benchmark test. 2025-01-08 19:10:30 +05:30
Darshan a82a0a2f15 Merge remote-tracking branch 'origin/fix-messaging-test-for-audits' into fix-messaging-test-for-audits 2025-01-08 18:57:31 +05:30
Darshan 11f3c60554 Merge branch '1.6.x' into fix-messaging-test-for-audits 2025-01-08 18:50:13 +05:30