Commit Graph
15760 Commits
Author SHA1 Message Date
Jake Barnby 94d82c75c0 Update specs 2024-02-03 03:41:23 +13:00
Jake Barnby f14c0cc0aa Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2024-02-03 03:35:14 +13:00
Khushboo Verma d40a51b50a Only disallow console requests 2024-02-02 20:01:54 +05:30
Jake Barnby 3816870e19 Fix duplicate routes 2024-02-03 03:26:04 +13:00
Jake Barnby 874e483fb5 Trigger delete of targets associated with sessions when sessions are deleted 2024-02-03 03:06:36 +13:00
Jake Barnby 465bc81071 Add deletes job to delete targets tied to a particular session 2024-02-03 03:06:31 +13:00
Jake Barnby 38f93a3e89 Add session ID + internal ID to targets 2024-02-03 03:06:23 +13:00
Khushboo Verma 52c9109685 Improve error message 2024-02-02 19:35:35 +05:30
Khushboo Verma 7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
Matej Bačo 4115537f72 Fix client error reporting 2024-02-02 14:33:52 +01:00
Torsten Dittmann b462eee183 chore: run formatter 2024-02-02 13:50:41 +01:00
Torsten Dittmann a77526cab1 fix: backup codes 2024-02-02 13:50:18 +01:00
Torsten Dittmann db321db0fb fix: code review 2024-02-02 13:42:15 +01:00
Torsten Dittmann 75fc59931a Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-02 13:30:11 +01:00
Jake Barnby 0e8e455903 Fix spec generation 2024-02-02 23:54:34 +13:00
Jake BarnbyandGitHub 01d92d3125 Merge pull request #7526 from appwrite/feat-update-containers
Update containers
2024-02-02 22:23:11 +13:00
Jake BarnbyandGitHub df3042dc55 Merge pull request #7536 from appwrite/fix-invalid-usage-labels
Remove redundant usage labels
2024-02-02 22:21:20 +13:00
Khushboo Verma d96d84201e Add auth group to create email token endpoint 2024-02-02 14:03:20 +05:30
Khushboo Verma 0ea7b28a6b Resolve merge conflicts 2024-02-02 12:53:25 +05:30
Jake Barnby 499f0a53ea Update to standard namespacing for enums 2024-02-02 17:53:19 +13:00
Jake Barnby d1bad7c3cd Remove redundant usage labels 2024-02-02 17:16:31 +13:00
shimon a254bb7edb Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 2024-02-01 17:13:38 +02:00
Eldad A. FuxandGitHub 321a998947 Merge pull request #7533 from appwrite/feat-rename-security-phrases
Feat: Rename security phrases
2024-02-01 15:45:15 +01:00
Matej Bačo ef3f7878dc PR review changes 2024-02-01 14:13:30 +00:00
Khushboo Verma d3b002a48e Merge branch '1.5.x' into feat-block-countries 2024-02-01 17:49:14 +05:30
Khushboo Verma 851e5c5154 Remove restrict group and add logic to auth group 2024-02-01 17:40:41 +05:30
Torsten Dittmann ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00
loks0n 5e26f01ecd chore: fix account get ssr 2024-02-01 10:41:41 +00:00
Matej Bačo a47a4240ed Rename security phrases 2024-02-01 10:41:01 +00:00
shimon 350d72eb1f updates 2024-02-01 12:21:50 +02:00
loks0n d84cfab244 feat: remove users.createSession 2024-02-01 10:21:38 +00:00
Jake BarnbyandGitHub d306732b31 Merge branch '1.5.x' into feat-update-containers 2024-02-01 21:34:23 +13:00
Jake Barnby 21f0ce5b82 Set port, username and password to defaults if not provided 2024-02-01 17:45:41 +13:00
Jake Barnby a6b5734884 Fix encryption type options 2024-02-01 17:44:42 +13:00
Jake Barnby acc7131c95 Remove redundant key existence check 2024-02-01 17:42:19 +13:00
Jake Barnby 19fdc193b6 Fix credential enabled check 2024-02-01 17:41:24 +13:00
shimon c58d6ea418 sync against main 2024-01-31 20:31:16 +02:00
shimon f477be7521 Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	composer.json
2024-01-31 20:28:03 +02:00
shimon 3f1850f4a7 Merge remote-tracking branch 'origin/1.5.x-response-request-models' into 1.5.x-response-request-models
# Conflicts:
#	Dockerfile
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	composer.lock
#	src/Appwrite/Migration/Version/V20.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Services/Workers.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Mails.php
2024-01-31 20:25:12 +02:00
shimon 102c86b2a6 Merge branch 'main' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	Dockerfile
	app/config/specs/open-api3-latest-client.json
	app/config/specs/open-api3-latest-console.json
	app/config/specs/open-api3-latest-server.json
	app/config/specs/swagger2-latest-client.json
	app/config/specs/swagger2-latest-console.json
	app/config/specs/swagger2-latest-server.json
	app/controllers/api/account.php
	app/controllers/api/users.php
	app/controllers/shared/api.php
	app/worker.php
	composer.json
	composer.lock
	src/Appwrite/Event/Mail.php
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Migration/Version/V20.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Workers/Builds.php
	src/Appwrite/Platform/Workers/Deletes.php
	src/Appwrite/Platform/Workers/Mails.php
2024-01-31 20:21:18 +02:00
Jake Barnby 9051c31a02 Update traefik, mariadb, redis containers 2024-02-01 02:36:35 +13:00
Jake Barnby d275d36a0b Fix param order 2024-02-01 02:33:14 +13:00
Jake Barnby e4194c690f Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-provider
# Conflicts:
#	composer.lock
2024-02-01 01:50:36 +13:00
Jake BarnbyandGitHub 49a753509b Merge pull request #7067 from appwrite/feat-php-8-1
Upgrade to PHP 8.2
2024-02-01 01:47:57 +13:00
Jake Barnby d9f53cacfa Add SMTP provider 2024-02-01 01:30:09 +13:00
Jake BarnbyandGitHub 39312a83ef Merge pull request #7518 from appwrite/feat-remove-description
Feat remove description
2024-02-01 00:33:49 +13:00
Jake BarnbyandGitHub 79c324527e Merge pull request #7510 from appwrite/feat-delete-message
Add message delete route
2024-01-31 19:55:11 +13:00
Khushboo Verma dadb94c499 Merge branch '1.5.x' into feat-block-countries 2024-01-31 12:24:21 +05:30
Khushboo Verma 1d2eadf7e0 Allow 451 error publicly 2024-01-31 12:23:45 +05:30
shimon be829e2db4 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into remove-cloud-scripts
 Conflicts:
	Dockerfile
	docker-compose.yml
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	src/Appwrite/Platform/Workers/Hamster.php
2024-01-30 20:47:35 +02:00