Commit Graph
1554 Commits
Author SHA1 Message Date
Steven Nguyen 70a3820009 Remove unused mail vars 2023-10-26 16:23:58 -07:00
Prateek Banga 5a9b1f0c24 removes provider from topics 2023-10-26 19:44:06 +05:30
loks0n 49425fb8fc test: fix 2023-10-26 15:04:47 +01:00
prateek banga fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
loks0n 3a9202a46b chore: christy feedback 2023-10-25 13:20:29 +01:00
shimon 4c6976488c clean up 2023-10-25 15:06:54 +03:00
shimon b7675df9b9 usage workers 2023-10-25 11:38:44 +03:00
shimon 9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
loks0n 1343d4851a Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-23 09:10:57 +01:00
prateek banga 161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
shimon 593e5ab316 some fixes 2023-10-17 22:08:01 +03:00
shimon 94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Yatharth Verma 96f389cee5 merge 1.4.x changes to my branch 2023-10-14 11:57:40 +05:30
loks0n 250e9ae9f7 chore: cleanup pr 2023-10-13 16:10:55 +01:00
loks0n 63d3a2bc73 chore: revert abuse-key changes 2023-10-13 11:08:25 +01:00
loks0n 81c4a9bbd5 chore: fmt 2023-10-13 11:05:14 +01:00
loks0n 8ab429b92f feat: replace session confirmation endpoints 2023-10-12 14:38:32 +01:00
loks0n b299ed056e chore: rename $sessionSecret 2023-10-11 17:07:02 +01:00
loks0n f9d6ebd3a0 docs: add descriptions to universal token endpoints 2023-10-11 16:31:32 +01:00
loks0n e41fab769f fix: edge cases 2023-10-11 13:20:25 +01:00
loks0n c343d7550f chore: fmt 2023-10-10 14:41:02 +01:00
loks0n c30c024805 test: fix magic url assertions 2023-10-10 14:36:53 +01:00
loks0n a88175fc46 fix: unhash session responses 2023-10-10 13:30:42 +01:00
loks0n c4e82e4191 fix: edge cases 2023-10-09 14:49:07 +01:00
Prateek Banga d842191cc6 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-06 03:53:16 +05:30
Prateek Banga d5cc214546 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x 2023-10-06 03:44:36 +05:30
Prateek Banga 22d445587e review changes 2023-10-05 16:57:48 +05:30
loks0n e94631f730 fix: token verification 2023-10-05 11:18:19 +01:00
Prateek Banga 48b91e39a8 review changes 2023-10-04 16:15:59 +05:30
shimon 429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
shimon 2bb4d8fb89 sync with 1.4 2023-10-02 17:02:48 +03:00
shimon b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
loks0n 739be813e0 feat: oauth ssr token flow 2023-09-28 13:45:52 +01:00
loks0n 5ed2da4cf1 feat: add userId to abuse-keys 2023-09-28 11:33:01 +01:00
loks0n b8f2c1deec chore: revert oauth workaround 2023-09-28 11:26:44 +01:00
loks0n ef93c59698 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-09-28 11:21:26 +01:00
shimon dcf0107a79 sync with master 2023-09-27 20:10:21 +03:00
shimon c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge 86f0e6008c Merge branch 'master' into sentence-case 2023-09-27 11:11:58 -04:00
Prateek Banga 234f7f003b updated test cases for msg91 provider, moves worker to use provider from settings 2023-09-27 18:58:00 +05:30
Yatharth Verma 6b47999120 fix conflicts 2023-09-22 22:56:07 +05:30
Yatharth Verma f07f246f8d fix conflicts 2023-09-22 22:53:41 +05:30
Prateek Banga 06a05a3358 adds param messageId in send an email endpoint, tokenId as messageId in create phone session, membershipId as messageId in create team membership 2023-09-21 21:17:15 +05:30
Prateek Banga 975b444761 fix test cases and bug fix in messaging worker 2023-09-20 20:51:03 +05:30
Prateek Banga a2e34b5b64 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-20 16:59:07 +05:30
Prateek Banga 350549db7d Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-14 02:17:34 +05:30
Prateek Banga 15dd6863dd removes comments 2023-09-14 01:07:30 +05:30
Prateek Banga f8c9c2f39b fixes manual internal id insertion 2023-09-14 00:48:50 +05:30
prateek banga 38d81c058b lint fix 2023-09-05 23:10:33 +05:30
prateek banga 78a53aee37 adds messaging event and updates messaging worker 2023-09-05 22:40:48 +05:30