Commit Graph
7073 Commits
Author SHA1 Message Date
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
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
Chirag Aggarwal 642eac098c Merge branch '1.6.x' into fix-email-otp 2025-01-10 14:40:28 +05:30
Jake Barnby b88d9c51fb Revert "Fix dead connections" 2025-01-10 20:19:34 +13:00
ChiragAgg5k d86984f6cf chore: used config in auth 2025-01-10 08:42:10 +05:30
loks0n cc7cef59b3 isset over empty 2025-01-09 19:03:25 +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
loks0n d068067a98 feat: project sms usage 2025-01-09 16:35:40 +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
Darshan 2ea3bad502 Merge branch '1.6.x' into add-hostname-to-audits 2025-01-08 19:11:23 +05:30
Matej Bačo 78c6766baf Merge branch '1.6.x' into fix-installation-oauth-collision 2025-01-08 14:06:45 +01:00
ChiragAgg5k 2178bb44cd fix: attribute 2025-01-08 17:14:07 +05:30
ChiragAgg5k 1f240ca27a chore: moved non-countrycode tracking outside abuse 2025-01-08 17:09:55 +05:30
ChiragAgg5k ff056fa145 chore: shifted authphone usage tracking to api calls 2025-01-08 17:01:01 +05:30
Jake Barnby 71b892132b Mark connections as unhealthy on lost connection error from DB 2025-01-08 18:39:06 +13:00
shimon 347ba4a127 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into usage-db-read-writes-addition 2025-01-06 19:30:20 +02:00
shimon 5c097df56a added operations debug header 2025-01-06 19:07:18 +02:00
shimon c97b48f443 Merge remote-tracking branch 'origin/usage-db-read-writes-addition' into usage-db-read-writes-addition
# Conflicts:
#	app/controllers/api/databases.php
2025-01-06 19:03:32 +02:00
shimon a481e958e3 added operations debug header 2025-01-06 18:57:35 +02:00
fogelito 40b407027e Count changes 2025-01-06 18:51:39 +02:00
shimon b910d795f2 Merge remote-tracking branch 'origin/usage-db-read-writes-addition' into usage-db-read-writes-addition 2025-01-06 18:06:29 +02:00
shimon d64ea97ee6 added operations debug header 2025-01-06 18:06:18 +02:00
fogelito fc03075ef8 Update counts 2025-01-06 18:01:44 +02:00
shimon f70222d41a added operations debug header 2025-01-06 17:19:39 +02:00
shimon 1cfcd53ae3 Merge branch 'usage-db-read-writes-addition' of https://github.com/appwrite/appwrite into usage-db-read-writes-addition 2025-01-06 16:50:54 +02:00
shimon 0814fe49e2 added operations debug header 2025-01-06 16:50:23 +02:00
fogelito 895e79e736 Operations 2025-01-06 12:25:56 +02:00
shimon 1a73847c47 added operations debug header 2025-01-06 11:28:26 +02:00
Christy Jacob bdb6599087 chore: linter 2025-01-04 12:55:20 +05:30
Christy Jacob 56af9d0991 chore: add todo 2025-01-04 12:51:50 +05:30
Christy Jacob e1c08e33d4 fix: trigger webhooks events only if a project has webhooks 2025-01-04 12:51:42 +05:30
Darshan 31f8950b45 add: hostname to audits. 2025-01-03 15:30:55 +05:30
shimon 4acc2736e4 added operations debug header 2025-01-02 16:46:38 +02:00
shimon c5a49cc537 added operations debug header 2025-01-02 16:45:21 +02:00
Christy Jacob bdb93cd323 Update general.php 2025-01-02 19:03:28 +05:30
shimon 6b45293f78 file transformations usage 2025-01-02 13:55:30 +02:00
shimon 63cf093020 file transformations usage 2025-01-02 13:53:57 +02:00
shimon 504b7276cb composer 2025-01-02 11:02:53 +02:00
shimon e7e095907c composer 2025-01-02 10:44:56 +02:00
shimon c0d48efe18 composer 2025-01-02 10:29:55 +02:00
shimon fbbc9312ea database crud usage addition 2025-01-02 10:09:44 +02:00
shimon 4cc963d296 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into usage-db-read-writes-addition 2025-01-02 10:00:59 +02:00
shimon c7841bb36e database crud usage addition 2025-01-02 09:59:59 +02:00
shimon 42589de95e database crud usage addition 2025-01-02 09:56:14 +02:00
shimon 0f2985cec1 database crud usage addition 2025-01-02 09:19:09 +02:00
Steven Nguyen a502b1c566 Merge branch '1.6.x' into feat-apns-content-available 2024-12-31 22:56:15 +00:00