Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,169 Commits 1,269 Branches 495 Tags
fix-github-check-url
Commit Graph
5983 Commits
Author SHA1 Message Date
Khushboo Verma e8523e38f7 Merge branch '1.5.x' into feat-block-countries 2024-02-05 13:26:52 +05:30
Jake Barnby 15f433794f Add missing enum cases 2024-02-05 20:25:34 +13:00
Jake Barnby c193260335 Fix usage enums 2024-02-05 19:32:05 +13:00
shimon 6a6c3445fa updates 2024-02-04 20:02:01 +02:00
shimon af2b640948 updates 2024-02-04 10:33:04 +02:00
shimon 036fa93295 updates 2024-02-04 09:34:42 +02:00
shimon a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 
 Conflicts:
	.gitmodules
 2024-02-04 09:27:08 +02:00
Jake Barnby 68931c8672 Merge pull request #7538 from appwrite/fix-spec-generation 
Fix spec generation
 2024-02-03 04:04:00 +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
Jake Barnby 465bc81071 Add deletes job to delete targets tied to a particular session 2024-02-03 03:06:31 +13:00
Khushboo Verma 7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
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 d0cccf72ea Add spec generation changes for OpenAPI as well 2024-02-03 00:33:48 +13:00
Jake Barnby 0e8e455903 Fix spec generation 2024-02-02 23:54:34 +13:00
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
shimon 883cfedc46 updates 2024-02-01 22:14:09 +02: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
shimon 030cdf3cc8 updates 2024-02-01 17:12:27 +02:00
Eldad A. Fux 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
Torsten Dittmann 9c0bd9fc6e Merge pull request #7489 from appwrite/update-webhook-abuse-limit 
Add webhook max failed attempts as env variable
 2024-02-01 13:34:57 +01:00
Khushboo Verma d3b002a48e Merge branch '1.5.x' into feat-block-countries 2024-02-01 17:49:14 +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
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
shimon 62bc540db0 removed var_dump leftovers 2024-02-01 10:35:38 +02:00
shimon 1ef5c9bfcd removed var_dump leftovers 2024-02-01 10:32:40 +02:00
shimon 264542b01d migration updates 2024-02-01 10:30:27 +02:00
Jake Barnby 836ae8a607 Fix adapter instantiation 2024-02-01 17:51:28 +13:00
shimon ed7b3faeb3 sync against main 2024-01-31 21:22:06 +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 ca65f4ab2f sync against main 2024-01-31 20:22:49 +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 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 Barnby d9f53cacfa Add SMTP provider 2024-02-01 01:30:09 +13:00
shimon ab80999d1e cleanup 2024-01-31 12:13:02 +02:00
Khushboo Verma dadb94c499 Merge branch '1.5.x' into feat-block-countries 2024-01-31 12:24:21 +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
shimon bfe042dc3e fix 2024-01-30 13:29:15 +02:00
shimon 5518ca165e remarks 2024-01-30 13:24:57 +02:00
shimon 13a879c274 Add count for messages(sms) metric 2024-01-30 11:19:10 +02:00
Christy Jacob 7b5be4e154 chore: update team membership deletion 2024-01-30 08:42:46 +00:00
Jake Barnby ab0fae216d Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1 
# Conflicts:
#	composer.lock
 2024-01-30 18:44:16 +13:00
Christy Jacob c192e48c48 chore: remove return 2024-01-29 20:25:23 +00:00
Christy Jacob 1e966d6b2e chore: rename env variable 2024-01-29 20:09:23 +00:00
Christy Jacob 2ff7c5ac8e chore: rename env variable 2024-01-29 20:07:17 +00:00
Christy Jacob dc6f9e6d59 chore: add new env variable 2024-01-29 20:01:14 +00:00