Merge branch 'master' of https://github.com/wekan/wekan into search

CHANGELOG.md

@@ -1,3 +1,23 @@
+# v5.07 2021-03-19 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed sort cards feature](https://github.com/wekan/wekan/pull/3662).
+  Thanks to ednamaeG.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.06 2021-03-18 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed Bug: Calendar & parent cards URLs used absolute URLs](https://github.com/wekan/wekan/pull/3648).
+  Thanks to Majed6.
+- [Fixed Bug: copy to clipboard uses pathname](https://github.com/wekan/wekan/pull/3661).
+  Thanks to Majed6.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v5.05 2021-03-11 Wekan release
 
 This release fixes the following bugs:

Stackerfile.yml

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

client/components/boards/boardBody.js

@@ -360,7 +360,7 @@ BlazeComponent.extendComponent({
             end: end || card.endAt,
             allDay:
               Math.abs(end.getTime() - start.getTime()) / 1000 === 24 * 3600,
-            url: FlowRouter.url('card', {
+            url: FlowRouter.path('card', {
               boardId: currentBoard._id,
               slug: currentBoard.slug,
               cardId: card._id,

client/components/boards/boardHeader.jade

@@ -34,9 +34,12 @@ template(name="boardHeaderBar")
             if $eq watchLevel "muted"
               i.fa.fa-bell-slash
             span {{_ watchLevel}}
-          a.board-header-btn.js-sort-cards(title="{{_ 'sort-cards'}}")
+          a.board-header-btn(title="{{_ 'sort-cards'}}" class="{{#if isSortActive }}emphasis{{else}} js-sort-cards {{/if}}")
             i.fa.fa-sort
-            | {{_ 'sort-cards'}} {{sortCardsBy.get}}
+            span {{#if isSortActive }}{{_ 'Sort is on'}}{{else}}{{_ 'sort-cards'}}{{/if}}
+            if isSortActive
+              a.board-header-btn-close.js-sort-reset(title="Remove Sort")
+                i.fa.fa-times-thin
 
         else
           a.board-header-btn.js-log-in(

client/components/boards/boardHeader.js

@@ -54,6 +54,10 @@ Template.boardChangeTitlePopup.events({
 });
 
 BlazeComponent.extendComponent({
+  onCreated(){
+    // set sort to default
+    Session.set('sortBy','')
+  },
   watchLevel() {
     const currentBoard = Boards.findOne(Session.get('currentBoard'));
     return currentBoard && currentBoard.getWatchLevel(Meteor.userId());
@@ -129,6 +133,9 @@ BlazeComponent.extendComponent({
           Sidebar.setView();
           Filter.reset();
         },
+        'click .js-sort-reset'() {
+          Session.set('sortBy','')
+        },
         'click .js-open-search-view'() {
           Sidebar.setView('search');
         },
@@ -162,6 +169,9 @@ Template.boardHeaderBar.helpers({
   boardView() {
     return Utils.boardView();
   },
+  isSortActive(){
+    return Session.get('sortBy') ? true : false;
+  }
 });
 
 Template.boardChangeViewPopup.events({
@@ -406,15 +416,7 @@ BlazeComponent.extendComponent({
           Session.set('sortBy', sortBy);
           sortCardsBy.set(TAPi18n.__('date-created-oldest-first'));
           Popup.close();
-        },
-        'click .js-sort-default'() {
-          const sortBy = {
-            sort: 1,
-          };
-          Session.set('sortBy', sortBy);
-          sortCardsBy.set(TAPi18n.__('default'));
-          Popup.close();
-        },
+        }
       },
     ];
   },

client/components/cards/cardDetails.jade

@@ -12,7 +12,6 @@ template(name="cardDetails")
             a.fa.fa-link.card-copy-button.js-copy-link(
               class="fa-link"
               title="{{_ 'copy-card-link-to-clipboard'}}"
-              value="{{ originRelativeUrl }}"
             )
         if isMiniScreen
           a.fa.fa-times-thin.close-card-details-mobile-web.js-close-card-details

client/components/cards/cardDetails.js

@@ -114,7 +114,7 @@ BlazeComponent.extendComponent({
     if (card) {
       const board = Boards.findOne(card.boardId);
       if (board) {
-        result = FlowRouter.url('card', {
+        result = FlowRouter.path('card', {
           boardId: card.boardId,
           slug: board.slug,
           cardId: card._id,
@@ -291,6 +291,8 @@ BlazeComponent.extendComponent({
         },
         'click .js-copy-link'() {
           StringToCopyElement = document.getElementById('cardURL_copy');
+          StringToCopyElement.value =
+            window.location.origin + window.location.pathname;
           StringToCopyElement.select();
           if (document.execCommand('copy')) {
             StringToCopyElement.blur();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.05.0",
+  "version": "v5.07.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
@@ -72,7 +72,7 @@
     "ldapjs": "^2.2.3",
     "markdown-it": "^12.0.4",
     "markdown-it-emoji": "^2.0.0",
-    "meteor-node-stubs": "^1.0.1",
+    "meteor-node-stubs": "^1.0.2",
     "mongodb": "^3.6.4",
     "os": "^0.1.1",
     "page": "^1.11.5",

public/api/wekan.html

@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Wekan REST API v5.05</title>
+    <title>Wekan REST API v5.07</title>
 
     <style>
     </style>
@@ -1529,7 +1529,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 v5.05">Wekan REST API v5.05</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.07">Wekan REST API v5.07</a>
             
           </li>
         
@@ -1573,7 +1573,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 v5.05</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v5.07</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: v5.05
+  version: v5.07
   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 = 505,
+    appVersion = 507,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "5.05.0~2021-03-11"),
+    appMarketingVersion = (defaultText = "5.07.0~2021-03-19"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,