Merge all to 2.x

.env.example

@@ -17,6 +17,7 @@ IMAP_AUTH_SERVER=localhost
 IMAP_AUTH_PORT=143
 IMAP_AUTH_TLS=
 IMAP_AUTH_SIEVE_CONF_HOST=
+IMAP_AUTH_SIEVE_TLS_MODE=true
 
 DEFAULT_SMTP_NAME=
 DEFAULT_SMTP_SERVER=
@@ -28,8 +29,6 @@ USER_CONFIG_TYPE=file
 USER_SETTINGS_DIR=/var/lib/hm3/users
 ATTACHMENT_DIR=/var/lib/hm3/attachments
 
-DISABLE_ORIGIN_CHECK=false
-
 ADMIN_USERS=
 
 COOKIE_DOMAIN=
@@ -74,7 +73,7 @@ ENCRYPT_LOCAL_STORAGE=
 
 DISABLE_IP_CHECK=false
 
-DISABLE_ORIGIN_CHECK=true
+DISABLE_ORIGIN_CHECK=false
 
 ALLOW_EXTERNAL_IMAGE_SOURCES=true
 
@@ -95,7 +94,8 @@ DEFAULT_SETTING_IMAP_PER_PAGE=20
 DEFAULT_SETTING_SIMPLE_MSG_PARTS=false
 DEFAULT_SETTING_PAGINATE_LINKS=true
 DEFAULT_SETTING_MSG_PART_ICONS=true
-DEFAULT_SETTING_TEXT_ONLY=true
+DEFAULT_SETTING_REVIEW_SENT_EMAIL=true
+DEFAULT_SETTING_TEXT_ONLY=false
 DEFAULT_SETTING_SENT_PER_SOURCE=20
 DEFAULT_SETTING_SENT_SINCE='-1 week'
 DEFAULT_SETTING_JUNK_PER_SOURCE=20
@@ -207,4 +207,6 @@ FANCY_LOGIN=false
 #Windows CA certificates
 #Get ON https://curl.se/ca/cacert.pem
 #Depending on your PHP Directory, e.g. "c:\php\extras\ssl\cacert.pem"
-WIN_CACERT_DIR=
+WIN_CACERT_DIR=
+
+JS_EXCLUDE_DEPS=

.github/ISSUE_TEMPLATE.md

@@ -1,13 +1,13 @@
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
 <!--
-Please take a look at the issue templates at
-https://github.com/cypht-org/cypht/issues/new/choose
-before submitting a new issue.
-Following one of the issue templates will ensure maintainers can route your request efficiently.
+Please take a look at the issue templates at https://github.com/cypht-org/cypht/issues/new/choose
+before submitting a new issue. Following one of the issue templates will ensure maintainers can route your request efficiently.
 
 Thanks!
 -->
 
-## Issue
+## 💬 Issue
 <!-- Describe your Issue in detail. -->
 
 <!-- Attach screenshots and drawings if needed. -->

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,16 @@
+---
+name: 🐛 Bug
+about: Create a report to help us improve
+labels: bug
+title: 🐛 [Bug] 
+---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
+## 🐛 Bug
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->
+
+### Version & Environment
+<!-- Paste Git-Commit ID or Tag-Name here -->
+Rev: []
+<!-- Specify your OS and OS Version here if the issue is (most likely) platform dependent. -->
+OS:  []

.github/ISSUE_TEMPLATE/devops.md

@@ -0,0 +1,10 @@
+---
+name: 💥 DevOp
+about: Help us manage our deployed Software.
+labels: devops
+title: 💥 [DevOps]
+---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
+## 💥 DevOps
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->

.github/ISSUE_TEMPLATE/epic.md

@@ -0,0 +1,13 @@
+---
+name: 🌟 Epic
+about: Define a big development Step
+labels: epic
+title: 🌟 [EPIC] 
+---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
+<!-- THIS ISSUE-TYPE IS NOT FOR YOU! -->
+<!-- Proceed only if you know what you are doing - have a chat with Project's Team first -->
+
+## 🌟 EPIC
+<!-- Describe your Epic in detail. Include screenshots and drawings -->

.github/ISSUE_TEMPLATE/feature.md

@@ -1,11 +1,10 @@
 ---
 name: 🚀 Feature
-about: Well defined and described Features requests
+about: Suggest an idea for this project
+labels: feature
+title: 🚀 [Feature] 
 ---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
 
 ## 🚀 Feature
-<!-- Describe the Feature. -->
-
-### Design, Layout, Architecture
-<!-- Attach Screenshots and Drawings. -->
-<!-- Specify more details of the Feature with each Picture. -->
+<!-- Give a short summary of the Feature. Use Screenshots if you want. -->

.github/ISSUE_TEMPLATE/question.md

@@ -1,7 +1,13 @@
 ---
 name: 💬 Question
-about: If you need help or have trouble understanding cypht.
+about: If you need help understanding our Software.
+labels: question
+title: 💬 [Question] 
 ---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
+<!-- Question the project's team -->
+<!-- If you need an answer right away, consider to take other means of communication with the project's team -->
 
 ## 💬 Question
 <!-- Describe your Question in detail. Include screenshots and drawings if needed. -->

.github/ISSUE_TEMPLATE/refactor.md

@@ -0,0 +1,10 @@
+---
+name: 🔧 Refactor
+about: Help us improve our code by refactoring it.
+labels: refactor
+title: 🔧 [Refactor]
+---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
+## 🔧 Refactor
+<!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->

.github/ISSUE_TEMPLATE/release.md

@@ -0,0 +1,13 @@
+---
+name: 🎂 Release
+about: Define a Release
+labels: release
+title: 🎂 [RELEASE] 
+---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
+<!-- THIS ISSUE-TYPE IS NOT FOR YOU! -->
+<!-- Proceed only if you know what you are doing - have a chat with Project's Team first -->
+
+## 🎂 RELEASE
+<!-- Describe your Release in detail. Include screenshots and drawings -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,30 +1,15 @@
-## Pullrequest
-<!-- Describe the Pullrequest. -->
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
+## 🍰 Pullrequest
+<!-- Describe the Pullrequest. Use Screenshots if possible. -->
 
 ### Issues
 <!-- Which Issues does this fix, which are related?
 - fixes #XXX
 - relates #XXX
 -->
-- [X] None
-
-### Checklist
-<!-- Anything important to be thought of when deploying?
-- [ ] Config Update
-- [ ] Breaking/critical change
--->
-- [X] None
-
-### How2Test
-<!-- Give a detailed description how to test your PR and confirm it is working as expected. -->
-<!-- Maintainers will check the Tests
-- [ ] Test1
-- [ ] Test2
--->
-- [X] None
+- None
 
 ### Todo
-<!-- In case some parts are still missing, list them here.
-- [ ] Changelog
--->
+<!-- In case some parts are still missing, list them here. -->
 - [X] None

.github/workflows/test.lint.pr.yml

@@ -0,0 +1,77 @@
+name: "test:lint pull request CI"
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+permissions:
+  pull-requests: write
+  statuses: write
+
+jobs:
+  main:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # Configure which types are allowed (newline delimited).
+          # Default: https://github.com/commitizen/conventional-commit-types
+          #types: |
+          #  fix
+          #  feat
+          # Configure which scopes are allowed (newline delimited).
+          # Append a scope for each service here
+          scopes: |
+            docu
+            docker
+            release
+            workflow
+            other
+            cypht
+          # Configure that a scope must always be provided.
+          requireScope: true
+          # Configure which scopes (newline delimited) are disallowed in PR
+          # titles. For instance by setting # the value below, `chore(release):
+          # ...` and `ci(e2e,release): ...` will be rejected.
+          #disallowScopes: |
+          #  release
+          # Configure additional validation for the subject based on a regex.
+          # This example ensures the subject doesn't start with an uppercase character.
+          subjectPattern: ^(?![A-Z]).+$
+          # If `subjectPattern` is configured, you can use this property to override
+          # the default error message that is shown when the pattern doesn't match.
+          # The variables `subject` and `title` can be used within the message.
+          subjectPatternError: |
+            The subject "{subject}" found in the pull request title "{title}"
+            didn't match the configured pattern. Please ensure that the subject
+            doesn't start with an uppercase character.
+          # If you use GitHub Enterprise, you can set this to the URL of your server
+          #githubBaseUrl: https://github.myorg.com/api/v3
+          # If the PR contains one of these labels (newline delimited), the
+          # validation is skipped.
+          # If you want to rerun the validation when labels change, you might want
+          # to use the `labeled` and `unlabeled` event triggers in your workflow.
+          #ignoreLabels: |
+          #  bot
+          #  ignore-semantic-pull-request
+          # If you're using a format for the PR title that differs from the traditional Conventional
+          # Commits spec, you can use these options to customize the parsing of the type, scope and
+          # subject. The `headerPattern` should contain a regex where the capturing groups in parentheses
+          # correspond to the parts listed in `headerPatternCorrespondence`.
+          # See: https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-commits-parser#headerpattern
+          headerPattern: '^(\w*)(?:\(([\w$.\-*/ ]*)\))?: (.*)$'
+          headerPatternCorrespondence: type, scope, subject
+          # For work-in-progress PRs you can typically use draft pull requests 
+          # from GitHub. However, private repositories on the free plan don't have 
+          # this option and therefore this action allows you to opt-in to using the 
+          # special "[WIP]" prefix to indicate this state. This will avoid the 
+          # validation of the PR title and the pull request checks remain pending.
+          # Note that a second check will be reported if this is enabled.
+          wip: true

README.md

@@ -4,8 +4,10 @@
 #### Cypht
 [https://cypht.org](https://cypht.org)
 
-All your E-mail, from all your accounts, in one place. Cypht is like a news 
-reader, but for E-mail. Cypht does not replace your existing accounts - it 
+All your email, from all your accounts, in one place. Supports IMAP/SMTP, 
+[JMAP](https://github.com/cypht-org/cypht/issues/180) and 
+[soon EWS](https://github.com/cypht-org/cypht/issues/247). Cypht is like a 
+news reader, but for E-mail. Cypht does not replace your existing accounts - it 
 combines them into one. And it's also a news reader.
 
 ![screenshot](https://github.com/cypht-org/cypht-website/blob/master/img/Inbox.PNG "Inbox View").

config/app.php

@@ -135,10 +135,18 @@
     /*
     |
     | The hostname/IP address and port sieve is listening on. Example: example.org:4190
-    | Note: Add tls:// prefix to enable explicit STARTTLS
+    | Keep this blank to disable sieve filter support on login
     |
     */
-    'imap_auth_sieve_conf_host' => env('IMAP_AUTH_SIEVE_CONF_HOST', 'tls://mail.gandi.net:4190'),
+    'imap_auth_sieve_conf_host' => env('IMAP_AUTH_SIEVE_CONF_HOST', ''),
+
+    /*
+    |
+    | this will add the tls:// prefix to the sieve host if set to true
+    | to make this work make sure you set DEFAULT_SETTING_ENABLE_SIEVE_FILTER to true
+    |
+    */
+    'imap_auth_sieve_tls_mode' => env('IMAP_AUTH_SIEVE_TLS_MODE', true),
 
     /*
     | -------------------
@@ -1010,12 +1018,19 @@
     */
     'default_setting_msg_part_icons' => env('DEFAULT_SETTING_MSG_PART_ICONS', true),
 
+    /*
+    |
+    | Show the message after sending
+    | Defaults to true
+    */
+    'default_setting_review_sent_email' => env('DEFAULT_SETTING_REVIEW_SENT_EMAIL', true),
+
     /*
     |
     | Prefer text parts when viewing a message
     | Defaults to false
     */
-    'default_setting_text_only' => env('DEFAULT_SETTING_TEXT_ONLY', true),
+    'default_setting_text_only' => env('DEFAULT_SETTING_TEXT_ONLY', false),
 
     /*
     |
@@ -1030,7 +1045,7 @@
     | Defaults to 1 week
     */
     'default_setting_sent_since' => env('DEFAULT_SETTING_SENT_SINCE', '-1 week'),
-    
+
     /*
     |
     | Per source time limit for junk page
@@ -1309,4 +1324,6 @@
     | Use this setting switch between the legacy login page and the fancy one
     */
     'fancy_login' => env('FANCY_LOGIN', false),
+
+    'js_exclude_deps' => env('JS_EXCLUDE_DEPS', ''),
 ];