1
0
Fork 0
mirror of synced 2024-06-29 19:50:26 +12:00
Commit graph

3423 commits

Author SHA1 Message Date
Bradley Schofield 559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
Christy Jacob 2f93dcc4df
Merge pull request #7547 from appwrite/feat-certificate-health-check
Add health certificate validity endpoint
2024-02-06 22:31:07 +05:30
Christy Jacob 4dee937e36
Update app/config/variables.php 2024-02-06 22:26:47 +05:30
Khushboo Verma fb127270ce Add test for empty domain 2024-02-06 16:04:58 +05:30
Khushboo Verma 11ceeff5ca Add health certificate validity endpoint 2024-02-06 15:15:03 +05:30
Jake Barnby 16e0f6d21f
Merge branch '1.5.x' into feat-rc-sdks 2024-02-06 02:25:09 +13:00
Jake Barnby 987b02083c
Array instead of JSON 2024-02-06 02:22:25 +13:00
Jake Barnby 0a72b37b3e
Fix session response model 2024-02-06 02:17:04 +13:00
Jake Barnby 6c17a9ef95
Update generator and deploy RC SDKs 2024-02-06 01:40:51 +13:00
Jake Barnby 7ce01deec3
Fix console enum specs 2024-02-06 00:39:52 +13:00
Khushboo Verma 8ed5489d9c Added env variable to variables.php and compose.phtml 2024-02-05 16:11:37 +05:30
Khushboo Verma e8523e38f7 Merge branch '1.5.x' into feat-block-countries 2024-02-05 13:26:52 +05:30
Jake Barnby 15f433794f
Add missing enum cases 2024-02-05 20:25:34 +13:00
Jake Barnby c193260335
Fix usage enums 2024-02-05 19:32:05 +13:00
shimon af2b640948 updates 2024-02-04 10:33:04 +02:00
shimon a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby 68931c8672
Merge pull request #7538 from appwrite/fix-spec-generation
Fix spec generation
2024-02-03 04:04:00 +13:00
Jake Barnby 94d82c75c0
Update specs 2024-02-03 03:41:23 +13:00
Jake Barnby f14c0cc0aa
Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2024-02-03 03:35:14 +13:00
Jake Barnby 38f93a3e89
Add session ID + internal ID to targets 2024-02-03 03:06:23 +13:00
Khushboo Verma 52c9109685 Improve error message 2024-02-02 19:35:35 +05:30
Khushboo Verma 7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
Torsten Dittmann db321db0fb fix: code review 2024-02-02 13:42:15 +01:00
Torsten Dittmann 75fc59931a Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-02 13:30:11 +01:00
Jake Barnby 0e8e455903
Fix spec generation 2024-02-02 23:54:34 +13:00
Jake Barnby 499f0a53ea
Update to standard namespacing for enums 2024-02-02 17:53:19 +13:00
shimon a254bb7edb Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 2024-02-01 17:13:38 +02:00
Khushboo Verma d3b002a48e Merge branch '1.5.x' into feat-block-countries 2024-02-01 17:49:14 +05:30
Torsten Dittmann ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00
shimon 350d72eb1f updates 2024-02-01 12:21:50 +02:00
loks0n d84cfab244 feat: remove users.createSession 2024-02-01 10:21:38 +00:00
Torsten Dittmann 3f688a2aa7 fix: remove some leftovers 2024-01-30 16:09:58 +01:00
Khushboo Verma f4426d553c Throw 451 exception 2024-01-29 16:49:13 +05:30
Jake Barnby 61dd4a123c
Remove descriptions 2024-01-29 19:29:58 +13:00
Damodar Lohani 215a139e87 prevent console user deletion before deleting their team 2024-01-28 02:10:14 +00:00
Christy Jacob 7e444b037d
Merge pull request #7482 from appwrite/feat-improve-cname-logging
Feat: CNAME validation logs
2024-01-26 19:08:26 +04:00
Bradley Schofield 73b1837d66 Remove HealthFailedJobs Model 2024-01-26 09:41:30 +00:00
Jake Barnby d405106aaa Throw on enable if provider credentials are missing instead of ignoring 2024-01-25 17:59:26 +01:00
Jake Barnby 7106131545
Merge branch '1.5.x' into feat-maintenance-delete-expired-targets 2024-01-26 00:26:29 +13:00
Bradley Schofield 26d8278a89 Merge branch 'feat-impl-queue-retry' into feat-queue-failed-health-endpoints 2024-01-24 18:00:51 +00:00
Torsten Dittmann 672b2d3cf7 chore: bump console version 2024-01-24 18:52:53 +01:00
Torsten Dittmann 9070dce6ac Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 16:32:12 +01:00
Torsten Dittmann d087a76329
Merge branch '1.5.x' into sync-main-with-1.5.x 2024-01-24 12:06:22 +01:00
Christy Jacob 6f52b5f7a1
Merge pull request #7475 from appwrite/fix-certificate-mail-branding
Fix: Certificate email style
2024-01-24 14:47:21 +04:00
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Matej Bačo 5bd106afaf Implement better cname validation logging 2024-01-23 15:40:32 +00:00
Matej Bačo 52786b8273 PR review changes 2024-01-23 10:35:47 +00:00
Matej Bačo 89f778014a Fix invalid specs 2024-01-23 09:27:25 +00:00
Matej Bačo 187165f397 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-23 09:12:22 +00:00
Matej Bačo 8a05b634fe Merge remote-tracking branch 'origin/1.5.x' into fix-certificate-mail-branding 2024-01-23 09:04:20 +00:00
Matej Bačo e26a9d17cb PR review changes 2024-01-23 09:03:18 +00:00
Christy Jacob 3c3c34add9
Merge pull request #7474 from appwrite/fix-email-image-endpoint
Fix: Email image endpoints
2024-01-23 00:05:01 +04:00
Torsten Dittmann f1293d2636 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 18:32:22 +01:00
Torsten Dittmann a9f1e4d78d
feat: delete account (#7392)
* feat: delete account

* fix: new endpoint only for console sdk

* fix: hide endpoint from public sdks

* fix: account delete scope
2024-01-22 18:29:10 +01:00
Matej Bačo 0c7a69e665 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 16:05:38 +00:00
Matej Bačo 871c29d1a5 PR review changes 2024-01-22 15:53:11 +00:00
Christy Jacob cfc25288b5
Merge pull request #7422 from appwrite/feat-email-otp
Feat: Email OTP
2024-01-22 19:18:39 +04:00
Matej Bačo 05a83d6d1b Merge branch 'feat-email-otp' of https://github.com/appwrite/appwrite into feat-email-otp 2024-01-22 15:02:51 +00:00
Matej Bačo fc3fa8f1d7 PR review changes 2024-01-22 15:02:33 +00:00
Matej Bačo f7e9d8fc19
Update app/config/locale/translations/en.json
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-22 15:57:06 +01:00
Matej Bačo cba974805d PR review changes 2024-01-22 14:30:11 +00:00
Christy Jacob 3656be3da5
Merge pull request #7452 from appwrite/feat-session-renewal
Feat: session renewal
2024-01-22 18:28:55 +04:00
Torsten Dittmann 185e4258df Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 14:45:07 +01:00
Matej Bačo 33e1d61bd9 Fix missing languages 2024-01-22 13:18:19 +00:00
Matej Bačo 58fa2efad2 Translate new keys 2024-01-22 11:15:24 +00:00
Matej Bačo 724b8c8098 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 10:13:28 +00:00
Matej Bačo 4366f8e5d8 Remove incorrect translations, improve script 2024-01-22 10:01:02 +00:00
Khushboo Verma 5e3212bbff Rename redirect to path 2024-01-22 14:26:40 +05:30
Khushboo Verma 506e8c658d Refactored url construction 2024-01-22 13:48:19 +05:30
Matej Bačo 32cc186ea6 Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal 2024-01-22 08:17:52 +00:00
shimon 370704fafd moved cache collection to $commonCollections collection config 2024-01-21 10:47:00 +02:00
Matej Bačo 933b64001c Improve design 2024-01-20 12:49:23 +00:00
Matej Bačo 5e0c3c509d WIP: Certificate branded mail 2024-01-20 12:06:52 +00:00
Matej Bačo 284c1746eb Add proper endpoint to email images 2024-01-20 11:05:44 +00:00
Matej Bačo df9bc6df56 Implement OTP email endpoint + tests 2024-01-19 13:42:26 +00:00
Matej Bačo 31a67a7667 Merge remote-tracking branch 'origin/1.5.x' into feat-email-otp 2024-01-19 12:12:07 +00:00
Matej Bačo f2291f1686 Add OTP translations 2024-01-19 12:11:20 +00:00
Khushboo Verma a134ca7efd Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-19 17:12:14 +05:30
Khushboo Verma 3e5443f127 Add env variables to mails worker instead of webhooks worker 2024-01-19 17:09:48 +05:30
Jake Barnby 4c10e78e42
Merge remote-tracking branch 'origin/1.5.x' into feat-maintenance-delete-expired-targets
# Conflicts:
#	app/init.php
2024-01-19 16:56:51 +13:00
Jake Barnby 59c4f5b9e4
Merge pull request #7431 from appwrite/feat-message-scheduling
Feat message scheduling
2024-01-19 16:55:49 +13:00
Jake Barnby c5c832eff6
Merge pull request #7382 from appwrite/feat-search-subscribers
Add search param for list subscribers endpoint
2024-01-19 16:31:48 +13:00
Jake Barnby d292562090
Throw if status scheduled and no schedule set 2024-01-19 16:16:24 +13:00
Jake Barnby a3096bc209
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
# Conflicts:
#	app/controllers/api/messaging.php
2024-01-19 15:54:21 +13:00
Bradley Schofield d3b8ce704e Add failed queue endpoint 2024-01-18 16:18:49 +00:00
Torsten Dittmann 442451aa42 feat: mfa console 2024-01-18 16:04:18 +01:00
Torsten Dittmann 057496dbaa feat: mfa users endpoints 2024-01-18 14:56:58 +01:00
Torsten Dittmann 445e42fdb2 chore: release console sdk 2024-01-18 13:50:35 +01:00
shimon 554bc89cb5 sync config::collections against main 2024-01-18 14:14:24 +02:00
shimon b08e3d4e7b sync config::collections against main 2024-01-18 14:12:00 +02:00
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