Commit Graph
6721 Commits
Author SHA1 Message Date
Khushboo Verma ea9c71757c Fix tests 2024-04-30 00:19:14 +05:30
Khushboo Verma 2b69f0b7e2 Fix formatting 2024-04-29 19:14:37 +05:30
Khushboo Verma 564fe96eec Resolve merge conflicts 2024-04-29 19:05:51 +05:30
ItzNotABug 02ece2637f fix: use resourceInternalId. 2024-04-29 15:54:22 +05:30
Jake Barnby aeea5e8328 Merge pull request #7341 from appwrite/collection-not-found
databases.php collection not found
2024-04-29 21:04:31 +12:00
Jake Barnby bcca318494 Merge remote-tracking branch 'origin/refactor-usage-sn-invalid-relationship' into feat-upgrade-db
# Conflicts:
#	composer.lock
2024-04-29 20:54:44 +12:00
Jake Barnby ecff8f5b7e Update app/controllers/general.php 2024-04-29 20:16:09 +12:00
Jake Barnby 9a7c424e85 Update app/controllers/general.php 2024-04-29 16:52:46 +12:00
Matej Bačo c768adacdc Re-enable experiment 4xx logging 2024-04-26 17:05:24 +02:00
Matej Bačo 0a85809532 Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x 2024-04-26 13:14:00 +02:00
Matej Bačo 9616de7576 Merge branch 'main' into refactor-usage-sn-1.5.x 2024-04-26 13:11:21 +02:00
Christy Jacob c7bdcda593 Merge pull request #8028 from appwrite/1.5.x
Sync 1.5.x into main
2024-04-26 15:10:09 +04:00
Christy Jacob 92c41954af Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn-1.5.x 2024-04-26 09:19:09 +00:00
Damodar Lohani fbdaf7616c Fix response code label 2024-04-25 07:19:02 +05:45
Damodar Lohani c8bf5f4328 simplify check 2024-04-25 01:23:01 +00:00
Damodar Lohani 4e66f8a8e2 simplify test 2024-04-25 01:01:15 +00:00
shimon 4e639526d6 pull changes 2024-04-24 12:25:49 +03:00
Matej Bačo a99d9f3015 Disable experimental 4XX logging 2024-04-24 10:53:09 +02:00
Damodar Lohani 67cdde15f5 Update api.php 2024-04-24 09:03:08 +05:45
Damodar Lohani c163c84478 Merge branch 'main' into fix-usage-skip-main 2024-04-24 08:42:17 +05:45
Damodar Lohani ac95a7c5eb Update api.php 2024-04-24 06:44:14 +05:45
Damodar Lohani dc3aa5e12f revert 2024-04-24 06:30:32 +05:45
Steven Nguyen b75f5263a2 Merge branch 'main' into chore-sync-main-into-1.5.x 2024-04-23 23:43:53 +00:00
Steven Nguyen 3a2e9b6f4a Merge pull request #7984 from appwrite/fix-mfa-admin-mode-condition
fix: mfa with admin mode
2024-04-23 15:21:02 -07:00
Eldad Fux 9fc0342cf1 Updated injections 2024-04-23 13:30:20 +02:00
Bradley SchofieldandJake Barnby 089af4e137 Update app/controllers/shared/api.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-23 16:34:12 +09:00
Bradley Schofield 3d17b64eac Add Null check before we access factors 2024-04-23 16:24:05 +09:00
Steven Nguyen f88887abad fix(mfa): fix delete authenticator response model 2024-04-22 22:24:20 +00:00
Eldad Fux beeb66e66d Fixed account tests 2024-04-23 00:17:07 +02:00
Eldad Fux 46ab7b1a36 Fixed functions test 2024-04-22 23:33:18 +02:00
Eldad Fux 7381ababb8 Merge remote-tracking branch 'refs/remotes/origin/feat-eldad4-coroutines' into feat-eldad4-coroutines 2024-04-22 23:02:59 +02:00
Eldad Fux d67df5feb1 Fixed formatting 2024-04-22 22:45:55 +02:00
Eldad A. Fux 6c8b228b6c Merge branch 'main' into feat-eldad4-coroutines 2024-04-22 22:37:10 +02:00
Eldad Fux 86b46353ad Fixed for general tests 2024-04-22 22:35:38 +02:00
Eldad Fux 99994f6278 Fixed storage tests 2024-04-22 21:43:57 +02:00
Eldad Fux 351b9318d4 Fixed router, and options 2024-04-22 17:58:40 +02:00
Eldad Fux ab6744df3a Fixed webhooks tests 2024-04-22 14:12:09 +02:00
Eldad Fux c413a6cab5 Updated database service 2024-04-22 09:01:48 +02:00
Eldad Fux 3b70ae4d9f Fixed formatting 2024-04-22 07:56:36 +02:00
Eldad Fux b97cf78d9d Enabled more controllers 2024-04-22 07:51:35 +02:00
Eldad Fux aff328c660 Fixed test 2024-04-22 07:51:24 +02:00
Eldad Fux 74dc9957f2 Fixed console test 2024-04-22 07:25:29 +02:00
Vincent (Wen Yu) Ge c57fa3546f Ran formatter 2024-04-18 17:22:41 -04:00
Vincent (Wen Yu) Ge 404de48cc3 Update user create error message for console to be console specific 2024-04-18 17:08:47 -04:00
fogelito 6a2b40db50 Remove redundent AppwriteException 2024-04-18 11:37:20 +03:00
fogelito 9d14fc75f1 Remove redundent AppwriteException 2024-04-18 11:36:27 +03:00
fogelito 0e8bc6b4b4 Fix bad copy 2024-04-18 11:25:03 +03:00
Shmuel FogelandJake Barnby 2fcbc4867b Update app/controllers/general.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-18 11:08:15 +03:00
Shmuel FogelandJake Barnby 4d1698eab5 Update app/controllers/general.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-18 11:08:09 +03:00
fogelito b224aee2fe GENERAL_ACCESS_FORBIDDEN 2024-04-18 09:58:51 +03:00