v4.71

My Cards add Due Date sort

CHANGELOG.md

@@ -1,3 +1,24 @@
+# v4.71 2021-01-08 Wekan release
+
+This release adds the following new features:
+
+- [My Cards add Due Date sort](https://github.com/wekan/wekan/pull/3419).
+  Thanks to jrsupplee.
+
+and adds the following improvements:
+
+- [Update to My Cards](https://github.com/wekan/wekan/pulls/3416).
+  Thanks to jrsupplee.
+- [Cards, custom fields are displayed in alphabetic order](https://github.com/wekan/wekan/pulls/3417).
+  Thanks to mfilser.
+
+and fixes the following bugs:
+
+- [Fixed Color picker of lists is empty. Fixed error about existing file at Wekan Docker version](https://github.com/wekan/wekan/issues/3418).
+  Thanks to bronger and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v4.70 2021-01-04 Wekan release
 
 This release adds the following CRITICAL SECURITY FIXES:

README.md

@@ -4,6 +4,8 @@
 
 [![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors)
 [![Docker Repository on Quay](https://quay.io/repository/wekan/wekan/status "Docker Repository on Quay")](https://quay.io/repository/wekan/wekan)
+[![Docker Hub container status](https://img.shields.io/docker/build/wekanteam/wekan.svg "Docker Hub container sta>
+[![Docker Hub pulls](https://img.shields.io/docker/pulls/wekanteam/wekan.svg "Docker Hub Pulls")](https://hub.doc>
 [![Wekan Build Status][travis_badge]][travis_status]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/02137ecec4e34c5aa303f57637196a93 "Codacy Badge")](https://www.codacy.com/app/xet7/wekan?utm_source=github.com&utm_medium=referral&utm_content=wekan/wekan&utm_campaign=Badge_Grade)
 [![Code Climate](https://codeclimate.com/github/wekan/wekan/badges/gpa.svg "Code Climate")](https://codeclimate.com/github/wekan/wekan)
@@ -11,12 +13,6 @@
 [![Code analysis at Open Hub](https://img.shields.io/badge/code%20analysis-at%20Open%20Hub-brightgreen.svg "Code analysis at Open Hub")](https://www.openhub.net/p/wekan)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_shield)
 
-NOTE: Docker Hub builds are broken with error ENOMEM. Only Quay works, see docker-compose.yml .
-<!--
-[![Docker Hub container status](https://img.shields.io/docker/build/wekanteam/wekan.svg "Docker Hub container sta>
-[![Docker Hub pulls](https://img.shields.io/docker/pulls/wekanteam/wekan.svg "Docker Hub Pulls")](https://hub.doc>
--->
-
 ## [Translate Wekan at Transifex](https://transifex.com/wekan/wekan)
 
 Translations to non-English languages are accepted only at [Transifex](https://transifex.com/wekan/wekan) using webbrowser.

Stackerfile.yml

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

client/components/lists/listHeader.jade

@@ -1,7 +1,7 @@
 template(name="listHeader")
   .list-header.js-list-header(
     class="{{#if limitToShowCardsCount}}list-header-card-count{{/if}}"
-    class="{{#if colorClass}}list-header-{{colorClass}}{{/if}}")
+    class=colorClass)
     +inlinedForm
       +editListTitleForm
     else
@@ -153,7 +153,7 @@ template(name="setListColorPopup")
   form.edit-label
     .palette-colors: each colors
       // note: we use the swimlane palette to have more than just the border
-      span.card-label.palette-color.js-palette-color(class="swimlane-{{color}}")
+      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
         if(isSelected color)
           i.fa.fa-check
     button.primary.confirm.js-submit {{_ 'save'}}

client/components/lists/listHeader.js

@@ -279,7 +279,11 @@ BlazeComponent.extendComponent({
   },
 
   isSelected(color) {
-    return this.currentColor.get() === color;
+    if (this.currentColor.get() === null) {
+      return color === 'white';
+    } else {
+      return this.currentColor.get() === color;
+    }
   },
 
   events() {

client/components/main/myCards.jade

@@ -1,9 +1,20 @@
 template(name="myCardsHeaderBar")
   h1
-    a.back-btn(href="{{pathFor 'home'}}")
-      i.fa.fa-chevron-left
+    //a.back-btn(href="{{pathFor 'home'}}")
+    //  i.fa.fa-chevron-left
     | {{_ 'my-cards'}}
 
+  .board-header-btns.left
+    a.board-header-btn.js-toggle-my-cards-choose-sort(title="{{_ 'my-cards-sort'}}")
+      //i.fa.fa-caret-down
+      i.fa.fa-sort
+      if $eq myCardsSort 'board'
+        i.fa.fa-th-large
+        | {{_ 'my-cards-sort-board'}}
+      if $eq myCardsSort 'dueAt'
+        i.fa.fa-calendar
+        | {{_ 'my-cards-sort-dueat'}}
+
 template(name="myCardsModalTitle")
   h2
     i.fa.fa-keyboard-o
@@ -11,21 +22,75 @@ template(name="myCardsModalTitle")
 
 template(name="myCards")
   .wrapper
-    each board in cardsFind
-      .board-title
-        | {{_ 'board' }}:
-        +viewer
-          = board.title
-      each swimlane in board.swimlanes
-        .swimlane-title
-          | {{_ 'swimlane' }}:
-          +viewer
-            = swimlane.title
-        each list in swimlane.lists
-          .list-title
-            | {{_ 'list' }}:
+    if $eq myCardsSort 'board'
+      each board in myBoards
+        .my-cards-board-wrapper
+          .my-cards-board-title
             +viewer
-              = list.title
-            each card in list.cards
-              a.minicard-wrapper.card-title(href="{{pathFor 'card' boardId=board.id slug=board.slug cardId=card._id }}")
-                +minicard(card)
+              = board.title
+          each swimlane in board.mySwimlanes
+            .my-cards-swimlane-title(class="{{#if swimlane.colorClass}}{{ swimlane.colorClass }}{{else}}swimlane-default-color{{/if}}")
+              +viewer
+                = swimlane.title
+            each list in swimlane.myLists
+              .my-cards-list-wrapper
+                .my-cards-list-title(class=list.colorClass)
+                  +viewer
+                    = list.title
+                each card in list.myCards
+                  .my-cards-card-wrapper
+                    a.minicard-wrapper(href=card.absoluteUrl)
+                      +minicard(card)
+    else
+      .my-cards-dueat-list-wrapper
+        each card in myCardsList
+          .my-cards-card-wrapper
+            a.minicard-wrapper.card-title(href=card.absoluteUrl)
+              +minicard(card)
+            ul.my-cards-context-list
+              li.my-cards-context(title="{{_ 'board'}}")
+                +viewer
+                  = card.board.title
+              li.my-cards-context.my-cards-context-separator
+                = ' '
+                | {{_ 'context-separator'}}
+                = ' '
+              li.my-cards-context(title="{{_ 'swimlane'}}")
+                +viewer
+                  = card.swimlane.title
+              li.my-cards-context
+                = ' '
+                | {{_ 'context-separator'}}
+                = ' '
+              li.my-cards-context(title="{{_ 'list'}}")
+                +viewer
+                  = card.list.title
+
+
+template(name="myCardsSortChangePopup")
+  ul.pop-over-list
+    li
+      with "my-cards-sort-board"
+        a.js-my-cards-sort-board
+          i.fa.fa-th-large.colorful
+          | {{_ 'my-cards-sort-board'}}
+          if $eq Utils.myCardsSort "board"
+            i.fa.fa-check
+    li
+      with "my-cards-sort-dueat"
+        a.js-my-cards-sort-dueat
+          i.fa.fa-calendar.colorful
+          | {{_ 'my-cards-sort-dueat'}}
+          if $eq Utils.myCardsSort "dueAt"
+            i.fa.fa-check
+
+//template(name="myCardsSortChangePopup")
+//  ul.pop-over-list
+//    li
+//      a.js-my-cards-sort-board
+//        i.fa.fa-th-large.colorful
+//        | {{_ 'my-cards-sort-board'}}
+//    li
+//      a.js-my-cards-sort-dueat
+//        i.fa.fa-calendar.colorful
+//        | {{_ 'my-cards-sort-dueat'}}

client/components/main/myCards.js

@@ -1,22 +1,23 @@
-const subManager = new SubsManager();
-Meteor.subscribe('myCards');
-Meteor.subscribe('mySwimlanes');
-Meteor.subscribe('myLists');
+BlazeComponent.extendComponent({
+  myCardsSort() {
+    // eslint-disable-next-line no-console
+    // console.log('sort:', Utils.myCardsSort());
+    return Utils.myCardsSort();
+  },
 
-Template.myCardsHeaderBar.events({
-  'click .js-open-archived-board'() {
-    Modal.open('archivedBoards');
+  events() {
+    return [
+      {
+        'click .js-toggle-my-cards-choose-sort'() {
+          // eslint-disable-next-line no-console
+          // console.log('open sort');
+          // Popup.open('myCardsSortChange');
+          Utils.myCardsSortToggle();
+        },
+      },
+    ];
   },
-});
-
-Template.myCardsHeaderBar.helpers({
-  title() {
-    return FlowRouter.getRouteName() === 'home' ? 'my-boards' : 'public';
-  },
-  templatesUser() {
-    return Meteor.user();
-  },
-});
+}).register('myCardsHeaderBar');
 
 Template.myCards.helpers({
   userId() {
@@ -24,13 +25,43 @@ Template.myCards.helpers({
   },
 });
 
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click .js-my-cards-sort-board'() {
+          Utils.setMyCardsSort('board');
+          Popup.close();
+        },
+
+        'click .js-my-cards-sort-dueat'() {
+          Utils.setMyCardsSort('dueAt');
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('myCardsSortChangePopup');
+
 BlazeComponent.extendComponent({
   onCreated() {
     Meteor.subscribe('setting');
-    // subManager.subscribe('myCards');
+    Meteor.subscribe('myCards');
+    Meteor.subscribe('mySwimlanes');
+    Meteor.subscribe('myLists');
   },
 
-  cardsFind() {
+  myCardsSort() {
+    // eslint-disable-next-line no-console
+    console.log('sort:', Utils.myCardsSort());
+    return Utils.myCardsSort();
+  },
+
+  sortByBoard() {
+    return this.myCardsSort() === 'board';
+  },
+
+  myBoards() {
     const userId = Meteor.userId();
     const boards = [];
     let board = null;
@@ -39,8 +70,8 @@ BlazeComponent.extendComponent({
 
     const cursor = Cards.find(
       {
-        archived: false,
         $or: [{ members: userId }, { assignees: userId }],
+        archived: false,
       },
       {
         sort: {
@@ -51,8 +82,6 @@ BlazeComponent.extendComponent({
         },
       },
     );
-    // eslint-disable-next-line no-console
-    // console.log('cursor:', cursor);
 
     let newBoard = false;
     let newSwimlane = false;
@@ -61,67 +90,50 @@ BlazeComponent.extendComponent({
     cursor.forEach(card => {
       // eslint-disable-next-line no-console
       // console.log('card:', card.title);
-      if (list === null || list.id !== card.listId) {
+      if (list === null || card.listId !== list._id) {
         // eslint-disable-next-line no-console
         // console.log('new list');
-        let l = Lists.findOne(card.listId);
-        if (!l) {
-          l = {
-            _id: card.listId,
-            title: 'undefined list',
-          };
+        list = card.list();
+        if (list.archived) {
+          list = null;
+          return;
         }
-        // eslint-disable-next-line no-console
-        // console.log('list:', l);
-        list = {
-          id: l._id,
-          title: l.title,
-          cards: [card],
-        };
+        list.myCards = [card];
         newList = true;
       }
-      if (swimlane === null || card.swimlaneId !== swimlane.id) {
+      if (swimlane === null || card.swimlaneId !== swimlane._id) {
         // eslint-disable-next-line no-console
         // console.log('new swimlane');
-        let s = Swimlanes.findOne(card.swimlaneId);
-        if (!s) {
-          s = {
-            _id: card.swimlaneId,
-            title: 'undefined swimlane',
-          };
+        swimlane = card.swimlane();
+        if (swimlane.archived) {
+          swimlane = null;
+          return;
         }
-        // eslint-disable-next-line no-console
-        // console.log('swimlane:', s);
-        swimlane = {
-          id: s._id,
-          title: s.title,
-          lists: [list],
-        };
+        swimlane.myLists = [list];
         newSwimlane = true;
       }
-      if (board === null || card.boardId !== board.id) {
+      if (board === null || card.boardId !== board._id) {
         // eslint-disable-next-line no-console
         // console.log('new board');
-        const b = Boards.findOne(card.boardId);
+        board = card.board();
+        if (board.archived) {
+          board = null;
+          return;
+        }
         // eslint-disable-next-line no-console
         // console.log('board:', b, b._id, b.title);
-        board = {
-          id: b._id,
-          title: b.title,
-          slug: b.slug,
-          swimlanes: [swimlane],
-        };
+        board.mySwimlanes = [swimlane];
         newBoard = true;
       }
 
       if (newBoard) {
         boards.push(board);
       } else if (newSwimlane) {
-        board.swimlanes.push(swimlane);
+        board.mySwimlanes.push(swimlane);
       } else if (newList) {
-        swimlane.lists.push(list);
+        swimlane.myLists.push(list);
       } else {
-        list.cards.push(card);
+        list.myCards.push(card);
       }
 
       newBoard = false;
@@ -129,25 +141,97 @@ BlazeComponent.extendComponent({
       newList = false;
     });
 
+    // sort the data structure
+    boards.forEach(board => {
+      board.mySwimlanes.forEach(swimlane => {
+        swimlane.myLists.forEach(list => {
+          list.myCards.sort((a, b) => {
+            return a.sort - b.sort;
+          });
+        });
+        swimlane.myLists.sort((a, b) => {
+          return a.sort - b.sort;
+        });
+      });
+      board.mySwimlanes.sort((a, b) => {
+        return a.sort - b.sort;
+      });
+    });
+
+    boards.sort((a, b) => {
+      let x = a.sort;
+      let y = b.sort;
+
+      // show the template board last
+      if (a.type === 'template-container') {
+        x = 99999999;
+      } else if (b.type === 'template-container') {
+        y = 99999999;
+      }
+      return x - y;
+    });
+
     // eslint-disable-next-line no-console
     // console.log('boards:', boards);
     return boards;
   },
 
+  myCardsList() {
+    const userId = Meteor.userId();
+
+    const cursor = Cards.find(
+      {
+        $or: [{ members: userId }, { assignees: userId }],
+        archived: false,
+      },
+      {
+        sort: {
+          dueAt: -1,
+          boardId: 1,
+          swimlaneId: 1,
+          listId: 1,
+          sort: 1,
+        },
+      },
+    );
+
+    // eslint-disable-next-line no-console
+    // console.log('cursor:', cursor);
+
+    const cards = [];
+    cursor.forEach(card => {
+      cards.push(card);
+    });
+
+    cards.sort((a, b) => {
+      const x = a.dueAt === null ? Date('2100-12-31') : a.dueAt;
+      const y = b.dueAt === null ? Date('2100-12-31') : b.dueAt;
+
+      if (x > y) return 1;
+      else if (x < y) return -1;
+
+      return 0;
+    });
+
+    // eslint-disable-next-line no-console
+    // console.log('cursor:', cards);
+    return cards;
+  },
+
   events() {
     return [
       {
-        'click .js-my-card'(evt) {
-          const card = this.currentData().card;
-          // eslint-disable-next-line no-console
-          console.log('currentData():', this.currentData());
-          // eslint-disable-next-line no-console
-          console.log('card:', card);
-          if (card) {
-            Utils.goCardId(card._id);
-          }
-          evt.preventDefault();
-        },
+        // 'click .js-my-card'(evt) {
+        //   const card = this.currentData().card;
+        //   // eslint-disable-next-line no-console
+        //   console.log('currentData():', this.currentData());
+        //   // eslint-disable-next-line no-console
+        //   console.log('card:', card);
+        //   if (card) {
+        //     Utils.goCardId(card._id);
+        //   }
+        //   evt.preventDefault();
+        // },
       },
     ];
   },

client/components/main/myCards.styl

@@ -1,40 +1,69 @@
-.my-cards-list
-  .my-cards-list-item
-    border-bottom: 1px solid darken(white, 25%)
-    padding: 10px 5px
+.my-cards-board-wrapper
+  border-radius: 8px
+  //padding: 0.5rem
+  min-width: 400px
+  border-width: 8px
+  border-color: grey
+  border-style: solid
+  margin-bottom: 2rem
+  margin-right: auto
+  margin-left: auto
 
-    &:last-child
-      border-bottom: none
-
-    .my-cards-list-item-keys
-      margin-top: 5px
-      float: right
-
-      kbd
-        padding: 5px 8px
-        margin: 5px
-        font-size: 18px
-
-    .my-cards-list-item-action
-      font-size: 1.4em
-      margin: 5px
-
-.board-title
+.my-cards-board-title
   font-size: 1.4rem
   font-weight: bold
+  padding: 0.5rem
+  background-color: grey
+  color: white
 
-.swimlane-title
-  font-size: 1.2rem
+.my-cards-swimlane-title
+  font-size: 1.1rem
   font-weight: bold
-  margin-left: 1em
-  margin-top: 10px
+  padding: 0.5rem
+  padding-bottom: 0.4rem
+  margin-top: 0
+  margin-bottom: 0.5rem
+  //border-top: black 1px solid
+  //border-bottom: black 1px solid
+  text-align: center
 
-.list-title
-  margin-top: 5px
+.swimlane-default-color
+  background-color: lightgrey
+
+.my-cards-list-title
   font-weight: bold
-  margin-left: 1.6rem
+  font-size: 1.1rem
+  //padding-bottom: 0
+  //margin-bottom: 0
+  text-align: center
+  margin-bottom: 0.7rem
 
-.card-title
-  margin-top: 5px
-  margin-left: 1.8rem
-  max-width: 350px;
+.my-cards-list-wrapper
+  margin: 1rem
+  border-radius: 5px
+  padding: 1.5rem
+  padding-top: 0.75rem
+  display: inline-block
+  min-width: 250px
+  max-width: 350px
+
+.my-cards-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+
+.my-cards-dueat-list-wrapper
+  max-width: 500px
+  margin-right: auto
+  margin-left: auto
+
+.my-cards-field-name
+  font-weight: bold
+
+.my-cards-context
+  display: inline-block
+
+.my-cards-context-separator
+  font-weight: bold
+
+.my-cards-context-list
+  margin-bottom: 0.7rem

client/components/swimlanes/swimlaneHeader.jade

@@ -1,5 +1,5 @@
 template(name="swimlaneHeader")
-  .swimlane-header-wrap.js-swimlane-header(class='{{#if colorClass}}swimlane-{{colorClass}}{{/if}}')
+  .swimlane-header-wrap.js-swimlane-header(class=colorClass)
     if this.isTemplateContainer
         +swimlaneFixedHeader(this)
     else

client/lib/utils.js

@@ -44,6 +44,31 @@ Utils = {
     }
   },
 
+  myCardsSort() {
+    let sort = window.localStorage.getItem('myCardsSort');
+
+    if (!sort || !['board', 'dueAt'].includes(sort)) {
+      window.localStorage.setItem('myCardsSort', 'board');
+      location.reload();
+      sort = 'board';
+    }
+
+    return sort;
+  },
+
+  myCardsSortToggle() {
+    if (this.myCardsSort() === 'board') {
+      this.setMyCardsSort('dueAt');
+    } else {
+      this.setMyCardsSort('board');
+    }
+  },
+
+  setMyCardsSort(sort) {
+    window.localStorage.setItem('myCardsSort', sort);
+    location.reload();
+  },
+
   // XXX We should remove these two methods
   goBoardId(_id) {
     const board = Boards.findOne(_id);

docker-compose.yml

@@ -118,7 +118,7 @@ services:
     image: quay.io/wekan/wekan
     # b) Using specific version tag:
     # image: quay.io/wekan/wekan:v4.52
-    # c) Docker Hub builds are broken with error ENOMEM https://hub.docker.com/r/wekanteam/wekan
+    # c) Docker Hub builds work https://hub.docker.com/r/wekanteam/wekan
     # image: wekanteam/wekan
     #-------------------------------------------------------------------------------------
     container_name: wekan-app

i18n/ar.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "بطاقة",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/bg.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Карта",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/br.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/ca.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Fitxa",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/cs.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "Moje karty",
   "card": "Karta",
   "list": "Seznam",
-  "board": "Tablo"
+  "board": "Tablo",
+  "context-separator": "/",
+  "my-cards-sort": "Pořadí mých karet",
+  "my-cards-sort-board": "Podle tabla",
+  "my-cards-sort-dueat": "Podle termínu"
 }

i18n/da.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Kort",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/de.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Karte",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/el.i18n.json

@@ -1,7 +1,7 @@
 {
   "accept": "Αποδοχή",
   "act-activity-notify": "Ειδοποίηση δραστηριότητας",
-  "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+  "act-addAttachment": "προσετέθη το συνημμένο __attachment__ στην κάρτα __card__ στη λίστα __list__ στη λωρίδα __swimlane__ στον πίνακα __board__",
   "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
@@ -27,13 +27,13 @@
   "act-setCustomField": "edited custom field __customField__: __customFieldValue__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-createList": "added list __list__ to board __board__",
   "act-addBoardMember": "added member __member__ to board __board__",
-  "act-archivedBoard": "Board __board__ moved to Archive",
-  "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-  "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-  "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-  "act-importBoard": "imported board __board__",
-  "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-  "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+  "act-archivedBoard": "Ο πίνακας __board__ μεταφέρθηκε στο Αρχείο",
+  "act-archivedCard": "Η κάρτα __card__ στη λίστα __list__ στη λωρίδα __swimlane__ στον πίνακα __board__ μεταφέρθηκε στο Αρχείο",
+  "act-archivedList": "Η λίστα __list__ στη λωρίδα __swimlane__ στον πίνακα __board__ μεταφέρθηκε στο Αρχείο",
+  "act-archivedSwimlane": "Η λωρίδα __swimlane__ στον πίνακα __board__ μεταφέρθηκε στο Αρχείο",
+  "act-importBoard": "Εισήχθη ο πίνακας __board__",
+  "act-importCard": "εισήχθη η κάρτα  __card__ στη λίστα __list__ στη λωρίδα __swimlane__ στον πίνακα __board__",
+  "act-importList": "εισήχθη η λίστα __list__ στη λωρίδα __swimlane__ στον πίνακα __board__",
   "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
   "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
@@ -121,8 +121,8 @@
   "attached": "attached",
   "attachment": "Συνημμένο",
   "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
-  "attachmentDeletePopup-title": "Διαγραφή Συννημένου;",
-  "attachments": "Συννημένα",
+  "attachmentDeletePopup-title": "Διαγραφή Συνημμένου;",
+  "attachments": "Συνημμένα",
   "auto-watch": "Automatically watch boards when they are created",
   "avatar-too-big": "The avatar is too large (520KB max)",
   "back": "Πίσω",
@@ -303,7 +303,7 @@
   "email-fail-text": "Error trying to send email",
   "email-invalid": "Invalid email",
   "email-invite": "Πρόσκληση μέσω Email",
-  "email-invite-subject": "__inviter__ sent you an invitation",
+  "email-invite-subject": "__inviter__ σας έστειλε μια πρόσκληση",
   "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
   "email-resetPassword-subject": "Reset your password on __siteName__",
   "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
@@ -324,10 +324,10 @@
   "error-username-taken": "This username is already taken",
   "error-email-taken": "Email has already been taken",
   "export-board": "Εξαγωγή πίνακα",
-  "export-board-json": "Export board to JSON",
-  "export-board-csv": "Export board to CSV",
-  "export-board-tsv": "Export board to TSV",
-  "export-board-html": "Export board to HTML",
+  "export-board-json": "Εξαγωγή πίνακα σε JSON",
+  "export-board-csv": "Εξαγωγή πίνακα σε CSV",
+  "export-board-tsv": "Εξαγωγή πίνακα σε TSV",
+  "export-board-html": "Εξαγωγή πίνακα σε HTML",
   "exportBoardPopup-title": "Εξαγωγή πίνακα",
   "sort": "Sort",
   "sort-desc": "Click to Sort List",
@@ -547,44 +547,44 @@
   "admin-panel": "Admin Panel",
   "settings": "Ρυθμίσεις",
   "people": "Άνθρωποι",
-  "registration": "Registration",
-  "disable-self-registration": "Disable Self-Registration",
+  "registration": "Εγγραφή",
+  "disable-self-registration": "Απενεργοποίηση Αυτό-Εγγραφής",
   "invite": "Πρόσκληση",
-  "invite-people": "Invite People",
-  "to-boards": "To board(s)",
+  "invite-people": "Πρόσκάλεσε Ανθρώπους",
+  "to-boards": "Στον πίνακα(ες)",
   "email-addresses": "Email Διευθύνσεις",
-  "smtp-host-description": "The address of the SMTP server that handles your emails.",
-  "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
-  "smtp-tls-description": "Enable TLS support for SMTP server",
-  "smtp-host": "SMTP Host",
-  "smtp-port": "SMTP Port",
+  "smtp-host-description": "Η διεύθυνση του SMTP server που διαχειρίζεται τα emails σας.",
+  "smtp-port-description": "Η πόρτα που ο SMTP server χρησιμοποιεί για τα εξερχόμενα emails.",
+  "smtp-tls-description": "Ενεργοποίηση υποστήριξης TLS για το SMTP server",
+  "smtp-host": "Διακομιστής SMTP (host)",
+  "smtp-port": "Πόρτα SMTP (Port)",
   "smtp-username": "Όνομα Χρήστη",
   "smtp-password": "Κωδικός",
   "smtp-tls": "TLS υποστήριξη",
   "send-from": "Από",
-  "send-smtp-test": "Send a test email to yourself",
+  "send-smtp-test": "Στείλε ένα δοκιμαστικό email στον εαυτό σου",
   "invitation-code": "Κωδικός Πρόσκλησης",
-  "email-invite-register-subject": "__inviter__ sent you an invitation",
-  "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
-  "email-smtp-test-subject": "SMTP Test Email",
-  "email-smtp-test-text": "You have successfully sent an email",
+  "email-invite-register-subject": "__inviter__ σας έστειλε μια πρόσκληση",
+  "email-invite-register-text": "Αγαπητέ __user__,\n\n__inviter__ σας προσκαλεί για να συμμετάσχετε στον πίνακα kanban.\n\nΠαρακαλούμε πιέστε την παρακάτω διεύθυνση:\n__url__\n\nΟ κωδικός πρόσκλησής σας είναι: __icode__\n\nΕυχαριστούμε.",
+  "email-smtp-test-subject": "SMTP Δοκιμαστικό Email",
+  "email-smtp-test-text": "Στείλατε επιτυχώς ένα email",
   "error-invitation-code-not-exist": "Ο κωδικός πρόσκλησης δεν υπάρχει",
-  "error-notAuthorized": "You are not authorized to view this page.",
-  "webhook-title": "Webhook Name",
-  "webhook-token": "Token (Optional for Authentication)",
-  "outgoing-webhooks": "Outgoing Webhooks",
-  "bidirectional-webhooks": "Two-Way Webhooks",
-  "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+  "error-notAuthorized": "Δεν έχετε εξουσιοδότηση για να δείτε αυτή τη σελίδα.",
+  "webhook-title": "Όνομα Webhook",
+  "webhook-token": "Token (Προεραιτικό για Αυθεντικοποίηση)",
+  "outgoing-webhooks": "Εξερχόμενα Webhooks",
+  "bidirectional-webhooks": "Αμφίδρομα Webhooks",
+  "outgoingWebhooksPopup-title": "Εξερχόμενα Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
-  "disable-webhook": "Disable This Webhook",
+  "disable-webhook": "Απενεργοποίηση αυτού του Webhook",
   "global-webhook": "Global Webhooks",
-  "new-outgoing-webhook": "New Outgoing Webhook",
+  "new-outgoing-webhook": "Νέο Εξερχόμενο Webhook",
   "no-name": "(Άγνωστο)",
   "Node_version": "Έκδοση Node",
   "Meteor_version": "Έκδοση Meteor",
   "MongoDB_version": "Έκδοση MongoDB",
   "MongoDB_storage_engine": "MongoDB storage engine",
-  "MongoDB_Oplog_enabled": "MongoDB Oplog enabled",
+  "MongoDB_Oplog_enabled": "MongoDB Oplog ενεργοποιημένο",
   "OS_Arch": "OS Arch",
   "OS_Cpus": "OS CPU Count",
   "OS_Freemem": "OS Free Memory",
@@ -594,44 +594,44 @@
   "OS_Totalmem": "OS Total Memory",
   "OS_Type": "OS Type",
   "OS_Uptime": "OS Uptime",
-  "days": "days",
+  "days": "ημέρες",
   "hours": "ώρες",
   "minutes": "λεπτά",
   "seconds": "δευτερόλεπτα",
-  "show-field-on-card": "Show this field on card",
+  "show-field-on-card": "Προβολή αυτού του πεδίου στην κάρτα",
   "automatically-field-on-card": "Auto create field to all cards",
   "showLabel-field-on-card": "Show field label on minicard",
   "yes": "Ναι",
   "no": "Όχι",
   "accounts": "Λογαριασμοί",
-  "accounts-allowEmailChange": "Allow Email Change",
-  "accounts-allowUserNameChange": "Allow Username Change",
-  "createdAt": "Created at",
-  "verified": "Verified",
+  "accounts-allowEmailChange": "Επίτρεψε Αλλαγή Email",
+  "accounts-allowUserNameChange": "Επίτρεψε Αλλαγή Ονόματος χρήστη",
+  "createdAt": "Δημιουργήθηκε στις",
+  "verified": "Επιβεβαιώθηκε",
   "active": "Ενεργό",
-  "card-received": "Received",
-  "card-received-on": "Received on",
+  "card-received": "Ελήφθη",
+  "card-received-on": "Ελήφθη στις",
   "card-end": "Τέλος",
-  "card-end-on": "Ends on",
-  "editCardReceivedDatePopup-title": "Change received date",
-  "editCardEndDatePopup-title": "Change end date",
-  "setCardColorPopup-title": "Set color",
-  "setCardActionsColorPopup-title": "Choose a color",
-  "setSwimlaneColorPopup-title": "Choose a color",
-  "setListColorPopup-title": "Choose a color",
-  "assigned-by": "Assigned By",
-  "requested-by": "Requested By",
+  "card-end-on": "Λήγει στις",
+  "editCardReceivedDatePopup-title": "Αλλαγή ημερομηνίας λήψης",
+  "editCardEndDatePopup-title": "Αλλαγή ημερομηνίας λήξης",
+  "setCardColorPopup-title": "Ρύθμιση χρώματος",
+  "setCardActionsColorPopup-title": "Επιλέξτε ένα χρώμα",
+  "setSwimlaneColorPopup-title": "Επιλέξτε ένα χρώμα",
+  "setListColorPopup-title": "Επιλέξτε ένα χρώμα",
+  "assigned-by": "Ανατέθηκε Από",
+  "requested-by": "Αιτήθηκε Από",
   "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
   "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
   "boardDeletePopup-title": "Διαγραφή Πίνακα;",
   "delete-board": "Διαγραφή Πίνακα",
   "default-subtasks-board": "Subtasks for __board__ board",
-  "default": "Default",
-  "queue": "Queue",
-  "subtask-settings": "Subtasks Settings",
-  "card-settings": "Card Settings",
+  "default": "Προεπιλογή",
+  "queue": "Ουρά αναμονής",
+  "subtask-settings": "Ρυθμίσεις υποεργασιών (subtasks)",
+  "card-settings": "Ρυθμίσεις Κάρτας",
   "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
-  "boardCardSettingsPopup-title": "Card Settings",
+  "boardCardSettingsPopup-title": "Ρυθμίσεις Κάρτας",
   "deposit-subtasks-board": "Deposit subtasks to this board:",
   "deposit-subtasks-list": "Landing list for subtasks deposited here:",
   "show-parent-in-minicard": "Show parent in minicard:",
@@ -640,48 +640,48 @@
   "subtext-with-full-path": "Subtext with full path",
   "subtext-with-parent": "Subtext with parent",
   "change-card-parent": "Change card's parent",
-  "parent-card": "Parent card",
-  "source-board": "Source board",
+  "parent-card": "Μητρική κάρτα",
+  "source-board": "Κάρτα προέλευσης",
   "no-parent": "Don't show parent",
   "activity-added-label": "added label '%s' to %s",
-  "activity-removed-label": "removed label '%s' from %s",
-  "activity-delete-attach": "deleted an attachment from %s",
-  "activity-added-label-card": "added label '%s'",
-  "activity-removed-label-card": "removed label '%s'",
-  "activity-delete-attach-card": "deleted an attachment",
-  "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+  "activity-removed-label": "διεγράφη ετικέτα '%s' από %s",
+  "activity-delete-attach": "διεγράφη ένα συνημμένο από %s",
+  "activity-added-label-card": "προσετέθη ετικέτα '%s'",
+  "activity-removed-label-card": "διεγράφη ετικέτα '%s'",
+  "activity-delete-attach-card": "διεγραφη ένα συνημμένο",
+  "activity-set-customfield": "ανάθεση τιμής του custom πεδίου '%s' στο '%s' στο %s",
   "activity-unset-customfield": "unset custom field '%s' in %s",
   "r-rule": "Κανόνας",
   "r-add-trigger": "Add trigger",
-  "r-add-action": "Add action",
-  "r-board-rules": "Board rules",
+  "r-add-action": "Προσθήκη ενέργειας",
+  "r-board-rules": "Κανόνες πίνακα",
   "r-add-rule": "Προσθήκη κανόνα",
   "r-view-rule": "Προβολή κανόνα",
   "r-delete-rule": "Διαγραφή κανόνα",
-  "r-new-rule-name": "New rule title",
-  "r-no-rules": "No rules",
+  "r-new-rule-name": "Νέος τίτλος κανόνα",
+  "r-no-rules": "Κανένας κανόνας",
   "r-trigger": "Trigger",
-  "r-action": "Action",
+  "r-action": "Ενέργεια",
   "r-when-a-card": "Όταν μία κάρτα",
-  "r-is": "is",
-  "r-is-moved": "is moved",
-  "r-added-to": "Added to",
-  "r-removed-from": "Removed from",
-  "r-the-board": "the board",
-  "r-list": "list",
-  "set-filter": "Set Filter",
-  "r-moved-to": "Moved to",
-  "r-moved-from": "Moved from",
+  "r-is": "είναι",
+  "r-is-moved": "έχει μετακινηθεί",
+  "r-added-to": "Προσετέθη στο",
+  "r-removed-from": "Διεγράφη από",
+  "r-the-board": "ο πίνακας",
+  "r-list": "λίστα",
+  "set-filter": "Καθορισμός Φίλτρου",
+  "r-moved-to": "Μετακινήθηκε σε",
+  "r-moved-from": "Μετακινήθηκε από",
   "r-archived": "Μετακινήθηκε στο Αρχείο",
   "r-unarchived": "Επαναφέρθηκε από το Αρχείο",
   "r-a-card": "μία κάρτα",
-  "r-when-a-label-is": "When a label is",
-  "r-when-the-label": "When the label",
-  "r-list-name": "list name",
-  "r-when-a-member": "When a member is",
-  "r-when-the-member": "When the member",
-  "r-name": "name",
-  "r-when-a-attach": "When an attachment",
+  "r-when-a-label-is": "Όταν μια ετικέτα είναι",
+  "r-when-the-label": "Όταν η ετικέτα",
+  "r-list-name": "όνομα λίστα",
+  "r-when-a-member": "Όταν ένα μέλος είναι",
+  "r-when-the-member": "Όταν το μέλος",
+  "r-name": "όνομα",
+  "r-when-a-attach": "Όταν ένα συνημμένο",
   "r-when-a-checklist": "When a checklist is",
   "r-when-the-checklist": "When the checklist",
   "r-completed": "Completed",
@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/en-GB.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/en.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/eo.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/es-AR.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Tarjeta",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/es-CL.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Tarjeta",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/es-PE.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Tarjeta",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/es.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Tarjeta",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/eu.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/fa.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "کارت",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/fi.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "Korttini",
   "card": "Kortti",
   "list": "Lista",
-  "board": "Taulu"
+  "board": "Taulu",
+  "context-separator": "/",
+  "my-cards-sort": "Korttini järjestys",
+  "my-cards-sort-board": "Taulun mukaan",
+  "my-cards-sort-dueat": "Eräpäivän mukaan"
 }

i18n/fr.i18n.json

@@ -802,7 +802,7 @@
   "act-atUserComment": "Vous avez été mentionné dans [__board__] __list__/__card__",
   "delete-user-confirm-popup": "Êtes-vous sûr de vouloir supprimer ce compte ? Cette opération ne peut pas être annulée. ",
   "accounts-allowUserDelete": "Autoriser les utilisateurs à supprimer leur compte",
-  "hide-minicard-label-text": "Cacher le label de la minicarte",
+  "hide-minicard-label-text": "Cacher l'étiquette de la minicarte",
   "show-desktop-drag-handles": "Voir les poignées de déplacement du bureau",
   "assignee": "Personne assignée",
   "cardAssigneesPopup-title": "Personne assignée",
@@ -852,5 +852,9 @@
   "my-cards": "Mes Cartes",
   "card": "Carte",
   "list": "Liste",
-  "board": "Tableau"
+  "board": "Tableau",
+  "context-separator": "/",
+  "my-cards-sort": "Trier Mes Cartes",
+  "my-cards-sort-board": "Par tableau",
+  "my-cards-sort-dueat": "Par date d'échéance"
 }

i18n/gl.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/he.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "הכרטיסים שלי",
   "card": "כרטיס",
   "list": "רשימה",
-  "board": "לוח"
+  "board": "לוח",
+  "context-separator": "/",
+  "my-cards-sort": "סידור הכרטיסים שלי",
+  "my-cards-sort-board": "הלוח שלי",
+  "my-cards-sort-dueat": "לפי מועד סיום"
 }

i18n/hi.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "कार्ड",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/hr.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Kartica",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/hu.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/hy.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/id.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/ig.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/it.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Scheda",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/ja.i18n.json

@@ -142,7 +142,7 @@
   "board-view-cal": "カレンダー",
   "board-view-swimlanes": "スイムレーン",
   "board-view-collapse": "折りたたむ",
-  "board-view-gantt": "Gantt",
+  "board-view-gantt": "ガント",
   "board-view-lists": "リスト",
   "bucket-example": "例：バケットリスト",
   "cancel": "キャンセル",
@@ -774,8 +774,8 @@
   "display-authentication-method": "認証方式を表示",
   "default-authentication-method": "デフォルトの認証方式",
   "duplicate-board": "ボードの複製",
-  "org-number": "The number of organizations is:",
-  "team-number": "The number of teams is:",
+  "org-number": "組織のメンバー数:",
+  "team-number": "チームのメンバー数:",
   "people-number": "メンバー数:",
   "swimlaneDeletePopup-title": "スイムレーンを削除しますか？",
   "swimlane-delete-pop": "すべての内容がアクティビティから削除されます。この削除は元に戻すことができません。",
@@ -809,10 +809,10 @@
   "addmore-detail": "詳細説明の追加",
   "show-on-card": "カードに表示する項目",
   "new": "新規作成",
-  "editOrgPopup-title": "Edit Organization",
-  "newOrgPopup-title": "New Organization",
-  "editTeamPopup-title": "Edit Team",
-  "newTeamPopup-title": "New Team",
+  "editOrgPopup-title": "組織を編集",
+  "newOrgPopup-title": "新規組織",
+  "editTeamPopup-title": "チームを編集",
+  "newTeamPopup-title": "新規チーム",
   "editUserPopup-title": "ユーザーを編集",
   "newUserPopup-title": "新規ユーザー",
   "notifications": "通知",
@@ -843,14 +843,18 @@
   "task": "Task",
   "create-task": "Create Task",
   "ok": "OK",
-  "organizations": "Organizations",
-  "teams": "Teams",
-  "displayName": "Display Name",
-  "shortName": "Short Name",
-  "website": "Website",
+  "organizations": "組織",
+  "teams": "チーム",
+  "displayName": "表示名",
+  "shortName": "短縮名",
+  "website": "ウェブサイト",
   "person": "Person",
   "my-cards": "My Cards",
   "card": "カード",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/ka.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/km.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/ko.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "카드",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/lt.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/lv.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Kartiņa",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/mk.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Карта",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/mn.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/nb.i18n.json

@@ -1,43 +1,43 @@
 {
   "accept": "Godta",
   "act-activity-notify": "Aktivitetsvarsel",
-  "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__",
+  "act-addAttachment": "Lagt til vedlegg __subtask__ til kort __card__ i liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-deleteAttachment": "Slettet vedlegg __subtask__ fra kort __card__ i liste __list__ i svømmebane __swimlane__ på tavle __board__",
   "act-addSubtask": "lagt til underoppgave __subtask__ til kort __card__ i liste __list__ i svømmebane __swimlane__ på tavle __board__",
-  "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-uncheckedItem": "ikke sjekket __checklistItem__ av sjekkliseten __checklist__ på kort __card__ i listen __list__ i svømmebane __swimlane__ på tavle __board__",
-  "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-editComment": "edited comment on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-deleteComment": "deleted comment on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+  "act-addLabel": "Lagt til etikett __label__ til kort __card__ i liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-addedLabel": "Lagt til etikett __label__ til kort __card__ i liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-removeLabel": "Fjernet etikett __label__ fra kort __card__ i liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-removedLabel": "Fjernet etikett __label__ fra kort __card__ i liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-addChecklist": "Lagt til sjekkliste __subtask__ til kort __card__ i liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-addChecklistItem": "Lagt til sjekklistepunkt __checklistItem__ til sjekklisten __checklist__ på kort __card__ i listen __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-removeChecklist": "Fjernet sjekkliste __subtask__ fra kort __card__ i liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-removeChecklistItem": "Fjernet sjekklistepunkt __checklistItem__ fra sjekklisten __checklist__ på kort __card__ i listen __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-checkedItem": "avmerket __checklistItem__ av sjekklisten __checklist__ på kort __card__ i listen __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-uncheckedItem": "fjernet avmerking __checklistItem__ av sjekklisten __checklist__ på kort __card__ i listen __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-completeChecklist": "Komplettert sjekkliste __checklist__ på kort __card__ på liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-uncompleteChecklist": "Ikke komplettert sjekkliste __checklist__ på kort __card__ på liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-addComment": "Kommentert på kort __card__: __comment__ på liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-editComment": "Redigert på kort __card__: __comment__ på liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-deleteComment": "Slettet kommentar på kort __card__: __comment__ på liste __list__ i svømmebane __swimlane__ på tavle __board__",
   "act-createBoard": "opprettet tavle __board__",
   "act-createSwimlane": "opprettet svømmebane __swimlane__ på tavlen __board__",
   "act-createCard": "opprettet kort __card__ til liste __list__ i svømmebane __swimlane__ på tavle __board__",
   "act-createCustomField": "opprettet tilpasset felt __customField__ på tavlen __board__",
-  "act-deleteCustomField": "deleted custom field __customField__ at board __board__",
-  "act-setCustomField": "edited custom field __customField__: __customFieldValue__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-createList": "added list __list__ to board __board__",
-  "act-addBoardMember": "added member __member__ to board __board__",
+  "act-deleteCustomField": "slettet tilpasset felt __customField__ på tavlen __board__",
+  "act-setCustomField": "Redigert tilpasset felt __customField__: __customFieldValue__ på kort __card__ på liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-createList": "opprettet liste __list__ til tavlen __board__",
+  "act-addBoardMember": "opprettet medlem __member__ til tavlen __board__",
   "act-archivedBoard": "Tavle __board__ flyttet til Arkiv",
-  "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-  "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
-  "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
-  "act-importBoard": "imported board __board__",
-  "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-  "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-  "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-  "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+  "act-archivedCard": "Kort __card__ på liste __list__ i svømmebane __swimlane__ på tavle __board__ flyttet til Arkiv",
+  "act-archivedList": "Liste __list__ i svømmebane __swimlane__ på tavle __board__ flyttet til arkiv",
+  "act-archivedSwimlane": "Svømmebane __swimlane__ på tavlen __board__ flyttet til Arkiv",
+  "act-importBoard": "importert tavle __board__",
+  "act-importCard": "importert kort __card__ til liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-importList": "importert liste __list__ til svømmebane __swimlane__ på tavle __board__",
+  "act-joinMember": "lagt til medlem __label__ til kort __card__ i liste __list__ i svømmebane __swimlane__ på tavle __board__",
+  "act-moveCard": "flyttet kort __card__ på tavle __board__ fra liste __oldList__ i svømmebane __oldSwimlane__ til liste __list__ i svømmebane __swimlane__",
   "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
-  "act-removeBoardMember": "removed member __member__ from board __board__",
+  "act-removeBoardMember": "fjernet medlem __member__ fra tavlen __board__",
   "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
   "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
   "act-withBoardTitle": "__board__",
@@ -71,7 +71,7 @@
   "add": "Legg til",
   "activity-checked-item-card": "sjekket %s i sjekkliste %s",
   "activity-unchecked-item-card": "ikke sjekket %s i sjekkliste %s",
-  "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+  "activity-checklist-completed-card": "Komplettert sjekkliste __checklist__ på kort __card__ på liste __list__ i svømmebane __swimlane__ på tavle __board__",
   "activity-checklist-uncompleted-card": "ikke ferdigstilt sjekkliste %s",
   "activity-editComment": "redigert kommentar %s",
   "activity-deleteComment": "slettet kommentar %s",
@@ -746,7 +746,7 @@
   "r-with-items": "med oppgave",
   "r-items-list": "oppgave1,oppgave2,oppgave3",
   "r-add-swimlane": "Legg til svømmebane",
-  "r-swimlane-name": "Navn på Svømmebane",
+  "r-swimlane-name": "Navn Svømmebane",
   "r-board-note": "Merk: La feltet stå tomt for å treffe alle mulige verdier.",
   "r-checklist-note": "Merk: sjekklistens oppgaver må skrives som kommaseparerte verdier.",
   "r-when-a-card-is-moved": "Når et kort flyttes til en annen liste",
@@ -852,5 +852,9 @@
   "my-cards": "Mine Kort",
   "card": "Kort",
   "list": "Liste",
-  "board": "Tavle"
+  "board": "Tavle",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/nl.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "Mijn kaarten",
   "card": "Kaart",
   "list": "Lijst",
-  "board": "Bord"
+  "board": "Bord",
+  "context-separator": "/",
+  "my-cards-sort": "Mijn kaarten sortering",
+  "my-cards-sort-board": "Naar bord",
+  "my-cards-sort-dueat": "Naar vervaldatum"
 }

i18n/oc.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Carta",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/pa.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/pl.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "Moje karty",
   "card": "karty",
   "list": "Lista",
-  "board": "Tablica"
+  "board": "Tablica",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/pt-BR.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "Meus Cartões",
   "card": "Cartão",
   "list": "Lista",
-  "board": "Quadro"
+  "board": "Quadro",
+  "context-separator": "/",
+  "my-cards-sort": "Ordenar Meus Cartões",
+  "my-cards-sort-board": "por Quadro",
+  "my-cards-sort-dueat": "Por Prazo Final"
 }

i18n/pt.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Cartão",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/ro.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/ru.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "Мои карточки",
   "card": "Карточка",
   "list": "Список",
-  "board": "Доска"
+  "board": "Доска",
+  "context-separator": "/",
+  "my-cards-sort": "Сортировать мои карточки",
+  "my-cards-sort-board": "По доскам",
+  "my-cards-sort-dueat": "По сроку выполнения"
 }

i18n/sk.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/sl.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Kartica",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/sr.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Kartica",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/sv.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Kort",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/sw.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/ta.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/th.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/tr.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Kart",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/uk.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Картка",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/vi.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/zh-CN.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "我的卡片",
   "card": "卡片",
   "list": "列表",
-  "board": "看板"
+  "board": "看板",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/zh-HK.i18n.json

@@ -852,5 +852,9 @@
   "my-cards": "My Cards",
   "card": "Card",
   "list": "List",
-  "board": "Board"
+  "board": "Board",
+  "context-separator": "/",
+  "my-cards-sort": "My Cards Sort",
+  "my-cards-sort-board": "By Board",
+  "my-cards-sort-dueat": "By Due Date"
 }

i18n/zh-TW.i18n.json

@@ -774,8 +774,8 @@
   "display-authentication-method": "顯示認證方式",
   "default-authentication-method": "預設認證方式",
   "duplicate-board": "複製看板",
-  "org-number": "The number of organizations is:",
-  "team-number": "The number of teams is:",
+  "org-number": "組織數是：",
+  "team-number": "團隊數是：",
   "people-number": "人數是：",
   "swimlaneDeletePopup-title": "是否刪除泳道？",
   "swimlane-delete-pop": "所有動作將從活動來源中刪除，您將無法恢復泳道。此操作無法還原。",
@@ -809,10 +809,10 @@
   "addmore-detail": "新增更多詳細描述",
   "show-on-card": "在卡片上顯示",
   "new": "新增",
-  "editOrgPopup-title": "Edit Organization",
-  "newOrgPopup-title": "New Organization",
-  "editTeamPopup-title": "Edit Team",
-  "newTeamPopup-title": "New Team",
+  "editOrgPopup-title": "編輯組織",
+  "newOrgPopup-title": "新建組織",
+  "editTeamPopup-title": "編輯團隊",
+  "newTeamPopup-title": "新建團隊",
   "editUserPopup-title": "編輯使用者",
   "newUserPopup-title": "新增使用者",
   "notifications": "通知",
@@ -843,14 +843,18 @@
   "task": "任務",
   "create-task": "建立任務",
   "ok": "OK",
-  "organizations": "Organizations",
-  "teams": "Teams",
-  "displayName": "Display Name",
-  "shortName": "Short Name",
-  "website": "Website",
-  "person": "Person",
-  "my-cards": "My Cards",
+  "organizations": "組織",
+  "teams": "團隊",
+  "displayName": "顯示用名稱",
+  "shortName": "排序用名稱",
+  "website": "網站",
+  "person": "人物",
+  "my-cards": "我的卡片",
   "card": "卡片",
-  "list": "List",
-  "board": "Board"
+  "list": "清單",
+  "board": "看板",
+  "context-separator": "/",
+  "my-cards-sort": "我的卡片排序",
+  "my-cards-sort-board": "依看板",
+  "my-cards-sort-dueat": "依到期日"
 }

models/cards.js

@@ -461,6 +461,10 @@ Cards.helpers({
     return Lists.findOne(this.listId);
   },
 
+  swimlane() {
+    return Swimlanes.findOne(this.swimlaneId);
+  },
+
   board() {
     return Boards.findOne(this.boardId);
   },
@@ -646,7 +650,7 @@ Cards.helpers({
 
     // match right definition to each field
     if (!this.customFields) return [];
-    return this.customFields.map(customField => {
+    const ret = this.customFields.map(customField => {
       const definition = definitions.find(definition => {
         return definition._id === customField._id;
       });
@@ -672,6 +676,8 @@ Cards.helpers({
         definition,
       };
     });
+    ret.sort((a, b) => a.definition.name.localeCompare(b.definition.name));
+    return ret;
   },
 
   colorClass() {

models/lists.js

@@ -257,7 +257,7 @@ Lists.helpers({
   },
 
   colorClass() {
-    if (this.color) return this.color;
+    if (this.color) return `list-header-${this.color}`;
     return '';
   },
 

models/swimlanes.js

@@ -216,7 +216,7 @@ Swimlanes.helpers({
   },
 
   colorClass() {
-    if (this.color) return this.color;
+    if (this.color) return `swimlane-${this.color}`;
     return '';
   },
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v4.70.0",
+  "version": "v4.71.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v4.70.0",
+  "version": "v4.71.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

packages/wekan-oidc/oidc_server.js

@@ -4,7 +4,9 @@ httpCa = false;
 if (process.env.OAUTH2_CA_CERT !== undefined) {
     try {
         const fs = Npm.require('fs');
-	httpCa = fs.readFileSync(process.env.OAUTH2_CA_CERT);
+        if (fs.existsSync(process.env.OAUTH2_CA_CERT)) {
+          httpCa = fs.readFileSync(process.env.OAUTH2_CA_CERT);
+        }
     } catch(e) {
 	console.log('WARNING: failed loading: ' + process.env.OAUTH2_CA_CERT);
 	console.log(e);

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 v4.70">Wekan REST API v4.70</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v4.71">Wekan REST API v4.71</a>
             
           </li>
         
@@ -2032,7 +2032,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 v4.70</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v4.71</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: v4.70
+  version: v4.71
   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 = 470,
+    appVersion = 471,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "4.70.0~2021-01-04"),
+    appMarketingVersion = (defaultText = "4.71.0~2021-01-08"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

server/publications/boards.js

@@ -27,6 +27,7 @@ Meteor.publish('boards', function() {
     {
       fields: {
         _id: 1,
+        boardId: 1,
         archived: 1,
         slug: 1,
         title: 1,
@@ -55,14 +56,16 @@ Meteor.publish('mySwimlanes', function() {
 
   return Swimlanes.find(
     {
-      archived: false,
+      // archived: false,
       _id: { $in: swimlanes },
     },
     {
       fields: {
         _id: 1,
         title: 1,
+        boardId: 1,
         type: 1,
+        color: 1,
         sort: 1,
       },
       // sort: {
@@ -85,13 +88,16 @@ Meteor.publish('myLists', function() {
 
   return Lists.find(
     {
-      archived: false,
+      // archived: false,
       _id: { $in: lists },
     },
     {
       fields: {
         _id: 1,
+        boardId: 1,
+        swimlaneId: 1,
         title: 1,
+        color: 1,
         type: 1,
         sort: 1,
       },