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
19,452 Commits 1,269 Branches 495 Tags
030cdf3cc8d588156b4e5481c533cdef56049fdc
Commit Graph

4019 Commits

Author SHA1 Message Date
shimon 030cdf3cc8 updates 2024-02-01 17:12:27 +02:00
shimon 350d72eb1f updates 2024-02-01 12:21:50 +02:00
shimon 264542b01d migration updates 2024-02-01 10:30:27 +02: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 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
fogelito 9c8c017618 Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1 
 Conflicts:
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/users.php
	composer.json
	composer.lock
 2024-01-29 08:50:53 +02:00
fogelito 789e19d26a Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 2024-01-25 19:06:18 +02:00
Jake Barnby d405106aaa Throw on enable if provider credentials are missing instead of ignoring 2024-01-25 17:59:26 +01:00
fogelito 998c4d282d Fix failing tests 2024-01-25 18:53:51 +02:00
fogelito a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
 2024-01-25 17:44:05 +02:00
Bradley Schofield 17602d513e Merge Stats and 1.5.x migrations 2024-01-25 14:22:21 +00:00
Bradley Schofield ad1d514fb2 Create V21.php 2024-01-25 13:05:43 +00:00
Bradley Schofield c8d75fadf9 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-25 12:27:00 +00:00
Jake Barnby 89343704f7 Rename deleteTargetSubscribers method to make actions clearer 2024-01-26 00:41:05 +13:00
Jake Barnby 34973b8413 Directly delete message schedule instead of deferring to worker 2024-01-26 00:35:37 +13:00
Jake Barnby e81ab1d1e0 Remove redundant document pass through 2024-01-26 00:35:04 +13:00
Jake Barnby 7106131545 Merge branch '1.5.x' into feat-maintenance-delete-expired-targets 2024-01-26 00:26:29 +13:00
Bradley Schofield 3226182ec8 Create the targets in the target collection instead of on the user 2024-01-24 18:13:36 +00:00
Torsten Dittmann 62e459c581 fix: workers 2024-01-24 12:29:36 +01:00
Torsten Dittmann e148617d3e fix: builds worker 2024-01-24 12:20:13 +01:00
Torsten Dittmann d087a76329 Merge branch '1.5.x' into sync-main-with-1.5.x 2024-01-24 12:06:22 +01:00
Christy Jacob 6f52b5f7a1 Merge pull request #7475 from appwrite/fix-certificate-mail-branding 
Fix: Certificate email style
 2024-01-24 14:47:21 +04:00
Torsten Dittmann d13023f23c fix: deletes worker 2024-01-24 11:42:04 +01:00
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Bradley Schofield 4ce5256c1e Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-23 16:17:56 +00:00
Bradley Schofield 5d49ac80b4 Add create targets migrations 2024-01-23 10:21:55 +00:00
Matej Bačo 8a05b634fe Merge remote-tracking branch 'origin/1.5.x' into fix-certificate-mail-branding 2024-01-23 09:04:20 +00:00
fogelito 37bdb17cc6 Deprecated changes 2024-01-22 19:24:12 +02:00
Matej Bačo 0c7a69e665 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 16:05:38 +00:00
Christy Jacob cfc25288b5 Merge pull request #7422 from appwrite/feat-email-otp 
Feat: Email OTP
 2024-01-22 19:18:39 +04:00
Christy Jacob 3656be3da5 Merge pull request #7452 from appwrite/feat-session-renewal 
Feat: session renewal
 2024-01-22 18:28:55 +04:00
shimon d220c2bdd7 Added marked_for_deletion and billing_plan_downgrade 
to hamster export
 2024-01-22 14:48:25 +02:00
Bradley Schofield 9edf73fa3c Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-22 11:23:39 +00:00
Bradley Schofield a63246c2cf Update V20.php 2024-01-22 11:21:25 +00:00
Bradley Schofield 5faf7899f8 Add Webhooks and schedules DB migrations 2024-01-22 11:18:43 +00:00
Matej Bačo 554103687e linter fix 2024-01-22 11:15:55 +00:00
Matej Bačo 724b8c8098 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 10:13:28 +00:00
Bradley Schofield d599971c93 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-01-22 10:09:42 +00:00
Matej Bačo 4366f8e5d8 Remove incorrect translations, improve script 2024-01-22 10:01:02 +00:00
shimon 2b865bdf97 Added marked_for_deletion and billing_plan_downgrade 
to hamster export
 2024-01-22 11:29:11 +02:00
shimon 19b1de283b Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into hamster-additions 2024-01-22 11:25:37 +02:00
Khushboo Verma 5e3212bbff Rename redirect to path 2024-01-22 14:26:40 +05:30
德华 刘 d04f9f41c3 chore: refactor code 2024-01-22 08:30:48 +00:00
德华 刘 ff7523d6db chore: refactor code 2024-01-22 08:26:38 +00:00
Khushboo Verma 506e8c658d Refactored url construction 2024-01-22 13:48:19 +05:30
Matej Bačo 32cc186ea6 Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal 2024-01-22 08:17:52 +00:00