Commit Graph
4107 Commits
Author SHA1 Message Date
Khushboo Verma 842045874e Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-07 00:27:06 +05:30
Khushboo Verma fb9e393c97 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-04 16:42:47 +05:30
Steven Nguyen d2d36bbfae Add changes from previous console platforms variable PR
See https://github.com/appwrite/appwrite/pull/4581
2024-01-03 20:38:42 +00:00
Steven Nguyen 06e385b346 Add changes from previous console platforms variable PR
See https://github.com/appwrite/appwrite/pull/4581
2024-01-03 19:30:42 +00:00
Utkarsh Ahuja a74e5cc2c6 Merge branch '1.5.x' into feat-zoho-oauth 2024-01-03 11:24:24 +05:30
Utkarsh Ahuja d18d187a07 fix: base changed 2024-01-03 11:20:59 +05:30
Damodar Lohani 640ab7bf87 Merge branch 'main' into to-sync-with-main 2024-01-03 00:11:42 +00:00
Steven Nguyen 50aab32f0f Add search param for list subscribers endpoint 2024-01-02 23:39:46 +00:00
Torsten Dittmann a29cef2334 feat: console hostname env variable 2024-01-02 19:53:20 +00:00
shimon 99f1543f1b Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	Dockerfile
	app/console
	app/init.php
	composer.lock
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/Hamster.php
2024-01-02 11:49:23 +02:00
Utkarsh Ahuja 3e0f63e499 Merge branch 'main' into feat-zoho-oauth 2023-12-31 17:11:26 +05:30
Eldad A. Fux 4f7b1748f4 Merge pull request #7276 from fanksin/patch-1
Update tr.json
2023-12-31 00:24:30 +01:00
Torsten Dittmann 9b2fbc5c52 feat: console hostname env variable 2023-12-29 21:52:50 +01:00
Utkarsh Ahuja d9319aa888 feat: added zoho oauth metadata 2023-12-23 17:42:34 +05:30
Matej Bačo bb0be27007 Update specs 2023-12-22 09:58:25 +00:00
Matej Bačo b3729507de Add cache to console collection 2023-12-19 18:05:39 +01:00
loks0n 2c5c799d13 fix: add account session description 2023-12-19 14:24:49 +00:00
Damodar Lohani 5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00:00
Khushboo Verma 557565b949 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-15 01:46:47 +05:30
Jake Barnby 5135262b79 Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
2023-12-15 02:41:46 +13:00
Torsten Dittmann 9bc52e8900 fix: commatation in email html 2023-12-13 18:08:36 +01:00
Torsten Dittmann 7645d6c34a fix: email templates 2023-12-13 17:46:14 +01:00
loks0n 0e25d3e1df fix: scopes 2023-12-13 10:25:20 +00:00
Serhat Aksakal e56b30e6a6 Update tr.json 2023-12-13 12:10:44 +03:00
Torsten Dittmann 063db1e2bf feat: add execution aggregation to project usage 2023-12-12 18:48:21 +01:00
loks0n b2f118d23b fix: specs 2023-12-12 15:42:22 +00:00
loks0n 453c1928ee fix: teams tests 2023-12-11 20:56:59 +00:00
Khushboo Verma ff7cfc6602 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-12 00:17:21 +05:30
loks0n f0d7312bd3 feat: create session method 2023-12-11 16:24:24 +00:00
Torsten Dittmann 3485373cd7 chore: generate specs 2023-12-11 16:40:19 +01:00
Torsten Dittmann 2657247b50 bump: console version 2023-12-11 16:37:14 +01:00
Torsten Dittmann b87231153e chore: bump console version number 2023-12-10 21:38:34 +01:00
Torsten Dittmann f8878ac039 chore: generate specs 2023-12-10 21:29:32 +01:00
Prateek Banga b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
Torsten Dittmann 83c411e5fd fix: some fixes 2023-12-07 10:05:37 +01:00
Prateek Banga 54f574906c review changes 2023-12-05 12:22:32 +01:00
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