FEATURE: support for chronologically merging posts into existing topic (#21374)

When a user chooses to move a topic/message to an existing topic/message, they can now opt to merge the posts chronologically (using a checkbox in the UI).
2025-02-25 18:55:32 -06:00 · 2023-05-25 15:38:34 -03:00
parent 6a65fa982d
commit c539f749f1
11 changed files with 1346 additions and 23 deletions
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -602,6 +602,14 @@
      width: 100%;
    }
  }
+
+  #choosing-topic {
+    form {
+      hr {
+        margin-bottom: 0.5em;
+      }
+    }
+  }
 }

 .publish-page-modal {
--- a/app/assets/stylesheets/desktop/modal.scss
+++ b/app/assets/stylesheets/desktop/modal.scss
@@ -50,7 +50,7 @@
 .choose-topic-modal {
  .modal-body {
    position: relative;
-    height: 350px;
+    min-height: 350px;
  }

  #choosing-topic {