1
0
Fork 0
mirror of synced 2024-08-20 12:41:26 +12:00
Commit graph

3383 commits

Author SHA1 Message Date
shimon
90cf28389c sync config::collections against main 2024-01-18 14:10:57 +02:00
Torsten Dittmann
1ab3dc2236 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-18 13:10:15 +01:00
Khushboo Verma
e9aab8d9ee Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-18 15:21:55 +05:30
Jake Barnby
de96e0f3dc
Update ruby 2024-01-18 20:07:39 +13:00
Matej Bačo
1948ecf9a4 Update specs 2024-01-17 13:21:10 +00:00
Matej Bačo
f64989dd13 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-17 11:26:16 +00:00
loks0n
39a351adc1 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-17 11:22:45 +00:00
Matej Bačo
20322589dd Improve SMTP test email design 2024-01-17 11:22:08 +00:00
loks0n
0092af7ac6 chore: rename new scopes 2024-01-17 11:17:03 +00:00
Jake Barnby
58f87ef27f
Fix account target route not added to specs 2024-01-17 22:21:15 +13:00
Jake Barnby
47c4272686
Add latest specs for pulling in SDK generator 2024-01-17 22:02:07 +13:00
Jake Barnby
b74733102e
Merge branch '1.5.x' into feat-message-scheduling 2024-01-17 15:51:29 +13:00
Khushboo Verma
c9cd4c126c Move media query to base template 2024-01-16 20:43:00 +05:30
Matej Bačo
bb87ca3869 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-16 15:04:20 +00:00
Khushboo Verma
2bc50b2cee Send email to all members of the org 2024-01-16 19:09:33 +05:30
Khushboo Verma
5f58dd8b9f Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts 2024-01-16 17:23:36 +05:30
Khushboo Verma
94a45c7829 Changed the name to email-base-styled.tpl 2024-01-16 17:22:27 +05:30
loks0n
77b1762514 chore: fix token event 2024-01-16 10:40:49 +00:00
Khushboo Verma
206a268ff8 Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts 2024-01-16 13:53:25 +05:30
Khushboo Verma
499920fc63 email-base for normal and email-base-branded for dev emails 2024-01-16 13:52:33 +05:30
Khushboo Verma
302a552d7f Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts 2024-01-16 13:36:33 +05:30
Khushboo Verma
278f41f0fb Updated templates 2024-01-16 13:35:31 +05:30
Matej Bačo
4f5755e7d0 Implement session renewal 2024-01-15 13:43:21 +00:00
Khushboo Verma
5904b17b5c Design changes 2024-01-15 17:07:12 +05:30
Matej Bačo
ffa4ad09ec Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-15 11:07:32 +00:00
Matej Bačo
d5be48a846 Finish custom SMTP feature 2024-01-15 10:18:17 +00:00
Khushboo Verma
882e049ac9 Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts 2024-01-15 13:05:05 +05:30
Jake Barnby
4cc6d4161d
Merge branch 'feat-message-scheduling' into feat-maintenance-delete-expired-targets 2024-01-15 20:33:38 +13:00
Jake Barnby
4d9fb1d687
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
# Conflicts:
#	src/Appwrite/Platform/Workers/Messaging.php
2024-01-15 20:07:01 +13:00
Jake Barnby
772617f231
Mark invalid targets on message send then delete on maintenance sweep 2024-01-15 19:52:40 +13:00
Jake Barnby
e21e2c70ea
Remove redundant index 2024-01-15 18:18:09 +13:00
loks0n
521cb963a5 fix: hide oauth in specs 2024-01-13 10:09:02 +00:00
loks0n
56fe939713 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-13 09:55:44 +00:00
Khushboo Verma
088ed95f69 Force background color to white for now 2024-01-13 01:18:20 +05:30
Khushboo Verma
c2ab8a1472 Addressed PR comments 2024-01-13 01:08:18 +05:30
Khushboo Verma
77ded21d20 Merge branch '1.5.x' into feat-migrate-cloud-templates 2024-01-13 00:54:49 +05:30
loks0n
642582c283 docs: fix links to create email password session 2024-01-12 17:39:44 +00:00
Matej Bačo
e9de0332cc
Remove passwordAgain (#7441) 2024-01-12 14:33:10 +01:00
Torsten Dittmann
e2a0c2d825 sync: with 1.5.x 2024-01-12 14:04:31 +01:00
loks0n
487376afd6 chore: oauth token param before scopes 2024-01-12 12:08:45 +00:00
Khushboo Verma
a9ccfa1ab0 Added cloud base templates to appwrite/appwrite 2024-01-12 14:43:17 +05:30
Khushboo Verma
d443602cbc resolve merge conflicts 2024-01-12 01:55:32 +05:30
Khushboo Verma
377751f4a4 Remove extra text generated by GPT for la.json 2024-01-12 01:38:04 +05:30
Khushboo Verma
807d295303 Resolve merge conflicts 2024-01-11 22:49:33 +05:30
Khushboo Verma
5f42326514 Added sms translation key for all languages 2024-01-11 20:24:07 +05:30
Khushboo Verma
dc0b0c8ab7 Merge branch '1.5.x' into fix-otp-template 2024-01-11 18:24:45 +05:30
Khushboo Verma
c84af966df Make OTP template more contextual 2024-01-11 18:20:01 +05:30
loks0n
269d70e9ca chore: specs 2024-01-11 11:56:03 +00:00
Matej Bačo
34bac3dc5c
Merge branch '1.5.x' into feat-security-phrases 2024-01-11 11:54:16 +01:00
Matej Bačo
70d57b17a0 Fix copies 2024-01-11 10:36:31 +00:00
Matej Bačo
a2856f6acc Update copy & AI translations 2024-01-11 10:23:25 +00:00
Matej Bačo
fe88829bf1 Update specs files 2024-01-11 10:10:00 +00:00
Jake Barnby
322dae626a
Merge branch '1.5.x' into feat-message-scheduling 2024-01-11 22:29:49 +13:00
Matej Bačo
e485953da6 AI translations 2024-01-11 08:49:52 +00:00
Matej Bačo
e0db651240 Revert "Translated security phrase copy with AI"
This reverts commit b72dd35f45.
2024-01-11 08:25:09 +00:00
Jake Barnby
5827c52372
Merge branch '1.5.x' into feat-search-subscribers 2024-01-11 20:04:17 +13:00
Jake Barnby
320919fef2
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x 2024-01-11 19:59:59 +13:00
Jake Barnby
a40c6fce64
Add resource collection to schedules 2024-01-11 16:00:48 +13:00
Jake Barnby
9063b4e77f
Fix controller scheduling, ensuring created when message updated and none exists 2024-01-11 15:58:24 +13:00
Jake Barnby
513ed9de05
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp
# Conflicts:
#	app/controllers/api/messaging.php
#	tests/e2e/Services/Messaging/MessagingBase.php
2024-01-11 13:06:15 +13:00
Torsten Dittmann
07f44593c0 feat: delete authenticator endpoint 2024-01-10 17:22:32 +01:00
Matej Bačo
b72dd35f45 Translated security phrase copy with AI 2024-01-10 15:01:42 +00:00
Matej Bačo
931efe24a9 Added security phrase to magic URL 2024-01-10 14:52:32 +00:00
Khushboo Verma
f6830f4e85 Resolve merge conflict 2024-01-10 19:38:55 +05:30
Khushboo Verma
7393bfc244 Use phtml instead of translation files for webhook email 2024-01-10 19:35:25 +05:30
Matej Bačo
4e73c76538 Add OTP email template 2024-01-10 13:28:49 +00:00
Matej Bačo
788fa04606 Improve magic URL design 2024-01-10 11:33:55 +01:00
loks0n
94e45da5c7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-10 10:15:29 +00:00
Khushboo Verma
ef88ad6514 Updated the email 2024-01-10 15:03:36 +05:30
Torsten Dittmann
670b719ba9 fix: generate specs 2024-01-10 00:06:43 +01:00
Khushboo Verma
b3e87d7de8 Formatted email as per design 2024-01-10 01:55:36 +05:30
loks0n
332bd532e1 fix: specs 2024-01-09 19:04:47 +00:00
loks0n
428910a176 chore: specs 2024-01-09 16:42:25 +00:00
Matej Bačo
c8b544da03 Improve button design 2024-01-09 16:06:24 +00:00
Torsten Dittmann
bc384cac8d fix: response model 2024-01-09 16:47:43 +01:00
Matej Bačo
beeb643c66 Add all translations 2024-01-09 15:39:38 +00:00
Torsten Dittmann
5a97c9104c fix: collections merge conflict 2024-01-09 16:36:49 +01:00
Torsten Dittmann
cb25d5209e fix: di 2024-01-09 16:30:18 +01:00
loks0n
d4ba4bf969 chore: update specs 2024-01-09 15:04:32 +00:00
Matej Bačo
86158838a1 Magic URL improvements 2024-01-09 12:23:13 +00:00
Torsten Dittmann
d344ba46c4
feat: account delete (#7415)
* feat: account delete

* chore: run specs

* release: console sdk

* chore: run formatter

* tests: fix project tests
2024-01-09 12:58:36 +01:00
Khushboo Verma
5588dfca8b WIP: Send email to user when webhook is stopped 2024-01-09 01:25:24 +05:30
Torsten Dittmann
b8e6de7516 chore: generate specs 2024-01-08 13:24:52 +01:00
Torsten Dittmann
7c66481406 fix: collections for mfa 2024-01-08 13:22:33 +01:00
loks0n
5c803f6eff Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-08 11:41:55 +00:00
Torsten Dittmann
bbf6480c15 fix: merge conflicts 2024-01-08 12:31:46 +01:00
Torsten Dittmann
208abe17e7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-08 12:20:08 +01:00
shimon
03f2041913 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 2024-01-07 18:09:48 +02:00
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
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 Banga
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
Bradley Schofield
e158d134b0 Merge branch 'main' into feat-improve-migration-validations 2023-11-02 10:48:38 +00:00
loks0n
af0d689aff feat: sessions scope 2023-10-31 15:05:02 +00:00
loks0n
4559cf77e9 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-31 12:08:48 +00:00
prateek banga
a01d361886 review changes 2023-10-31 01:12:31 +05:30
prateek banga
06daa544e8 review changes 2023-10-30 23:37:57 +05:30
Christy Jacob
106f4cfc45
Merge pull request #6487 from appwrite/fix-unique-in-errors
Updated error message to not user magic strings
2023-10-27 20:13:16 +04:00
loks0n
91825afaf9 chore: refactor public scope 2023-10-26 15:23:38 +01:00
Prateek Banga
5a9b1f0c24 removes provider from topics 2023-10-26 19:44:06 +05:30
prateek banga
c2cd544948 review changes 2023-10-26 13:46:45 +05:30
Prateek Banga
34b3ed68ee adds total count for subscribers in topics model 2023-10-26 12:37:39 +05:30
prateek banga
f6f4397aab Merge branch 'providers-from-attribute' of https://github.com/appwrite/appwrite into review-changes-1.5.x 2023-10-25 23:55:45 +05:30
prateek banga
fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
shimon
4c6976488c clean up 2023-10-25 15:06:54 +03:00
Khushboo Verma
17de0d1ea7 Updated the error code for unsupported protocol 2023-10-25 15:55:46 +05:30
shimon
9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
Torsten Dittmann
fbcbd0d430 feat: realtime error handling 2023-10-24 14:32:22 +02:00
prateek banga
6c260223ba Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 15:00:22 +05:30
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
prateek banga
db9e7b0199 review changes 2023-10-20 13:28:23 +05:30
Christy Jacob
01e842782f
Merge branch '1.4.x' into feat-1.4.6-release-prep 2023-10-19 05:28:02 -04:00
Christy Jacob
18dc8749d5 chore: update health API 2023-10-19 09:25:38 +00:00
Jake Barnby
b5cdbb50c7
Use fixed message 2023-10-19 17:12:05 +13:00
Jake Barnby
354211950f
Add timeout test 2023-10-19 17:06:57 +13:00
Jake Barnby
389d367fca
Set hard timeouts for API dbs 2023-10-19 15:32:45 +13:00
Steven Nguyen
6d040beb36
Update specs for 1.4.6
$ diff old.json new.json
4c4
<     "version": "1.4.5",
---
>     "version": "1.4.6",
8132c8132
<     "/health/queue/databases": {
---
>     "/health/queue/databases/{databaseId}": {
8164c8164,8175
<         "security": [{ "Project": [], "Key": [] }]
---
>         "security": [{ "Project": [], "Key": [] }],
>         "parameters": [
>           {
>             "name": "databaseId",
>             "description": "Database for which to check the queue size",
>             "required": false,
>             "type": "string",
>             "x-example": "[DATABASE_ID]",
>             "default": "database_db_main",
>             "in": "path"
>           }
>         ]
2023-10-18 17:42:27 -07:00
Bradley Schofield
23a1da58fb Update Status Codes 2023-10-16 11:57:17 +01:00
Yatharth Verma
1489f77499 fix changes suggested by steven and also fixed some bugs came after merging with 1.4.x 2023-10-14 12:45:29 +05:30
Yatharth Verma
96f389cee5 merge 1.4.x changes to my branch 2023-10-14 11:57:40 +05:30
Steven Nguyen
5956c4c247
Merge branch 'main' into fix-unique-in-errors 2023-10-13 12:03:23 -07:00
Bradley Schofield
5274f1234b Merge branch 'main' into feat-improve-migration-validations 2023-10-13 16:23:25 +01:00
Torsten Dittmann
f5d0ebeb75 docs: fix broken links 2023-10-13 15:59:28 +02:00
Torsten Dittmann
3778939605 fix: relative links to absolute 2023-10-13 15:43:23 +02:00
Torsten Dittmann
8e12a07267 Merge branch 'main' of https://github.com/appwrite/appwrite into fix-specs 2023-10-13 15:42:09 +02:00
Prateek Banga
feac25f401 adds already sent exception in update message 2023-10-13 18:35:49 +05:30
Torsten Dittmann
ce0024d97a
Merge pull request #5290 from DH-555/patch-4
Fix: spanish translations (emails)
2023-10-13 13:36:28 +02:00
Vincent (Wen Yu) Ge
291654bee9 Rename ID -> Keys for attribute and index for consistency 2023-10-11 19:29:04 +00:00
Prateek Banga
17ba6355e0 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-10-10 19:52:19 +05:30
Prateek Banga
bb52647366 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-10 19:06:39 +05:30
Prateek Banga
1e5a2a78aa Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.5.x-with-1.4.x 2023-10-10 17:46:44 +05:30
Steven Nguyen
9d3972f43f
Bump API specs 2023-10-09 16:52:11 -07:00
Bradley Schofield
9cb1cf418c Improve Error Handling and Add more Validation 2023-10-06 17:02:01 +01:00
Prateek Banga
a92390dda2 review changes 2023-10-06 19:23:46 +05:30
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
David
82bde7f7e9
Merge branch 'main' into patch-4 2023-10-05 17:43:27 +02:00
Vincent (Wen Yu) Ge
e5c828fbbd Attribute keys must be unique and can't use unique() 2023-10-04 13:56:18 +00:00
Vincent (Wen Yu) Ge
c12999dc74 Remove extra ` tags 2023-10-04 13:52:19 +00:00
Vincent (Wen Yu) Ge
a2c9c8b82e Updated error message to not user magic strings 2023-10-04 13:49:45 +00:00
Prateek Banga
5891872fad Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-10-04 17:27:56 +05:30
Prateek Banga
48b91e39a8 review changes 2023-10-04 16:15:59 +05:30
Jake Barnby
b8cfac90e2
Update specs 2023-10-04 15:13:43 +13:00
Torsten Dittmann
7b5ee34b68 fix: more links 2023-10-02 14:32:43 +02:00
Torsten Dittmann
71775c76b1 fix: specs relative links 2023-10-02 14:26:54 +02:00
Torsten Dittmann
e0dcf3f8b1 fix: relative links 2023-10-02 13:51:24 +02:00
Torsten Dittmann
4b03d6a361 fix: http links with https 2023-10-02 13:47:35 +02:00
Torsten Dittmann
f230419614 chore: fix spec links 2023-10-02 13:42:44 +02:00
Steven Nguyen
faf69a7a4e
Generate 1.4.x and latest specs 2023-09-27 16:42:04 -07:00
Christy Jacob
c93780cb27 chore: generate new specs 2023-09-27 21:37:34 +00:00
Prateek Banga
90352c57ac Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-27 18:58:18 +05:30
Prateek Banga
234f7f003b updated test cases for msg91 provider, moves worker to use provider from settings 2023-09-27 18:58:00 +05:30
Prateek Banga
63bd4d6daf Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-27 16:57:07 +05:30
Prateek Banga
a0858ccc4e adds message description, options to mailgun provider 2023-09-26 13:12:44 +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
Christy Jacob
e35b07bf0a
Merge pull request #6268 from appwrite/fix-download-deployment-desc
Add Description for Download Deployment
2023-09-22 06:24:48 -04:00
Prateek Banga
e00b273577 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-21 22:19:30 +05:30
Prateek Banga
3ebcfe548d Adds get message endpoint 2023-09-21 16:26:53 +05:30
Christy Jacob
864092d81c
Merge pull request #6272 from appwrite/feat-router-protection
Feat: router protection
2023-09-21 05:13:34 -04:00
Prateek Banga
0510de5eab Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-20 23:37:35 +05:30
Prateek Banga
35d842171c review changes 2023-09-20 23:37:10 +05:30
Prateek Banga
87011af914 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-20 23:00:48 +05:30
Prateek Banga
2fd7467e2a fix graphQL test 2023-09-20 22:59:47 +05:30
Prateek Banga
afef225339 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-20 17:39:36 +05:30
Prateek Banga
f9030132a5 messaging worker logic to send message to providers batch limit 2023-09-20 17:38:29 +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
Matej Bačo
4c18f9f0e7 Document router protection env var 2023-09-19 09:39:28 +02:00