v3.87

Thanks to helioguardabaxo and xet7 !

Closes #2974

.sandstorm-meteor-1.8/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.85.0",
+  "version": "v3.87.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

.sandstorm-meteor-1.8/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.85.0",
+  "version": "v3.87.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

CHANGELOG.md

@@ -1,6 +1,46 @@
+# v3.87 2020-04-01 Wekan release
+
+This release makes the following UI changes:
+
+- [Move "Rules" from "Board View" to "Board Settings"](https://github.com/wekan/wekan/issues/2973).
+  Thanks to helioguardabaxo and xet7.
+- [Improvements on card details visualization](https://github.com/wekan/wekan/issues/2974).
+  Thanks to helioguardabaxo and xet7.
+- [Hide duplicate "Hide system messages" at Change Settings/Member Settings, because it's also on card
+  slider](https://github.com/wekan/wekan/issues/2837).
+  Thanks to notohiro and xet7.
+
+and fixes the following bugs:
+
+- [Fix Browser always reload the whole page when I change one of the card
+  color](https://github.com/wekan/wekan/commit/3546d7aa02bc65cf1183cb493adeb543ba51945d).
+  Fixed by making label colors and text again editable.
+  Regression from [Wekan v3.86 2)](https://github.com/wekan/wekan/commit/b9099a8b7ea6f63c79bdcbb871cb993b2cb7e325).
+  Thanks to javen9881 and xet7.
+- [Fix richer editor submit did not clear edit area](https://github.com/wekan/wekan/commit/033d6710470b2ecd7a0ec0b2f0741ff459e68b32).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.86 2020-03-24 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Rich editor can not be disabled, regression from changes yesterday at Wekan v3.85](https://github.com/wekan/wekan/commit/12ab8fac5db9c5ac8069d0ca2bca340d6004a25b).
+  Thanks to uusijani, vjrj and xet7.
+- [1) Fix Pasting text into a card is adding a line before and after
+      (and multiplies by pasting more) by changing paste "p" to "br".
+   2) Fixes to summernote and markdown comment editors, related
+       to keeping them open when adding comments, having
+       @member mention not close card, and disabling clicking of
+       @member mention](https://github.com/wekan/wekan/commit/b9099a8b7ea6f63c79bdcbb871cb993b2cb7e325).
+  Thanks to xet7 !
+        
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v3.85 2020-03-23 Wekan release
 
-This release fixes the following SECURITY VULNERABLITIES:
+This release fixes the following CRITICAL SECURITY VULNERABILITIES:
 
 - [Fix XSS bug reported today 4 hours ago by Cyb3rjunky](https://github.com/wekan/wekan/commit/482682e50079d70c5113169020d6834013b57c11).
   Logged in users could run javascript in input fields.

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v3.85.0"
+appVersion: "v3.87.0"
 files:
   userUploads:
     - README.md

client/components/boards/boardHeader.jade

@@ -193,20 +193,6 @@ template(name="boardChangeViewPopup")
           | {{_ 'board-view-cal'}}
           if $eq Utils.boardView "board-view-cal"
             i.fa.fa-check
-    if currentUser.isAdmin
-      hr
-      li
-        with "board-view-rules"
-          a.js-open-rules-view(title="{{_ 'rules'}}")
-            i.fa.fa-magic
-            | {{_ 'rules'}}
-    else if currentUser.isBoardAdmin
-      hr
-      li
-        with "board-view-rules"
-          a.js-open-rules-view(title="{{_ 'rules'}}")
-            i.fa.fa-magic
-            | {{_ 'rules'}}
 
 template(name="createBoard")
   form

client/components/boards/boardHeader.js

@@ -191,10 +191,6 @@ Template.boardChangeViewPopup.events({
     Utils.setBoardView('board-view-cal');
     Popup.close();
   },
-  'click .js-open-rules-view'() {
-    Modal.openWide('rulesMain');
-    Popup.close();
-  },
 });
 
 const CreateBoard = BlazeComponent.extendComponent({

client/components/cards/attachments.jade

@@ -55,5 +55,5 @@ template(name="attachmentsGalery")
         unless currentUser.isWorker
           //li.attachment-item.add-attachment
           a.js-add-attachment
-            i.fa.fa-paperclip
+            i.fa.fa-plus
             | {{_ 'add-attachment' }}

client/components/cards/cardDetails.jade

@@ -203,6 +203,7 @@ template(name="cardDetails")
     if canModifyCard
       unless currentUser.isWorker
         if currentBoard.allowsDescriptionTitle
+          hr
           h3
             i.fa.fa-align-left
             card-details-item-title {{_ 'description'}}
@@ -229,6 +230,7 @@ template(name="cardDetails")
                   a.js-close-inlined-form {{_ 'discard'}}
     else if getDescription
       if currentBoard.allowsDescriptionTitle
+        hr
         h3.card-details-item-title {{_ 'description'}}
       if currentBoard.allowsDescriptionText
         +viewer
@@ -237,15 +239,16 @@ template(name="cardDetails")
     .card-checklist-attachmentGalerys
       .card-checklist-attachmentGalery.card-checklists
         if currentBoard.allowsChecklists
+          hr
           +checklists(cardId = _id)
         if currentBoard.allowsSubtasks
           hr
           +subtasks(cardId = _id)
       if currentBoard.allowsAttachments
-        //- hr
-        //- h3
-        //- i.fa.fa-paperclip
-        //- | {{_ 'attachments'}}
+        hr
+        h3
+          i.fa.fa-paperclip
+          | {{_ 'attachments'}}
         .card-checklist-attachmentGalery.card-attachmentGalery
           +attachmentsGalery
 

client/components/main/editor.js

@@ -1,7 +1,5 @@
 Template.editor.onRendered(() => {
   const textareaSelector = 'textarea';
-  const enableRicherEditor =
-    Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR || true;
   const mentions = [
     // User mentions
     {
@@ -32,7 +30,7 @@ Template.editor.onRendered(() => {
     autosize($textarea);
     $textarea.escapeableTextComplete(mentions);
   };
-  if (enableRicherEditor) {
+  if (Meteor.settings.public.RICHER_CARD_COMMENT_EDITOR !== false) {
     const isSmall = Utils.isMiniScreen();
     const toolbar = isSmall
       ? [
@@ -116,12 +114,11 @@ Template.editor.onRendered(() => {
           callbacks: {
             onInit(object) {
               const originalInput = this;
-              $(originalInput).on('input', function() {
+              $(originalInput).on('submitted', function() {
                 // when comment is submitted, the original textarea will be set to '', so shall we
                 if (!this.value) {
                   const sn = getSummernote(this);
-                  sn && sn.summernote('reset');
-                  object && object.editingArea.find('.note-placeholder').show();
+                  sn && sn.summernote('code', '');
                 }
               });
               const jEditor = object && object.editable;
@@ -217,9 +214,15 @@ Template.editor.onRendered(() => {
               const thisNote = this;
               const updatePastedText = function(object) {
                 const someNote = getSummernote(object);
+                // Fix Pasting text into a card is adding a line before and after
+                // (and multiplies by pasting more) by changing paste "p" to "br".
+                // Fixes https://github.com/wekan/wekan/2890 .
+                // == Fix Start ==
+                someNote.execCommand('defaultParagraphSeparator', false, 'br');
+                // == Fix End ==
                 const original = someNote.summernote('code');
                 const cleaned = cleanPastedHTML(original); //this is where to call whatever clean function you want. I have mine in a different file, called CleanPastedHTML.
-                someNote.summernote('reset'); //clear original
+                someNote.summernote('code', ''); //clear original
                 someNote.summernote('pasteHTML', cleaned); //this sets the displayed content editor to the cleaned pasted code.
               };
               setTimeout(function() {
@@ -286,7 +289,8 @@ Blaze.Template.registerHelper(
 
     let currentMention;
     while ((currentMention = mentionRegex.exec(content)) !== null) {
-      const [fullMention, username] = currentMention;
+      const [fullMention, quoteduser, simple] = currentMention;
+      const username = quoteduser || simple;
       const knowedUser = _.findWhere(knowedUsers, { username });
       if (!knowedUser) {
         continue;
@@ -297,7 +301,12 @@ Blaze.Template.registerHelper(
       if (knowedUser.userId === Meteor.userId()) {
         linkClass += ' me';
       }
-      const link = HTML.A(
+      // This @user mention link generation did open same Wekan
+      // window in new tab, so now A is changed to U so it's
+      // underlined and there is no link popup. This way also
+      // text can be selected more easily.
+      //const link = HTML.A(
+      const link = HTML.U(
         {
           class: linkClass,
           // XXX Hack. Since we stringify this render function result below with
@@ -321,14 +330,7 @@ Template.viewer.events({
   // the corresponding text). Clicking a link shouldn't fire these actions, stop
   // we stop these event at the viewer component level.
   'click a'(event, templateInstance) {
-    event.stopPropagation();
-
-    // XXX We hijack the build-in browser action because we currently don't have
-    // `_blank` attributes in viewer links, and the transformer function is
-    // handled by a third party package that we can't configure easily. Fix that
-    // by using directly `_blank` attribute in the rendered HTML.
-    event.preventDefault();
-
+    let prevent = true;
     const userId = event.currentTarget.dataset.userid;
     if (userId) {
       Popup.open('member').call({ userId }, event, templateInstance);
@@ -338,5 +340,14 @@ Template.viewer.events({
         window.open(href, '_blank');
       }
     }
+    if (prevent) {
+      event.stopPropagation();
+
+      // XXX We hijack the build-in browser action because we currently don't have
+      // `_blank` attributes in viewer links, and the transformer function is
+      // handled by a third party package that we can't configure easily. Fix that
+      // by using directly `_blank` attribute in the rendered HTML.
+      event.preventDefault();
+    }
   },
 });

client/components/sidebar/sidebar.jade

@@ -267,6 +267,10 @@ template(name="outgoingWebhooksPopup")
 
 template(name="boardMenuPopup")
   ul.pop-over-list
+    li
+      a.js-open-rules-view(title="{{_ 'rules'}}")
+        i.fa.fa-magic
+        | {{_ 'rules'}}
     li
       a.js-custom-fields
         i.fa.fa-list-alt

client/components/sidebar/sidebar.js

@@ -182,6 +182,10 @@ Template.memberPopup.helpers({
 
 Template.boardMenuPopup.events({
   'click .js-rename-board': Popup.open('boardChangeTitle'),
+  'click .js-open-rules-view'() {
+    Modal.openWide('rulesMain');
+    Popup.close();
+  },
   'click .js-custom-fields'() {
     Sidebar.setView('customFields');
     Popup.close();

client/components/users/userHeader.jade

@@ -98,12 +98,12 @@ template(name="changeLanguagePopup")
 
 template(name="changeSettingsPopup")
   ul.pop-over-list
-    li
-      a.js-toggle-system-messages
-        i.fa.fa-comments-o
-        | {{_ 'hide-system-messages'}}
-        if hiddenSystemMessages
-          i.fa.fa-check
+    //li
+    //  a.js-toggle-system-messages
+    //    i.fa.fa-comments-o
+    //    | {{_ 'hide-system-messages'}}
+    //    if hiddenSystemMessages
+    //      i.fa.fa-check
     li
       a.js-toggle-desktop-drag-handles
         i.fa.fa-arrows

i18n/pt-BR.i18n.json

@@ -182,7 +182,7 @@
   "changeLanguagePopup-title": "Alterar Idioma",
   "changePasswordPopup-title": "Alterar Senha",
   "changePermissionsPopup-title": "Alterar Permissões",
-  "changeSettingsPopup-title": "Altera configurações",
+  "changeSettingsPopup-title": "Alterar configurações",
   "subtasks": "Subtarefas",
   "checklists": "Listas de verificação",
   "click-to-star": "Marcar quadro como favorito.",

i18n/ro.i18n.json

@@ -1,5 +1,5 @@
 {
-  "accept": "Accept",
+  "accept": "Aceptă",
   "act-activity-notify": "Activity Notification",
   "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
@@ -42,23 +42,23 @@
   "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-withBoardTitle": "__board__",
   "act-withCardTitle": "[__board__] __card__",
-  "actions": "Actions",
-  "activities": "Activities",
-  "activity": "Activity",
-  "activity-added": "added %s to %s",
+  "actions": "Acțiuni",
+  "activities": "Activități",
+  "activity": "Activitate",
+  "activity-added": "s-a adăugat %s la %s",
   "activity-archived": "%s moved to Archive",
-  "activity-attached": "attached %s to %s",
-  "activity-created": "created %s",
+  "activity-attached": "s-a atașat %s la %s",
+  "activity-created": "s-a creat %s",
   "activity-customfield-created": "created custom field %s",
-  "activity-excluded": "excluded %s from %s",
-  "activity-imported": "imported %s into %s from %s",
-  "activity-imported-board": "imported %s from %s",
-  "activity-joined": "joined %s",
-  "activity-moved": "moved %s from %s to %s",
+  "activity-excluded": "s-a exclus %s din %s",
+  "activity-imported": "s-a importat %s în %s din %s",
+  "activity-imported-board": "s-a importat %s din %s",
+  "activity-joined": "ai devenit membru %s",
+  "activity-moved": "s-a mutat %s din %s în%s",
   "activity-on": "on %s",
-  "activity-removed": "removed %s from %s",
-  "activity-sent": "sent %s to %s",
-  "activity-unjoined": "unjoined %s",
+  "activity-removed": "s-a șters %s din %s",
+  "activity-sent": "s-a trimis %s către%s",
+  "activity-unjoined": "nu mai ești membru al %s",
   "activity-subtask-added": "added subtask to %s",
   "activity-checked-item": "checked %s in checklist %s of %s",
   "activity-unchecked-item": "unchecked %s in checklist %s of %s",
@@ -68,7 +68,7 @@
   "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
   "activity-checklist-item-added": "added checklist item to '%s' in %s",
   "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
-  "add": "Add",
+  "add": "Adaugă",
   "activity-checked-item-card": "checked %s in checklist %s",
   "activity-unchecked-item-card": "unchecked %s in checklist %s",
   "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
@@ -82,20 +82,20 @@
   "add-subtask": "Add Subtask",
   "add-checklist": "Add Checklist",
   "add-checklist-item": "Add an item to checklist",
-  "add-cover": "Add Cover",
+  "add-cover": "Adaugă Decor",
   "add-label": "Add Label",
   "add-list": "Add List",
-  "add-members": "Add Members",
-  "added": "Added",
-  "addMemberPopup-title": "Members",
+  "add-members": "Adaugă Membrii",
+  "added": "S-a adăugat",
+  "addMemberPopup-title": "Membrii",
   "admin": "Admin",
-  "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
+  "admin-desc": "Poate vedea și edita carduri, șterge membrii, și schimba setările tablei.",
   "admin-announcement": "Announcement",
   "admin-announcement-active": "Active System-Wide Announcement",
   "admin-announcement-title": "Announcement from Administrator",
-  "all-boards": "All boards",
-  "and-n-other-card": "And __count__ other card",
-  "and-n-other-card_plural": "And __count__ other cards",
+  "all-boards": "Toate tablele",
+  "and-n-other-card": "Și __count__ alt card",
+  "and-n-other-card_plural": "Și __count__ alte carduri",
   "apply": "Apply",
   "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
   "archive": "Move to Archive",
@@ -106,54 +106,54 @@
   "archive-swimlane": "Move Swimlane to Archive",
   "archive-selection": "Move selection to Archive",
   "archiveBoardPopup-title": "Move Board to Archive?",
-  "archived-items": "Archive",
+  "archived-items": "Arhivă",
   "archived-boards": "Boards in Archive",
   "restore-board": "Restore Board",
   "no-archived-boards": "No Boards in Archive.",
   "archives": "Archive",
   "template": "Template",
   "templates": "Templates",
-  "assign-member": "Assign member",
-  "attached": "attached",
+  "assign-member": "Atribuie unui membru",
+  "attached": "s-a atașat",
   "attachment": "Ataşament",
-  "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
-  "attachmentDeletePopup-title": "Delete Attachment?",
+  "attachment-delete-pop": "Ștergerea unui atașament este permanentă. Nu există recuperare.",
+  "attachmentDeletePopup-title": "Șterge Atașament?",
   "attachments": "Ataşamente",
   "auto-watch": "Automatically watch boards when they are created",
   "avatar-too-big": "The avatar is too large (70KB max)",
   "back": "Înapoi",
-  "board-change-color": "Change color",
-  "board-nb-stars": "%s stars",
-  "board-not-found": "Board not found",
-  "board-private-info": "This board will be <strong>private</strong>.",
-  "board-public-info": "This board will be <strong>public</strong>.",
-  "boardChangeColorPopup-title": "Change Board Background",
-  "boardChangeTitlePopup-title": "Rename Board",
-  "boardChangeVisibilityPopup-title": "Change Visibility",
+  "board-change-color": "Schimbă culoare",
+  "board-nb-stars": "%s stele",
+  "board-not-found": "Tabla nu a fost găsită",
+  "board-private-info": "Această tabla va fi <strong>privată</strong>.",
+  "board-public-info": "Această tabla va fi <strong>publică</strong>.",
+  "boardChangeColorPopup-title": "Schimbă Fundalul Tablei",
+  "boardChangeTitlePopup-title": "Redenumește Tabla",
+  "boardChangeVisibilityPopup-title": "Schimbă Vizibilitatea",
   "boardChangeWatchPopup-title": "Change Watch",
   "boardMenuPopup-title": "Board Settings",
   "boardChangeViewPopup-title": "Board View",
-  "boards": "Boards",
+  "boards": "Table",
   "board-view": "Board View",
   "board-view-cal": "Calendar",
   "board-view-swimlanes": "Swimlanes",
   "board-view-collapse": "Collapse",
   "board-view-lists": "Liste",
   "bucket-example": "Like “Bucket List” for example",
-  "cancel": "Cancel",
+  "cancel": "Anulează",
   "card-archived": "This card is moved to Archive.",
   "board-archived": "This board is moved to Archive.",
-  "card-comments-title": "This card has %s comment.",
-  "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
-  "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
+  "card-comments-title": "Acest card are %s commentariu.",
+  "card-delete-notice": "Ștergerea este permanentă. Se vor pierde toate acțiunile asociate acestui card.",
+  "card-delete-pop": "Toate acțiunile vor fi șterse din jurnalul de activități si nu vei mai putea redeschide cardul. Nu există recuperare.",
   "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
   "card-due": "Due",
   "card-due-on": "Due on",
   "card-spent": "Spent Time",
-  "card-edit-attachments": "Edit attachments",
+  "card-edit-attachments": "Editează atașamente",
   "card-edit-custom-fields": "Edit custom fields",
-  "card-edit-labels": "Edit labels",
-  "card-edit-members": "Edit members",
+  "card-edit-labels": "Editează etichete",
+  "card-edit-members": "Editează membrii",
   "card-labels-title": "Change the labels for the card.",
   "card-members-title": "Add or remove members of the board from the card.",
   "card-start": "Start",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.85.0",
+  "version": "v3.87.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.85.0",
+  "version": "v3.87.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

public/api/wekan.html

@@ -1524,7 +1524,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v3.85">Wekan REST API v3.85</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v3.87">Wekan REST API v3.87</a>
             
           </li>
         
@@ -2017,7 +2017,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v3.85</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v3.87</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>

public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v3.85
+  version: v3.87
   description: |
     The REST API allows you to control and extend Wekan with ease.
 

sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 385,
+    appVersion = 387,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "3.85.0~2020-03-23"),
+    appMarketingVersion = (defaultText = "3.87.0~2020-04-01"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,