Commit Graph
5071 Commits
Author SHA1 Message Date
loks0n 7f164bdbbc chore: generate specs 2023-12-05 12:01:02 +01:00
prateek banga 81ec4ff9bc fix typo in userId index in targets 2023-12-01 03:51:03 +05:30
prateek banga 6ead6f8094 misc changes
allow filtering by providerType, userId in subscribers. Adds cancelled status for message status. Validate targets when creating message. delete all targets when user is deleted. fix twilio bug. add db env vars in messaging worker compose.phtml
2023-12-01 03:39:43 +05:30
loks0n 5a63fef157 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-30 12:13:44 +00:00
shimon c313e8347f Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	composer.lock
2023-11-30 10:21:59 +02:00
Jake Barnby 4b58d08fd8 Add providerType to Message 2023-11-29 17:09:44 +13:00
Jake Barnby 82c86c0ae2 deliveryTime -> scheduledAt 2023-11-29 17:08:25 +13:00
shimon 9960912bb1 sync against main 2023-11-26 18:52:02 +02:00
shimon 1869852985 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/controllers/shared/api.php
	composer.lock
	src/Appwrite/Platform/Workers/Deletes.php
2023-11-26 16:29:18 +02:00
shimon 21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
prateek banga 858175fe00 adds target object in subscriber model 2023-11-23 14:35:16 +05:30
loks0n 88aa4d726c Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-21 14:54:57 +00:00
prateek banga 3394218cb0 adds validation for phone and email identifier 2023-11-21 15:00:02 +05:30
prateek banga 520d19e335 changes TextMagic to Textmagic in all places and uses email validator 2023-11-21 12:35:36 +05:30
Khushboo Verma 2c04c98801 Renamed webhook variables 2023-11-20 19:49:15 +05:30
Khushboo Verma 2bcb6c18fb Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-11-20 17:40:32 +05:30
Jake Barnby 0b01f7140f Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
#	src/Appwrite/Extend/Exception.php
2023-11-21 00:19:17 +13:00
Jake Barnby 8b14d96151 Merge remote-tracking branch 'origin/1.4.x' into chore-update-sdks 2023-11-21 00:17:36 +13:00
Jake Barnby 6ad4566b6b Update CLI 2023-11-21 00:15:50 +13:00
prateek banga 5c1cf3a526 adds user name in subscriber response model 2023-11-20 12:34:50 +05:30
Khushboo Verma 695d6f4065 Renamed variables 2023-11-18 00:04:57 +05:30
Khushboo Verma 7902defe69 Addressed PR comments 2023-11-17 19:29:57 +05:30
Khushboo Verma c34dc4dae0 Add flag to send logs to logger 2023-11-16 23:51:09 +05:30
Prateek BangaandJake Barnby f0247930da Update app/config/collections.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-11-16 17:15:08 +05:30
prateek banga 7536d8eb0f review changes 2023-11-16 17:09:08 +05:30
Jake Barnby 02b6659b35 SDK releases 2023-11-16 21:50:39 +13:00
prateek banga a282ab38a6 adds target endpoint in account controller for push tokensl 2023-11-16 02:12:06 +05:30
prateek banga c24664f5d9 removes internal provider 2023-11-16 01:30:47 +05:30
Torsten Dittmann 115ca23a58 Merge pull request #5174 from yatharth1706/fix-4797-verified-user-getting-email-verifications
Fix verified user getting email verifications
2023-11-15 13:35:23 +01:00
loks0n 830544e245 fix: logged in ssr cases 2023-11-15 11:57:27 +00:00
prateek banga fdca55b0de fix test cases 2023-11-15 01:24:55 +05:30
prateek banga adc76c5797 adds target when account is created or email or phone is updated 2023-11-14 22:46:20 +05:30
loks0n 7823b90bf3 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-14 14:01:10 +00:00
prateek banga 7ae614fe13 adds provider type in target 2023-11-14 18:14:07 +05:30
Khushboo Verma 22f02243c6 Resolved merge conflicts 2023-11-14 14:29:46 +05:30
Khushboo Verma 3f584b85be Limit webhook failure attempts to 10 2023-11-14 14:20:26 +05:30
prateek banga f84a00dded adds search attribute filter 2023-11-14 14:07:52 +05:30
Jake Barnby 458c2d1446 Merge remote-tracking branch 'origin/main' into chore-sync-main 2023-11-13 16:46:05 +13:00
Prateek Banga 1b99f47f21 lint fix 2023-11-10 13:28:39 +05:30
Prateek Banga 3ade88897c Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x 2023-11-10 12:49:05 +05:30
Christy Jacob d33b8c2ce1 Merge branch '1.4.x' into fix-null-password-history 2023-11-09 07:44:44 -08:00
Steven Nguyen 0c264a107a Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications 2023-11-08 17:37:43 -08:00
德华 刘 9acc23049c Merge branch 'main' of https://github.com/appwrite/appwrite into sync-1.4.x-main 2023-11-07 18:12:58 +00:00
Bradley Schofield d5d7440a68 Merge branch 'main' into feat-improve-migration-validations 2023-11-07 16:21:35 +00:00
Jake Barnby 1429c82aa0 Make VCS, proxy and migrations services non-optional so they aren't toggled with enable/disable all service routes 2023-11-06 12:04:56 +13:00
shimon f64d0ab8a8 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	composer.lock
	src/Appwrite/Migration/Migration.php
2023-11-05 17:03:13 +02:00
Bradley Schofield 23631f8282 Update specs 2023-11-02 17:12:08 +00:00
Bradley Schofield b15dac16c8 Revert "Remove Mock API"
This reverts commit 2d045335ff.
2023-11-02 17:05:51 +00:00
Bradley Schofield 2d045335ff Remove Mock API 2023-11-02 17:05:31 +00:00
loks0n aeb152c5de chore: update specs 2023-11-02 12:29:05 +00:00