Commit Graph
8360 Commits
Author SHA1 Message Date
Matej Bačo 9252b66493 Add scope tests 2024-05-06 11:27:28 +00:00
Matej Bačo 3a3d5b61a6 PR review changes 2024-05-06 09:55:59 +00:00
Matej Bačo 448b0a5607 Re-add api token auth 2024-05-06 08:35:27 +00:00
Matej Bačo 9a0d9cee15 Merge remote-tracking branch 'origin/main' into feat-function-tokens 2024-05-06 08:35:14 +00:00
Jake Barnby 52c52fa519 Add scheme to DSN on fail 2024-05-06 18:13:41 +12:00
Jake Barnby db94070162 Use DSN for project database 2024-05-06 17:33:36 +12:00
Damodar Lohani 14a0dd3166 Merge remote-tracking branch 'origin/main' into feat-security-emails 2024-05-06 01:04:44 +00:00
shimon 8e291f3700 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into fix-file-size-limit
 Conflicts:
	app/controllers/api/storage.php
	composer.lock
2024-05-05 11:52:49 +03:00
Eldad A. FuxandGitHub b2c57e2d8b Merge pull request #7934 from appwrite/fix-custom-domain
Prevent functions domain to be used as custom domain
2024-05-05 06:53:29 +01:00
Damodar LohaniandGitHub 74264582cc Update proxy.php 2024-05-05 11:07:59 +05:45
Damodar Lohani 1094238820 add test 2024-05-05 04:56:49 +00:00
Damodar Lohani 9b0bacb1a2 Merge remote-tracking branch 'origin/refactor-usage-sn' into pea-699 2024-05-05 04:06:25 +00:00
loks0n c746fb40f8 chore: better name 2024-05-03 12:03:01 +01:00
loks0n 1295128b10 fix: use APP_VERSION_STABLE 2024-05-03 11:56:54 +01:00
Jake Barnby c4deb0ba93 Allow shared tables namespace override 2024-05-03 21:30:38 +12:00
Jake Barnby 99d05b3d8c Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables 2024-05-03 14:24:57 +12:00
Khushboo Verma ce5dd899a5 Remove unnecessary code 2024-05-02 20:48:36 +05:30
Khushboo Verma abcd74d224 Remove logger code from avatars.php 2024-05-02 19:49:55 +05:30
loks0n 644bbe1f5b fix: version 2024-05-02 14:25:41 +01:00
loks0n 3ab9875ca7 feat: use x-appwrite-response-format 2024-05-02 14:16:35 +01:00
loks0n 2ed38271a0 feat: add version header 2024-05-02 13:51:19 +01:00
Khushboo Verma fba60f974e Throw exception for cancellation if build is already complete 2024-04-30 15:46:58 +05:30
Jake Barnby b2e956a14d Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	.gitignore
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/GetMigrationStats.php
#	src/Appwrite/Platform/Workers/Databases.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Hamster.php
#	tests/e2e/General/HTTPTest.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-04-30 19:40:47 +12:00
Jake BarnbyandGitHub 7140d8e6a5 Merge pull request #8036 from appwrite/feat-upgrade-db
Update database
2024-04-30 11:55:47 +12:00
Steven NguyenandGitHub bfb51328fe fix: version in error response
The APP_VERSION_STABLE constant should be used for the version
in API errors so that developers see a version that makes more
sense (such as 1.5.5).
2024-04-29 22:50:20 +00:00
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 BarnbyandGitHub 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 BarnbyandGitHub ecff8f5b7e Update app/controllers/general.php 2024-04-29 20:16:09 +12:00
Jake BarnbyandGitHub 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 JacobandGitHub 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 LohaniandGitHub 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 LohaniandGitHub 67cdde15f5 Update api.php 2024-04-24 09:03:08 +05:45
Damodar LohaniandGitHub c163c84478 Merge branch 'main' into fix-usage-skip-main 2024-04-24 08:42:17 +05:45
Damodar LohaniandGitHub ac95a7c5eb Update api.php 2024-04-24 06:44:14 +05:45
Damodar LohaniandGitHub dc3aa5e12f revert 2024-04-24 06:30:32 +05:45
Steven NguyenandGitHub b75f5263a2 Merge branch 'main' into chore-sync-main-into-1.5.x 2024-04-23 23:43:53 +00:00
Steven NguyenandGitHub 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