CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-08 16:06:02 +12:00
Code Issues Projects Releases Wiki Activity
20249 commits 208 branches 384 tags 335 MiB
Commit graph

3377 commits

Author SHA1 Message Date
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
Matej Bačo 8926d24a0d One more env var rename 2023-09-19 09:35:32 +02:00
Matej Bačo d87dbad768 PR review changes 2023-09-19 09:31:57 +02:00
Matej Bačo 6a7950aa34 Add function domains force https 2023-09-18 12:27:47 +02:00
Bradley Schofield 30b7b9dfae Regenerate Specs 2023-09-18 09:53:40 +01:00
Prateek Banga 25fc64c4ab moves provider to top level in events config 2023-09-15 02:28:32 +05:30
Christy Jacob f8d4d04d2d
Merge pull request #5971 from appwrite/chore-cleanup-dockerfile 
Chore cleanup dockerfile
 2023-09-14 15:50:21 -04:00
Prateek Banga d2ce8155e6 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-15 01:06:17 +05:30
Jake Barnby 316cd4f8f8
Bump CLI, Swift, Apple SDK versions 2023-09-14 15:11:40 -04:00
Christy Jacob 50405f838e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into chore-cleanup-dockerfile 2023-09-14 18:07:53 +00:00
Steven Nguyen 15f54c0dba
Fix the _APP_FUNCTIONS_MAINTENANCE_INTERVAL variable 
* Clarify the description and make it match the other maintenance
  variables.
* Fix the introduction since it was introduced in 1.4.0 and not 1.2.0.
* Fix the default value because it was 1 hour in the previous versions
  and a number that is too low will conflict with a function's timeout.
 2023-09-13 16:23:14 -07:00
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 dbd227ed50 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-09-14 02:13:27 +05:30
prateek banga 4bb611efc4 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-13 17:48:18 +05:30
prateek banga 778056d8e0 Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-13 17:08:37 +05:30
prateek banga f472ae578f Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-13 17:02:56 +05:30
prateek banga 9b6fc440d9 Review changes and adds enabled in providers collection 2023-09-13 16:57:59 +05:30
Jake Barnby 1f9872b398
Merge remote-tracking branch 'origin/1.5.x' into feat-add-messaging-response-models 2023-09-12 15:40:25 -04:00
Prateek Banga d14fbde9e7 removes provider sub query 2023-09-13 00:40:51 +05:30
Prateek Banga 118a50b894 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-12 22:07:17 +05:30
Prateek Banga 720c7300dc Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-12 22:06:31 +05:30
Prateek Banga 68365babd1 Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-12 22:05:45 +05:30
Prateek Banga 9fbad72b08 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-12 22:03:34 +05:30
Prateek Banga 5136724a29 fix default,type index 2023-09-12 22:02:19 +05:30
Prateek Banga b54556d10e Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-12 21:31:45 +05:30
Prateek Banga a69368973b Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-12 21:31:06 +05:30
Prateek Banga 878e56ae7e Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-12 21:24:11 +05:30
Prateek Banga d14a4c2506 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-12 21:23:18 +05:30
Prateek Banga 2f2875e3c0 lint fix 2023-09-12 21:19:21 +05:30
Prateek Banga ba96f71a3f Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-collections-in-config 2023-09-12 21:15:00 +05:30
Prateek Banga b7119a2718 review changes 2023-09-12 21:03:44 +05:30
Prateek Banga cbea4264ea merge master 2023-09-12 20:53:16 +05:30
Prateek Banga 996de004fb Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-11 20:41:52 +05:30
Prateek Banga ddbee0a55b Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-11 20:41:12 +05:30
Prateek Banga 8957640d27 Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-11 20:40:32 +05:30
Prateek Banga 899c962061 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-11 20:30:30 +05:30
Prateek Banga a59cfb6461 review changes 2023-09-11 20:30:21 +05:30
Prateek Banga 32970ba8a0 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-11 19:54:24 +05:30
Prateek Banga 27741644e8 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-11 19:52:48 +05:30
Prateek Banga f4f1aa4b5b review changes and adds missing subqueries 2023-09-11 19:27:45 +05:30
Prateek Banga cf7b63fd2f Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-09 01:19:42 +05:30
Prateek Banga ee0f789e37 udpates deliveryError to be an array type 2023-09-09 01:18:26 +05:30
Christy Jacob da854f36dc chore: update changelog for dart and flutter 2023-09-07 18:33:23 -04:00
Christy Jacob 3d267bb4d9 chore: remove leftovers 2023-09-07 17:38:29 -04:00
Christy Jacob 1e3639bf6d Merge branch 'master' of github.com:appwrite/appwrite into chore-update-sdks 2023-09-07 17:18:42 -04:00
Jake Barnby 410072882d
Fix guests missing global scope 2023-09-07 12:00:53 -04:00
Christy Jacob eb3c237301 Merge branch 'master' of github.com:appwrite/appwrite into 1.4.x 2023-09-07 02:11:43 -04:00
Christy Jacob a1e3d7ba97 chore: generate specs 2023-09-07 02:10:15 -04:00
Christy Jacob 9c01e94d8a chore: generate specs 2023-09-07 02:09:53 -04:00
Christy Jacob 47427972bf fix: test failures 2023-09-07 00:57:23 -04:00
Christy Jacob 1a0054890d chore: bug fix with scopes 2023-09-06 22:02:14 +00:00
Christy Jacob 67698cce88
Merge pull request #6155 from appwrite/fix-unknown-domains 
Fix: Untrusted custom domains + auto-ssl
 2023-09-06 14:09:17 -04:00
Christy Jacob 4ea0541623
Merge pull request #6150 from appwrite/fix-global-vars 
Fix: Global variables
 2023-09-06 13:51:13 -04:00
Christy Jacob db763b180c
Merge pull request #6142 from appwrite/fix-v2-functions 
Fix: v2 functions
 2023-09-06 12:43:51 -04:00
Christy Jacob 8e204f7105
Merge pull request #6153 from appwrite/fix-ai-assistant 
Fix: AI Assistant
 2023-09-06 00:08:27 -04:00
Christy Jacob 53b1c87c6e
Merge pull request #6141 from appwrite/fix-overwrite-executor-variable 
Fix _APP_EXECUTOR_HOST for upgrades
 2023-09-05 19:35:31 -04:00
Steven Nguyen d4f6c5f491
Update the error message for router_domain_not_configured 
Explicitly list the environment variables that need to be configured to
make it clear what needs to be done.
 2023-09-05 11:18:15 -07:00
shimon 45f16e560c sync against master 2023-09-05 21:17:54 +03:00
prateek banga 6aa443454b Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-05 22:58:43 +05:30
prateek banga 597fd965f7 Merge branch 'feat-add-messaging-response-models' of https://github.com/appwrite/appwrite into feat-messages-event-config 2023-09-05 22:57:48 +05:30
prateek banga 45ab78caa7 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-providers 2023-09-05 22:56:37 +05:30
shimon ec93239630 Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-poc 
 Conflicts:
	app/config/collections.php
	app/controllers/api/storage.php
	app/controllers/shared/api.php
	app/init.php
	app/workers/deletes.php
 2023-09-05 19:19:59 +03:00
Matej Bačo f4ada97d1a Allow any hostname, and serve API+Console by default 2023-09-05 17:02:07 +02:00
Matej Bačo ac62641f5a Add assistant scole to console member 2023-09-05 15:55:13 +02:00
Matej Bačo 1a6530fb57 Fix project variables 2023-09-05 10:21:36 +02:00
prateek banga 337839103f Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-05 13:15:12 +05:30
prateek banga 3f95d6abd5 Merge branch 'feat-add-messaging-collections-in-config' of https://github.com/appwrite/appwrite into feat-add-messaging-collections-in-config 2023-09-05 01:34:02 +05:30
prateek banga ea324262e7 updated messaging collectin 2023-09-05 01:33:50 +05:30
Steven Nguyen 3c7c44adda
Fix _APP_EXECUTOR_HOST for upgrades 
As of 1.4.0, the hostname of the executor should be executor rather than
appwrite-executor. The problem is our install command always uses the
existing installation's variable values as the default for the upgrade.
This means the _APP_EXECUTOR_HOST will retain it's old value.

This PR Adds an overwrite key to variables.php to allow overwriting the
variable value regardless of whatever was in the previous installation.
 2023-09-04 11:06:43 -07:00
Matej Bačo 7588a9c4ec Make v2 functions work again 2023-09-04 19:53:25 +02:00
Christy Jacob f4cba83072 chore: update default env variables 2023-09-01 18:46:49 -04:00
Christy Jacob dcdfeed391 Merge branch 'master' of github.com:appwrite/appwrite into chore-update-sdks 2023-09-01 13:25:27 -04:00
Christy Jacob 7f42ca2b7b chore: generate specs 2023-08-31 21:52:28 -04:00
Christy Jacob bf4444b045 chore: update sdks for apwrite 1.4.1 2023-08-31 18:08:24 -04:00
prateek banga 82e165c4c3 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-31 18:33:02 +05:30
prateek banga 1762c81b8d Merge branch 'feat-messages-event-config' into feat-mailgun-provider 2023-08-31 18:32:26 +05:30
prateek banga 0534b11b32 Merge branch 'feat-add-messaging-response-models' into feat-messages-event-config 2023-08-31 18:26:32 +05:30
prateek banga e104e6d0f2 Merge branch 'feat-add-messaging-collections-in-config' into feat-add-messaging-providers 2023-08-31 18:16:48 +05:30
prateek banga 7fd124705c merge master 2023-08-31 18:11:56 +05:30
Jake Barnby 781aa8025a
Fix style typo 2023-08-30 20:39:40 -04:00
Jake Barnby 922332042e
Fix template strings 2023-08-30 20:31:11 -04:00
Jake Barnby f10698aebe
Merge pull request #6073 from appwrite/chore-update-version 
Chore update version
 2023-08-30 16:25:06 -04:00
Jake Barnby 513d913298
Merge remote-tracking branch 'origin/1.4.x' into chore-sync-master 
# Conflicts:
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-latest-console.json
 2023-08-30 16:11:48 -04:00
Jake Barnby e018c29b71
Bump .NET SDK version 2023-08-30 15:48:01 -04:00
Jake Barnby fc3ff188b1
Fix VCS + migrations scopes 2023-08-30 14:44:33 -04:00
Christy Jacob cc8aa27fea feat: update specs 2023-08-30 12:36:47 -04:00
Torsten Dittmann e507fb6715 fix: hide services from server/client sdks 2023-08-30 13:28:43 +02:00
Torsten Dittmann 0427c2e4eb chore: generate 1.4.x specs 2023-08-30 11:19:55 +02:00
Jake Barnby 3f3d518f36
Merge remote-tracking branch 'origin/1.4.x' into feat-git-integration 
# Conflicts:
#	docker-compose.yml
 2023-08-29 14:40:46 -04:00
Jake Barnby cfdc9dff1b
Remove cloud specific config 2023-08-29 14:25:00 -04:00
prateek banga 24eabf29d0 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-29 22:30:02 +05:30
prateek banga 112c7a5133 adds default attribute for providers 2023-08-29 22:29:48 +05:30
Matej Bačo ca40bf6702 Merge branch 'feat-git-integration' into fix-smtp-behaviour 2023-08-29 11:41:15 +02:00
Matej Bačo c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
Torsten Dittmann 4f630e90b3 chore: update specs 2023-08-29 10:56:32 +02:00
Jake Barnby ece93a14e5
Fix install task 2023-08-28 18:09:37 -04:00
prateek banga 491d58f146 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-28 20:42:12 +05:30
prateek banga 379f7b9aa2 fixes subquery attribute in collection config 2023-08-28 20:41:47 +05:30
prateek banga 264f0bd5dd adds subscriber controllers 2023-08-28 20:41:05 +05:30
Matej Bačo 89c9f8da6a Implement proper behaviour for SMTP sender 2023-08-28 14:19:37 +02:00
Bradley Schofield c566843518 Style Changes 2023-08-28 09:35:26 +01:00
Bradley Schofield 82f400d177 Add more HTML back 2023-08-28 09:03:55 +01:00
Bradley Schofield 1f1e7dd397 Remove Testing Bypasses 2023-08-28 05:55:40 +01:00
Bradley Schofield 608b6b3847
Continue work 2023-08-27 23:45:37 +01:00
Matej Bačo 596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
prateek banga 9567bf3943 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-25 15:55:54 +05:30
prateek banga c59887e8fb fixes issue in sub queries 2023-08-25 15:55:04 +05:30