From b44fce98477967ba9563e27b6c34cb88823ff954 Mon Sep 17 00:00:00 2001
From: Marcel Folaron <47038998+marcelfolaron@users.noreply.github.com>
Date: Mon, 22 Apr 2024 22:36:44 -0400
Subject: [PATCH 1/3] [fix] Milestone screen project selector showing all
 types.

---
 .idea/leantime-oss.iml                               | 4 ----
 .idea/php.xml                                        | 2 --
 .idea/vcs.xml                                        | 1 +
 app/Domain/Tickets/Templates/milestoneDialog.tpl.php | 7 +++++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
index 07327ef38..4e500be0e 100644
--- a/.idea/leantime-oss.iml
+++ b/.idea/leantime-oss.iml
@@ -2,8 +2,6 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/app/Plugins/Billing/spec" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/app/Plugins/Billing/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/league/html-to-markdown" />
@@ -103,8 +101,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/spatie/icalendar-generator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/carbon-cli/carbon-cli" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/simple-cli/simple-cli" />
-      <excludeFolder url="file://$MODULE_DIR$/app/Plugins/Billing/vendor/composer" />
-      <excludeFolder url="file://$MODULE_DIR$/app/Plugins/Billing/vendor/stripe/stripe-php" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/php.xml b/.idea/php.xml
index f65f7df5c..ee62bb437 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -222,8 +222,6 @@
       <path value="$PROJECT_DIR$/vendor/spatie/enum" />
       <path value="$PROJECT_DIR$/vendor/carbon-cli/carbon-cli" />
       <path value="$PROJECT_DIR$/vendor/simple-cli/simple-cli" />
-      <path value="$PROJECT_DIR$/app/Plugins/Billing/vendor/composer" />
-      <path value="$PROJECT_DIR$/app/Plugins/Billing/vendor/stripe/stripe-php" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.1">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index bd69c239c..a3835b65e 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,6 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/app/Plugins" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/builddocs" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/Domain/Tickets/Templates/milestoneDialog.tpl.php b/app/Domain/Tickets/Templates/milestoneDialog.tpl.php
index 2450de6cd..edefe6f02 100644
--- a/app/Domain/Tickets/Templates/milestoneDialog.tpl.php
+++ b/app/Domain/Tickets/Templates/milestoneDialog.tpl.php
@@ -33,7 +33,9 @@
 
     <label class="control-label"><?=$tpl->__('label.project') ?></label>
     <select name="projectId" class="tw-w-full">
-        <?php foreach($allAssignedprojects as $project) { ?>
+        <?php foreach($allAssignedprojects as $project) {
+            if(empty($project['type']) || $project['type'] == "project"){
+            ?>
             <option value="<?=$project['id'] ?>"
                 <?php
                     if($currentMilestone->projectId == $project['id']) {
@@ -43,7 +45,8 @@
                     }
                 ?>
             ><?=$tpl->escape($project["name"]); ?></option>
-        <?php } ?>
+        <?php }
+        } ?>
     </select>
 
     <label><?php echo $tpl->__('label.todo_status'); ?></label>

From b2d22beb3d58678dbfee3cc01d980c256b80ab48 Mon Sep 17 00:00:00 2001
From: Marcel Folaron <47038998+marcelfolaron@users.noreply.github.com>
Date: Mon, 22 Apr 2024 22:57:54 -0400
Subject: [PATCH 2/3] [fix] Select correct project based on session or current
 milestone id

---
 .../Tickets/Templates/milestoneDialog.tpl.php | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/Domain/Tickets/Templates/milestoneDialog.tpl.php b/app/Domain/Tickets/Templates/milestoneDialog.tpl.php
index edefe6f02..f5308c711 100644
--- a/app/Domain/Tickets/Templates/milestoneDialog.tpl.php
+++ b/app/Domain/Tickets/Templates/milestoneDialog.tpl.php
@@ -17,7 +17,7 @@
 </script>
 
 <div class="modal-icons">
-    <?php if( isset($currentMilestone->id) && $currentMilestone->id != '') {?>
+    <?php if (isset($currentMilestone->id) && $currentMilestone->id != '') {?>
         <a href="#/tickets/delMilestone/<?php echo $currentMilestone->id; ?>" class="danger" data-tippy-content="Delete"><i class='fa fa-trash-can'></i></a>
     <?php } ?>
 </div>
@@ -33,19 +33,22 @@
 
     <label class="control-label"><?=$tpl->__('label.project') ?></label>
     <select name="projectId" class="tw-w-full">
-        <?php foreach($allAssignedprojects as $project) {
-            if(empty($project['type']) || $project['type'] == "project"){
-            ?>
+        <?php foreach ($allAssignedprojects as $project) {
+            if (empty($project['type']) || $project['type'] == "project") {
+                ?>
             <option value="<?=$project['id'] ?>"
                 <?php
-                    if($currentMilestone->projectId == $project['id']) {
-                        echo "selected";
-                    }else if( $_SESSION['currentProject'] == $project['id']){
-                        echo "selected";
-                    }
+                if (
+                    !empty($currentMilestone->projectId)
+                        && $currentMilestone->projectId == $project['id']
+                ) {
+                    echo "selected";
+                } else if ($_SESSION['currentProject'] == $project['id']) {
+                    echo "selected";
+                }
                 ?>
             ><?=$tpl->escape($project["name"]); ?></option>
-        <?php }
+            <?php }
         } ?>
     </select>
 

From ba25f29689036ca72570e1bcc063274ecb351a49 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 03:54:20 +0000
Subject: [PATCH 3/3] [Changelog CI] Add Changelog for Version 3.1.1

---
 CHANGELOG.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07dc66cb2..4558d6897 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,81 @@
 # Version: 3.1.1
 
+* [9e4ca51](https://github.com/Leantime/leantime/commit/9e4ca514b4292187f7c9dde8bd386a1c3f15c0cb): Update release.yml
+
+Include new changelog generator
+* [fc14219](https://github.com/Leantime/leantime/commit/fc1421939789c0ce752da7bac9dd13e0f65f6158): Update staticAnalysis.yml
+* [1efab6f](https://github.com/Leantime/leantime/commit/1efab6f770f211608d0705e7b48d84020f9223e8): [Changelog CI] Add Changelog for Version 3.1.1
+* [1177b61](https://github.com/Leantime/leantime/commit/1177b61e1d41bca0e43fab614a36db791132a4ac): Update changelog.yml
+* [a7eee7c](https://github.com/Leantime/leantime/commit/a7eee7c8574b08c3f16d4dd2bad35acd1a7feb21): Update changelog.yml
+* [2783376](https://github.com/Leantime/leantime/commit/27833765b17852fba7cfa71be5421af2c8265bfc): Update changelog.yml
+* [92efc6f](https://github.com/Leantime/leantime/commit/92efc6f4f68445c0fac5ff0a3fbb72ed9b831ae3): Create changelogConfig.yml
+* [7b4bb81](https://github.com/Leantime/leantime/commit/7b4bb81239d63d51dc542d8419f7fe68b51931b6): Update changelog.yml
+* [17f9b1e](https://github.com/Leantime/leantime/commit/17f9b1e6bbf0e9db982748b5a8874dfbea1b8eeb): Update changelog.yml
+* [127f1a5](https://github.com/Leantime/leantime/commit/127f1a596f1c305fdf6e9c39d1eeb4d3667247cf): Update changelog.yml
+* [a0c6f99](https://github.com/Leantime/leantime/commit/a0c6f99be571ad8fdc81dcb0328f9f920f479498): Create changelog.yml
+* [ad0a182](https://github.com/Leantime/leantime/commit/ad0a182421de58538a5401cf38aead77f71e9eb3): fix: upgrade gridstack from 10.1.1 to 10.1.2
+
+Snyk has created this PR to upgrade gridstack from 10.1.1 to 10.1.2.
+
+See this package in npm:
+https://www.npmjs.com/package/gridstack
+
+See this project in Snyk:
+https://app.snyk.io/org/broskees/project/c3e7f2a0-597b-4965-a7cf-7e6ea71043ae?utm_source=github&utm_medium=referral&page=upgrade-pr
+* [93e34db](https://github.com/Leantime/leantime/commit/93e34dbb67665b50287b82c8c9e63b74f5878540): Fix cache ratelimiter issue on install, fix plugin issue
+* [a386020](https://github.com/Leantime/leantime/commit/a386020d8edbb39a409bdb1555b30dd9ba3a2041): fix: upgrade uppy from 3.23.0 to 3.24.0
+
+Snyk has created this PR to upgrade uppy from 3.23.0 to 3.24.0.
+
+See this package in npm:
+https://www.npmjs.com/package/uppy
+
+See this project in Snyk:
+https://app.snyk.io/org/broskees/project/c3e7f2a0-597b-4965-a7cf-7e6ea71043ae?utm_source=github&utm_medium=referral&page=upgrade-pr
+* [97f788a](https://github.com/Leantime/leantime/commit/97f788af38325c39182650e17756a373599cc55e): fix: upgrade htmx.org from 1.9.10 to 1.9.11
+
+Snyk has created this PR to upgrade htmx.org from 1.9.10 to 1.9.11.
+
+See this package in npm:
+https://www.npmjs.com/package/htmx.org
+
+See this project in Snyk:
+https://app.snyk.io/org/broskees/project/c3e7f2a0-597b-4965-a7cf-7e6ea71043ae?utm_source=github&utm_medium=referral&page=upgrade-pr
+* [4486328](https://github.com/Leantime/leantime/commit/44863288fc4213e073978a2138eee63e42d86f43): fix: upgrade @sentry/webpack-plugin from 2.14.2 to 2.16.0
+
+Snyk has created this PR to upgrade @sentry/webpack-plugin from 2.14.2 to 2.16.0.
+
+See this package in npm:
+https://www.npmjs.com/package/@sentry/webpack-plugin
+
+See this project in Snyk:
+https://app.snyk.io/org/broskees/project/c3e7f2a0-597b-4965-a7cf-7e6ea71043ae?utm_source=github&utm_medium=referral&page=upgrade-pr
+* [28c5c49](https://github.com/Leantime/leantime/commit/28c5c49fc430874ed902746e3becf36920c47cf4): fix: upgrade @sentry/browser from 7.104.0 to 7.108.0
+
+Snyk has created this PR to upgrade @sentry/browser from 7.104.0 to 7.108.0.
+
+See this package in npm:
+https://www.npmjs.com/package/@sentry/browser
+
+See this project in Snyk:
+https://app.snyk.io/org/broskees/project/c3e7f2a0-597b-4965-a7cf-7e6ea71043ae?utm_source=github&utm_medium=referral&page=upgrade-pr
+* [cd79ec1](https://github.com/Leantime/leantime/commit/cd79ec11dbecbb05346961b472652d74786d93a0): Added mew middleware methods to secure Leantime
+* [fd5d7c4](https://github.com/Leantime/leantime/commit/fd5d7c496575f150754b60c64a4e593e3e11e386): Fix calendar dates
+* [aa79983](https://github.com/Leantime/leantime/commit/aa799830bcaa17232e37d77dda4185146507ef91): Fixes misc issues
+
+- Open redirect
+- File management
+- adds version to plugin page
+* [8ab7cff](https://github.com/Leantime/leantime/commit/8ab7cff1eb4996a71084bc67e13c7731a9c44ae2): Session improvements
+* [c8eba42](https://github.com/Leantime/leantime/commit/c8eba42be0ff007f0b6c8ca7565174781c7367e2): Update README.md
+
+Update install info
+* [000d8fc](https://github.com/Leantime/leantime/commit/000d8fcb60c08258b36bc906c704be22e6b73c02): fix incorrect symbol in the translation for zh-CN
+* [57738c3](https://github.com/Leantime/leantime/commit/57738c32bf969f76a496d3a34b84d6a7b82e45e7): Update Plugins
+
+
+# Version: 3.1.1
+
 * [1177b61](https://github.com/Leantime/leantime/commit/1177b61e1d41bca0e43fab614a36db791132a4ac): Update changelog.yml
 * [a7eee7c](https://github.com/Leantime/leantime/commit/a7eee7c8574b08c3f16d4dd2bad35acd1a7feb21): Update changelog.yml
 * [2783376](https://github.com/Leantime/leantime/commit/27833765b17852fba7cfa71be5421af2c8265bfc): Update changelog.yml