v4.92

Updated ChangeLog.
Updated dependencies.
2021-02-03 02:32:00 +02:00 · 2021-02-03 02:27:18 +02:00 · 2021-02-03 02:25:37 +02:00 · 2021-02-03 01:50:52 +02:00 · 2021-02-03 01:49:32 +02:00 · 2021-02-03 01:45:52 +02:00
127 changed files with 59301 additions and 55292 deletions
@@ -1,3 +1,217 @@
+# v4.92 2021-02-03 Wekan release
+
+This release adds the following improvements:
+
+- [Import user mapping improvements](https://github.com/wekan/wekan/pull/3510).
+  Thanks to jrsupplee.
+- Added Createtoken API.
+  [Part 1](https://github.com/wekan/wekan/pull/3520),
+  [Part 2](https://github.com/wekan/wekan/commit/3774060d32abcfee17dc1c31958d4673794d8619).
+  Thanks to magicbelette and xet7.
+- Sorted archives.
+  [Part 1](https://github.com/wekan/wekan/pull/3518),
+  [Part 2](https://github.com/wekan/wekan/commit/3da66a0fe30c2b54b63e5d098232b375d899925e).
+  Thanks to bronger, jrsupplee and xet7.
+
+and adds the following updates:
+
+- [Updated dependencies](https://github.com/wekan/wekan/commit/05ebae7329ba0dd3fe9b04cd63b1f983830cdeee).
+  Thanks to developers of dependencies.
+
+and fixes the following bugs:
+
+- [Don't reload page when returning default sort](https://github.com/wekan/wekan/pull/3509).
+  Thanks to jrsupplee.
+- [Avatar overlaped notifications](https://github.com/wekan/wekan/pull/3516).
+  Thanks to mfilser.
+- [Hopeful fix for i18n not working in `onRendered()`](https://github.com/wekan/wekan/pull/3519).
+  Thanks to jrsupplee.
+- [Disable some console.log code, that is only needed while developing](https://github.com/wekan/wekan/commit/f40c9804f848fdb91229c5718ad97495337109ba).
+  Thanks to xet7.
+- [Try fix removed nonexistent document error](https://github.com/wekan/wekan/commit/f274b3c26be60813829dcf2b0e68a8dd876ff614).
+  Thanks to Brulf, TheMasterFX and xet7.
+- [Fixed Cards and CustomFields sorted alphabetically](https://github.com/wekan/wekan/pull/3521).
+  Thanks to mfilser.
+- [Notifications avatar overlaped at mobile view](https://github.com/wekan/wekan/pull/3523).
+  Thanks to mfilser.
+
+and improves some security related info:
+
+- [Added badge for CII Best Practices](https://github.com/wekan/wekan/commit/ee2f7c077fe56d6fedb8b75ae3cba6bab56f9363).
+  Thanks to CII and xet7.
+- [Added PGP public key for sending security vulnerability reports](https://github.com/wekan/wekan/commit/a385d6f4fd76e2bb0f374963848513b9373d6b5a).
+  Thanks to xet7.
+- [Updated security report email address](https://github.com/wekan/wekan/commit/7031b7a3c77acc0ddeabe436572dd4057001e9f5).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.91 2021-01-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Use `new RegExp(...)` to define a regex](https://github.com/wekan/wekan/pull/3505).
+  Thanks to jrsupplee.
+- [Fixed typos in docker-compose.yml](https://github.com/wekan/wekan/commit/4acf8526509ffe852e6e48e3503560448239d8cd).
+  Thanks to farfoodyou and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.90 2021-01-28 Wekan release
+
+This release adds the following new features:
+
+- [Create unique board names when importing](https://github.com/wekan/wekan/pull/3499).
+  Thanks to jrsupplee.
+
+and fixes the following bugs:
+
+- [Added missing backtick quotes](https://github.com/wekan/wekan/commit/bf7b1789ec16e3c52397318c799ec5a0fc2de3a5).
+  Thanks to xet7.
+- [Fix some bugs when importing Wekan JSON](https://github.com/wekan/wekan/pull/3500).
+  Thanks to jrsupplee.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.89 2021-01-28 Wekan release
+
+This release fixes the following bugs:
+
+- [Try to fix quotes in Global Search](https://github.com/wekan/wekan/commit/0ff215f78f03c81d153dfc0ffa08fac94b542ec2).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.88 2021-01-28 Wekan release
+
+This release adds the following new features:
+
+- [Additional URL schemes: SolidWorks PDM (conisio:) and abas ERP (abasurl:)](https://github.com/wekan/wekan/pull/3487).
+  Thanks to tod31.
+
+and adds the following improvements:
+
+- [Mobile and Desktop have now the same Quick Access view + scrollable](https://github.com/wekan/wekan/pull/3491).
+  Thanks to mfilser.
+- [Global Search Update](https://github.com/wekan/wekan/pull/3492).
+  Thanks to jrsupplee.
+- [Added many more fields to Export to Excel, and better formatting. Does not yet have all
+  fields](https://github.com/wekan/wekan/commit/37372466ccd15c7d5d4a55510b349fac0953c425).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Changed method to create initials same as others for new user of oidc](https://github.com/wekan/wekan/pull/3489).
+  Thanks to sato-64bit.
+- [Removed quotes from docker-compose.yml settings](https://github.com/wekan/wekan/commit/b1cdcda8ed78d48505a8da5180d7aed46a24fd64).
+  Thanks to XL-Reaper, Vinc89 and xet7.
+- [Repair LDAP_REJECT_UNAUTHORIZED=false CVE-2021-3309](https://github.com/wekan/wekan/pull/3497).
+  Thanks to robert-scheck.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.87 2021-01-26 Wekan release
+
+This release fixes the following bugs:
+
+- [Reject by default LDAP connections not authorized via CA trust store](https://github.com/wekan/wekan/pull/3483).
+  Thanks to robert-scheck.
+- [Handle '\n' line breaks in PEM-encoded SSL/TLS certificates](https://github.com/wekan/wekan/pull/3485).
+  Thanks to robert-scheck.
+
+and adds the following improvements
+
+- [Try parallel build of releases, does it work](https://github.com/wekan/wekan/commit/be238ac7439ce38b4403d9a611dec9bb421a856f).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.86 2021-01-25 Wekan release
+
+This release adds the following improvements:
+
+- [Added PWA related category, orientation, screenshots, maskable icon and
+  IARC rating ID](https://github.com/wekan/wekan/commit/027771b3021a709d9049015e7d7e6faccf1ad7f3).
+  Thanks to xet7.
+- [Added PWA related monochrome icon](https://github.com/wekan/wekan/commit/2977f7cf47626b429159cb7b7496919c07ece914).
+  Thanks to xet7.
+- [Mention Wekan GitHub Discussions at readme](https://github.com/wekan/wekan/commit/4c0bd359f921ae0ea722f78946fcc1168e8b939e).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Use Node 12.20.1 in rebuild-wekan.sh](https://github.com/wekan/wekan/commit/37d76e9e061d31c11fca8e704e9b4c54f17c0023).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Move call to URL search to onRendered](https://github.com/wekan/wekan/pull/3478).
+  Thanks to jrsupplee.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.85 2021-01-23 Wekan release
+
+This release adds the following new features:
+
+- [Option to add custom field to all cards](https://github.com/wekan/wekan/pulls/3466).
+  Thanks to jrsupplee.
+- [Added checkbox as an option to custom field create dialog](https://github.com/wekan/wekan/pull/3472).
+  Thanks to jrsupplee.
+
+and adds the following improvements:
+
+- [Display My Cards lists using inline-grid](https://github.com/wekan/wekan/pull/3474).
+  Thanks to jrsupplee.
+- [Added board title link and background color to My Cards](https://github.com/wekan/wekan/pull/3471).
+  Thanks to helioguardabaxo.
+- [Use simple border at My Cards](https://github.com/wekan/wekan/pull/3475).
+  Thanks to helioguardabaxo.
+
+and adds the following updates:
+
+- Updated dependencies.
+  [Part 1](https://github.com/wekan/wekan/commit/7a66cb46a0ec334f4e95a73322641ba029f770ad),
+  [Part 2](https://github.com/wekan/wekan/commit/953cfd6ecd291196ce2ad1d4a5eac19ca21a20d9).
+  Thanks to developers of dependencies.
+
+and fixes the following bugs:
+
+- [WIP Limit: Limited number of cards highlighting to true overbooking](https://github.com/wekan/wekan/pull/3468).
+  Thanks to bronger.
+- [Revert table-cell back to inline-block at my-cards-list-wrapper](https://github.com/wekan/wekan/commit/da12c84609674bdf5121ad6b74c97c65b9fc0164).
+  Thanks to jrsupplee and xet7.
+- [Fix for search operators with uppercase letters](https://github.com/wekan/wekan/pull/3470).
+  Thanks to jrsupplee.
+- [Boards.copyTitle - escape string used in regex](https://github.com/wekan/wekan/pull/3473).
+  Thanks to jrsupplee.
+- [Bug fix: import regex escape function](https://github.com/wekan/wekan/pull/3476).
+  Thanks to jrsupplee.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.84 2021-01-22 Wekan release
+
+This release adds the following new features:
+
+- [Search All Boards: Added list of board, list and color names. Added operators for due, created and modified.
+  Added support for clicking list titles, label names and board titles. Make some heading translatable.
+  Set focus back to search phrase input after clicking a predicate. Fixed some spacing issues](https://github.com/wekan/wekan/pull/3459).
+  Thanks to jrsupplee.
+
+and fixes the following bugs:
+
+- [Fixed Upper/lowercase errors in some languages due to .toLowerCase](https://github.com/wekan/wekan/commit/a5f6dd6399142b3b05e9b6a0d106d931106807d6).
+  Thanks to bronger and xet7.
+- [Tried to fix possible prototype pollution reported by Deepcode.ai](https://github.com/wekan/wekan/commit/8f553497e4f21d44e78243d22d80b18f729a3d6a).
+  Thanks to Deepcode.ai and xet7.
+- [Disable some logs that are not needed anymore](https://github.com/wekan/wekan/commit/0373da44b38f7300f69470fed3cabab9b63c8783).
+  Thanks to xet7.
+- [Rules not copied during board copy](https://github.com/wekan/wekan/pull/3458).
+  Thanks to jrsupplee.
+ 
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v4.83 2021-01-20 Wekan release

 This release adds the following new features:
@@ -12,6 +12,7 @@
 [![Project Dependencies](https://david-dm.org/wekan/wekan.svg "Project Dependencies")](https://david-dm.org/wekan/wekan)
 [![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)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/4619/badge)](https://bestpractices.coreinfrastructure.org/projects/4619)

 ## [Translate Wekan at Transifex](https://transifex.com/wekan/wekan)

@@ -20,13 +21,12 @@ New English strings of new features can be added as PRs to edge branch file weka

 ## [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues)

-Please add most of your questions as GitHub issue: [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues).
+Please add most of your questions as GitHub issue: [Wekan Feature Requests and Bugs](https://github.com/wekan/wekan/issues).
 It's better than at chat where details get lost when chat scrolls up.

 ## Chat

-[![Wekan Chat][vanila_badge]][wekan_chat] - Most Wekan community and developers are here. Works on webbrowser
-and PWA app that can be added as icon on Android and bookmark on iOS, used like native app.
+[Discussions][discussions] - Wekan Community GitHub Discussions, that are not [Feature Requests and Bugs](https://github.com/wekan/wekan/issues).

 [Wekan IRC FAQ](https://github.com/wekan/wekan/wiki/IRC-FAQ)

@@ -114,8 +114,6 @@ with [Meteor](https://www.meteor.com).
 [translate_wekan]: https://www.transifex.com/wekan/wekan/
 [open_source]: https://en.wikipedia.org/wiki/Open-source_software
 [free_software]: https://en.wikipedia.org/wiki/Free_software
-[vanila_badge]: https://vanila.io/img/join-chat-button2.png
-[wekan_chat]: https://community.vanila.io/wekan
-
+[discussions]: https://github.com/wekan/wekan/discussions

 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_large)
@@ -1,10 +1,10 @@
 Security is very important to us. If you discover any issue regarding security, please disclose
-the information responsibly by sending an email to security (at) wekan.team and not by
+the information responsibly by sending an email to support (at) wekan.team using
+[this PGP public key](support-at-wekan.team_pgp-publickey.asc) and not by
 creating a GitHub issue. We will respond swiftly to fix verifiable security issues.

 We thank you with a place at our hall of fame page, that is
-at https://wekan.github.io/hall-of-fame . Others have just posted public GitHub issue,
-so they are not at that hall-of-fame page.
+at https://wekan.github.io/hall-of-fame

 ## How should reports be formatted?

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v4.83.0"
+appVersion: "v4.92.0"
 files:
  userUploads:
    - README.md
@@ -11,7 +11,7 @@ BlazeComponent.extendComponent({
    return Boards.find(
      { archived: true },
      {
-        sort: { sort: 1 /* boards default sorting */ },
+        sort: { archivedAt: -1, modifiedAt: -1 },
      },
    );
  },
@@ -124,9 +124,13 @@ BlazeComponent.extendComponent({
        },
        'click .js-clone-board'(evt) {
          Meteor.call(
-            'cloneBoard',
+            'copyBoard',
            this.currentData()._id,
-            Session.get('fromBoard'),
+            {
+              sort: Boards.find({ archived: false }).count(),
+              type: 'board',
+              title: Boards.findOne(this.currentData()._id).title,
+            },
            (err, res) => {
              if (err) {
                this.setError(err.error);
@@ -176,6 +176,7 @@
      border-radius: 50%
      height: 28px
      width: @height
+      margin: 0px 0px 4px 0px

    .assignee
      float: right
@@ -5,19 +5,28 @@ template(name="resultCard")
      //= card.title
    ul.result-card-context-list
      li.result-card-context(title="{{_ 'board'}}")
-        +viewer
-          = getBoard.title
+        .result-card-block-wrapper
+          +viewer
+            = getBoard.title
+        if getBoard.archived
+          i.fa.fa-archive
      li.result-card-context.result-card-context-separator
        = ' '
        | {{_ 'context-separator'}}
        = ' '
      li.result-card-context(title="{{_ 'swimlane'}}")
-        +viewer
-          = getSwimlane.title
+        .result-card-block-wrapper
+          +viewer
+            = getSwimlane.title
+        if getSwimlane.archived
+          i.fa.fa-archive
      li.result-card-context.result-card-context-separator
        = ' '
        | {{_ 'context-separator'}}
        = ' '
      li.result-card-context(title="{{_ 'list'}}")
-        +viewer
-          = getList.title
+        .result-card-block-wrapper
+          +viewer
+            = getList.title
+        if getList.archived
+          i.fa.fa-archive
@@ -19,3 +19,6 @@

 .result-card-context-list
  margin-bottom: 0.7rem
+
+.result-card-block-wrapper
+  display: inline-block
@@ -13,38 +13,43 @@ template(name="import")
 template(name="importTextarea")
  form
    p: label(for='import-textarea') {{_ instruction}} {{_ 'import-board-instruction-about-errors'}}
-    textarea.js-import-json(placeholder="{{_ importPlaceHolder}}" autofocus)
+    textarea.js-import-json(id='import-textarea' placeholder="{{_ importPlaceHolder}}" autofocus)
      | {{jsonText}}
    input.primary.wide(type="submit" value="{{_ 'import'}}")

 template(name="importMapMembers")
  h2 {{_ 'import-map-members'}}
-  .map-members
-    p {{_ 'import-members-map'}}
-    .mapping-list
-      each members
-        a.mapping-item.js-select-member(class="{{#if wekanId}}filled{{/if}}")
-          .profile-source
-            .full-name= fullName
-            .username
-              | ({{username}})
-          .wekan
-            if wekanId
-              +userAvatar(userId=wekanId)
-            else
-              a.member.add-member
-                i.fa.fa-plus
-      //-
-        Due to the way the flewbox layout is working, we need to set some
-        invisible items so that the last row items have a consistent width.
-        See http://jsfiddle.net/Ln4h3c4n/ for an minimal example of the issue.
-      .mapping-item.ghost-item
-      .mapping-item.ghost-item
-      .mapping-item.ghost-item
-      .mapping-item.ghost-item
-      .mapping-item.ghost-item
-    form
-      input.primary.wide(type="submit" value="{{_ 'done'}}")
+  if usersLoaded.get
+    .map-members
+      p {{_ 'import-members-map'}}
+      p.import-members-map-note
+        | {{_ 'import-members-map-note' }}
+      .mapping-list
+        each members
+          a.mapping-item.js-select-member(class="{{#if wekanId}}filled{{/if}}")
+            .profile-source
+              .full-name= fullName
+              .username
+                | ({{username}})
+            .wekan
+              if wekanId
+                +userAvatar(userId=wekanId)
+              else
+                a.member.add-member
+                  i.fa.fa-plus
+        //-
+          Due to the way the flewbox layout is working, we need to set some
+          invisible items so that the last row items have a consistent width.
+          See http://jsfiddle.net/Ln4h3c4n/ for an minimal example of the issue.
+        .mapping-item.ghost-item
+        .mapping-item.ghost-item
+        .mapping-item.ghost-item
+        .mapping-item.ghost-item
+        .mapping-item.ghost-item
+      form
+        input.primary.wide(type="submit" value="{{_ 'done'}}")
+  else
+    +spinner

 template(name="importMapMembersAddPopup")
  .select-member
@@ -150,14 +150,42 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  onCreated() {
+    this.usersLoaded = new ReactiveVar(false);
+
    this.autorun(() => {
-      this.parentComponent()
-        .membersToMap.get()
-        .forEach(({ wekanId }) => {
-          if (wekanId) {
-            this.subscribe('user-miniprofile', wekanId);
+      const handle = this.subscribe(
+        'user-miniprofile',
+        this.members().map(member => {
+          return member.username;
+        }),
+      );
+      Tracker.nonreactive(() => {
+        Tracker.autorun(() => {
+          if (
+            handle.ready() &&
+            !this.usersLoaded.get() &&
+            this.members().length
+          ) {
+            this._refreshMembers(
+              this.members().map(member => {
+                if (!member.wekanId) {
+                  let user = Users.findOne({ username: member.username });
+                  if (!user) {
+                    user = Users.findOne({ importUsernames: member.username });
+                  }
+                  if (user) {
+                    // eslint-disable-next-line no-console
+                    // console.log('found username:', user.username);
+                    member.wekanId = user._id;
+                  }
+                }
+                return member;
+              }),
+            );
          }
+          this.usersLoaded.set(handle.ready());
        });
+      });
    });
  },

@@ -47,3 +47,7 @@

 a.show-mapping
  text-decoration underline
+
+.import-members-map-note
+  font-size: 90%
+  font-weight: bold
@@ -239,7 +239,7 @@ BlazeComponent.extendComponent({
        .customFields()
        .fetch(),
      function(field) {
-        if (field.automaticallyOnCard)
+        if (field.automaticallyOnCard || field.alwaysOnCard)
          arr.push({ _id: field._id, value: null });
      },
    );
@@ -675,12 +675,18 @@ BlazeComponent.extendComponent({
            element.type = 'swimlane';
            _id = element.copy(this.boardId);
          } else if (this.isBoardTemplateSearch) {
-            board = Boards.findOne(element.linkedId);
-            board.sort = Boards.find({ archived: false }).count();
-            board.type = 'board';
-            board.title = element.title;
-            delete board.slug;
-            _id = board.copy();
+            Meteor.call(
+              'copyBoard',
+              element.linkedId,
+              {
+                sort: Boards.find({ archived: false }).count(),
+                type: 'board',
+                title: element.title,
+              },
+              (err, data) => {
+                _id = data;
+              },
+            );
          }
          Popup.close();
        },
@@ -15,7 +15,7 @@ template(name="listHeader")
          = title
        if wipLimit.enabled
         |&nbsp;(
-         span(class="{{#if reachedWipLimit}}highlight{{/if}}") {{cards.count}}
+         span(class="{{#if exceededWipLimit}}highlight{{/if}}") {{cards.count}}
         |/#{wipLimit.value})

        if showCardsCountForList cards.count
@@ -72,6 +72,14 @@ BlazeComponent.extendComponent({
    );
  },

+  exceededWipLimit() {
+    const list = Template.currentData();
+    return (
+      list.getWipLimit('enabled') &&
+      list.getWipLimit('value') < list.cards().count()
+    );
+  },
+
  showCardsCountForList(count) {
    const limit = this.limitToShowCardsCount();
    return limit > 0 && count > limit;
@@ -60,7 +60,7 @@ BlazeComponent.extendComponent({

  dueCardsView() {
    // eslint-disable-next-line no-console
-    console.log('sort:', Utils.dueCardsView());
+    //console.log('sort:', Utils.dueCardsView());
    return Utils.dueCardsView();
  },

@@ -278,6 +278,8 @@ function mySafeAttrValue(tag, name, value, cssFilter) {
      /^aodroplink:/gi.test(value) ||
      /^onenote:/gi.test(value) ||
      /^file:/gi.test(value) ||
+      /^abasurl:/gi.test(value) ||
+      /^conisio:/gi.test(value) ||
      /^mailspring:/gi.test(value)
    ) {
      return value;
@@ -14,7 +14,14 @@ template(name="globalSearch")
  if currentUser
    .wrapper
      form.global-search-instructions.js-search-query-form
-        input.global-search-query-input(type="text" name="searchQuery" placeholder="{{_ 'search-example'}}" value="{{ query.get }}" autofocus dir="auto")
+        input.global-search-query-input(
+          id="global-search-input"
+          type="text"
+          name="searchQuery"
+          placeholder="{{_ 'search-example'}}"
+          value="{{ query.get }}"
+          autofocus dir="auto"
+        )
      if searching.get
        +spinner
      else if hasResults.get
@@ -23,15 +30,45 @@ template(name="globalSearch")
            div
              each msg in errorMessages
                span.global-search-error-messages
-                  | {{_ msg.tag msg.value }}
+                  = msg
          else
            h1
              = resultsHeading.get
              a.fa.fa-link(title="{{_ 'link-to-search' }}" href="{{ getSearchHref }}")
-            each card in results
+            each card in results.get
              +resultCard(card)
+            table.global-search-footer
+              tr
+                td.global-search-previous-page
+                  if hasPreviousPage.get
+                    button.js-previous-page
+                      | {{_ 'previous-page' }}
+                td.global-search-next-page(align="right")
+                  if hasNextPage.get
+                    button.js-next-page
+                      | {{_ 'next-page' }}
      else
        .global-search-instructions
+          h2 {{_ 'boards' }}
+          .lists-wrapper
+            each title in myBoardNames.get
+              span.card-label.list-title.js-board-title
+                = title
+          h2 {{_ 'lists' }}
+          .lists-wrapper
+            each title in myLists.get
+              span.card-label.list-title.js-list-title
+                = title
+          h2 {{_ 'label-colors' }}
+          .palette-colors: each label in labelColors
+            span.card-label.palette-color.js-label-color(class="card-label-{{label.color}}")
+              = label.name
+          if myLabelNames.get.length
+            h2 {{_ 'label-names' }}
+            .lists-wrapper
+              each name in myLabelNames.get
+                span.card-label.list-title.js-label-name
+                  = name
          +viewer
            = searchInstructions

@@ -42,20 +42,48 @@ BlazeComponent.extendComponent({
    this.query = new ReactiveVar('');
    this.resultsHeading = new ReactiveVar('');
    this.searchLink = new ReactiveVar(null);
+    this.myLists = new ReactiveVar([]);
+    this.myLabelNames = new ReactiveVar([]);
+    this.myBoardNames = new ReactiveVar([]);
+    this.results = new ReactiveVar([]);
+    this.hasNextPage = new ReactiveVar(false);
+    this.hasPreviousPage = new ReactiveVar(false);
    this.queryParams = null;
    this.parsingErrors = [];
    this.resultsCount = 0;
    this.totalHits = 0;
    this.queryErrors = null;
    this.colorMap = null;
-    // this.colorMap = {};
-    // for (const color of Boards.simpleSchema()._schema['labels.$.color']
-    //   .allowedValues) {
-    //   this.colorMap[TAPi18n.__(`color-${color}`)] = color;
-    // }
-    // // eslint-disable-next-line no-console
-    // console.log('colorMap:', this.colorMap);
+    this.resultsPerPage = 25;
+
+    Meteor.call('myLists', (err, data) => {
+      if (!err) {
+        this.myLists.set(data);
+      }
+    });
+
+    Meteor.call('myLabelNames', (err, data) => {
+      if (!err) {
+        this.myLabelNames.set(data);
+      }
+    });
+
+    Meteor.call('myBoardNames', (err, data) => {
+      if (!err) {
+        this.myBoardNames.set(data);
+      }
+    });
+  },
+
+  onRendered() {
    Meteor.subscribe('setting');
+
+    // eslint-disable-next-line no-console
+    //console.log('lang:', TAPi18n.getLanguage());
+    this.colorMap = Boards.colorMap();
+    // eslint-disable-next-line no-console
+    // console.log('colorMap:', this.colorMap);
+
    if (Session.get('globalQuery')) {
      this.searchAllBoards(Session.get('globalQuery'));
    }
@@ -63,6 +91,7 @@ BlazeComponent.extendComponent({

  resetSearch() {
    this.searching.set(false);
+    this.results.set([]);
    this.hasResults.set(false);
    this.hasQueryErrors.set(false);
    this.resultsHeading.set('');
@@ -72,77 +101,83 @@ BlazeComponent.extendComponent({
    this.queryErrors = null;
  },

-  results() {
+  getSessionData() {
+    return SessionData.findOne({
+      userId: Meteor.userId(),
+      sessionId: SessionData.getSessionId(),
+    });
+  },
+
+  getResults() {
    // eslint-disable-next-line no-console
    // console.log('getting results');
    if (this.queryParams) {
-      const results = Cards.globalSearch(this.queryParams);
-      this.queryErrors = results.errors;
+      const sessionData = this.getSessionData();
      // eslint-disable-next-line no-console
-      // console.log('errors:', this.queryErrors);
-      if (this.errorMessages().length) {
+      // console.log('selector:', sessionData.getSelector());
+      // console.log('session data:', sessionData);
+      const cards = Cards.find({ _id: { $in: sessionData.cards } });
+      this.queryErrors = sessionData.errors;
+      if (this.queryErrors.length) {
        this.hasQueryErrors.set(true);
        return null;
      }

-      if (results.cards) {
-        const sessionData = SessionData.findOne({ userId: Meteor.userId() });
+      if (cards) {
        this.totalHits = sessionData.totalHits;
-        this.resultsCount = results.cards.count();
+        this.resultsCount = cards.count();
+        this.resultsStart = sessionData.lastHit - this.resultsCount + 1;
+        this.resultsEnd = sessionData.lastHit;
        this.resultsHeading.set(this.getResultsHeading());
-        return results.cards;
+        this.results.set(cards);
+        this.hasNextPage.set(sessionData.lastHit < sessionData.totalHits);
+        this.hasPreviousPage.set(
+          sessionData.lastHit - sessionData.resultsCount > 0,
+        );
      }
    }
    this.resultsCount = 0;
-    return [];
+    return null;
  },

  errorMessages() {
-    const messages = [];
-
-    if (this.queryErrors) {
-      this.queryErrors.notFound.boards.forEach(board => {
-        messages.push({ tag: 'board-title-not-found', value: board });
-      });
-      this.queryErrors.notFound.swimlanes.forEach(swim => {
-        messages.push({ tag: 'swimlane-title-not-found', value: swim });
-      });
-      this.queryErrors.notFound.lists.forEach(list => {
-        messages.push({ tag: 'list-title-not-found', value: list });
-      });
-      this.queryErrors.notFound.labels.forEach(label => {
-        const color = TAPi18n.__(`color-${label}`);
-        if (color) {
-          messages.push({
-            tag: 'label-color-not-found',
-            value: color,
-          });
-        } else {
-          messages.push({ tag: 'label-not-found', value: label });
-        }
-      });
-      this.queryErrors.notFound.users.forEach(user => {
-        messages.push({ tag: 'user-username-not-found', value: user });
-      });
-      this.queryErrors.notFound.members.forEach(user => {
-        messages.push({ tag: 'user-username-not-found', value: user });
-      });
-      this.queryErrors.notFound.assignees.forEach(user => {
-        messages.push({ tag: 'user-username-not-found', value: user });
-      });
+    if (this.parsingErrors.length) {
+      return this.parsingErrorMessages();
    }
+    return this.queryErrorMessages();
+  },
+
+  parsingErrorMessages() {
+    const messages = [];

    if (this.parsingErrors.length) {
      this.parsingErrors.forEach(err => {
-        messages.push(err);
+        messages.push(TAPi18n.__(err.tag, err.value));
      });
    }

    return messages;
  },

+  queryErrorMessages() {
+    messages = [];
+
+    this.queryErrors.forEach(err => {
+      let value = err.color ? TAPi18n.__(`color-${err.value}`) : err.value;
+      if (!value) {
+        value = err.value;
+      }
+      messages.push(TAPi18n.__(err.tag, value));
+    });
+
+    return messages;
+  },
+
  searchAllBoards(query) {
    query = query.trim();
+    // eslint-disable-next-line no-console
+    //console.log('query:', query);
+
    this.query.set(query);

    this.resetSearch();
@@ -151,44 +186,84 @@ BlazeComponent.extendComponent({
      return;
    }

-    // eslint-disable-next-line no-console
-    // console.log('query:', query);
-
    this.searching.set(true);

-    if (!this.colorMap) {
-      this.colorMap = {};
-      for (const color of Boards.simpleSchema()._schema['labels.$.color']
-        .allowedValues) {
-        this.colorMap[TAPi18n.__(`color-${color}`)] = color;
-      }
-    }
+    const reOperator1 = new RegExp(
+      '^((?<operator>[\\p{Letter}\\p{Mark}]+):|(?<abbrev>[#@]))(?<value>[\\p{Letter}\\p{Mark}]+)(\\s+|$)',
+      'iu',
+    );
+    const reOperator2 = new RegExp(
+      '^((?<operator>[\\p{Letter}\\p{Mark}]+):|(?<abbrev>[#@]))(?<quote>["\']*)(?<value>.*?)\\k<quote>(\\s+|$)',
+      'iu',
+    );
+    const reText = new RegExp('^(?<text>\\S+)(\\s+|$)', 'u');
+    const reQuotedText = new RegExp(
+      '^(?<quote>["\'])(?<text>.*?)\\k<quote>(\\s+|$)',
+      'u',
+    );

-    const reOperator1 = /^((?<operator>\w+):|(?<abbrev>[#@]))(?<value>\w+)(\s+|$)/;
-    const reOperator2 = /^((?<operator>\w+):|(?<abbrev>[#@]))(?<quote>["']*)(?<value>.*?)\k<quote>(\s+|$)/;
-    const reText = /^(?<text>\S+)(\s+|$)/;
-    const reQuotedText = /^(?<quote>["'])(?<text>\w+)\k<quote>(\s+|$)/;
+    const operators = {
+      'operator-board': 'boards',
+      'operator-board-abbrev': 'boards',
+      'operator-swimlane': 'swimlanes',
+      'operator-swimlane-abbrev': 'swimlanes',
+      'operator-list': 'lists',
+      'operator-list-abbrev': 'lists',
+      'operator-label': 'labels',
+      'operator-label-abbrev': 'labels',
+      'operator-user': 'users',
+      'operator-user-abbrev': 'users',
+      'operator-member': 'members',
+      'operator-member-abbrev': 'members',
+      'operator-assignee': 'assignees',
+      'operator-assignee-abbrev': 'assignees',
+      'operator-status': 'status',
+      'operator-due': 'dueAt',
+      'operator-created': 'createdAt',
+      'operator-modified': 'modifiedAt',
+      'operator-comment': 'comments',
+    };
+
+    const predicates = {
+      due: {
+        'predicate-overdue': 'overdue',
+      },
+      durations: {
+        'predicate-week': 'week',
+        'predicate-month': 'month',
+        'predicate-quarter': 'quarter',
+        'predicate-year': 'year',
+      },
+      status: {
+        'predicate-archived': 'archived',
+        'predicate-all': 'all',
+        'predicate-ended': 'ended',
+      },
+      sorts: {
+        'predicate-due': 'dueAt',
+        'predicate-created': 'createdAt',
+        'predicate-modified': 'modifiedAt',
+      },
+    };
+    const predicateTranslations = {};
+    Object.entries(predicates).forEach(([category, catPreds]) => {
+      predicateTranslations[category] = {};
+      Object.entries(catPreds).forEach(([tag, value]) => {
+        predicateTranslations[category][TAPi18n.__(tag)] = value;
+      });
+    });
+    // eslint-disable-next-line no-console
+    // console.log('predicateTranslations:', predicateTranslations);

    const operatorMap = {};
-    operatorMap[TAPi18n.__('operator-board')] = 'boards';
-    operatorMap[TAPi18n.__('operator-board-abbrev')] = 'boards';
-    operatorMap[TAPi18n.__('operator-swimlane')] = 'swimlanes';
-    operatorMap[TAPi18n.__('operator-swimlane-abbrev')] = 'swimlanes';
-    operatorMap[TAPi18n.__('operator-list')] = 'lists';
-    operatorMap[TAPi18n.__('operator-list-abbrev')] = 'lists';
-    operatorMap[TAPi18n.__('operator-label')] = 'labels';
-    operatorMap[TAPi18n.__('operator-label-abbrev')] = 'labels';
-    operatorMap[TAPi18n.__('operator-user')] = 'users';
-    operatorMap[TAPi18n.__('operator-user-abbrev')] = 'users';
-    operatorMap[TAPi18n.__('operator-member')] = 'members';
-    operatorMap[TAPi18n.__('operator-member-abbrev')] = 'members';
-    operatorMap[TAPi18n.__('operator-assignee')] = 'assignees';
-    operatorMap[TAPi18n.__('operator-assignee-abbrev')] = 'assignees';
-    operatorMap[TAPi18n.__('operator-is')] = 'is';
-
+    Object.entries(operators).forEach(([key, value]) => {
+      operatorMap[TAPi18n.__(key).toLowerCase()] = value;
+    });
    // eslint-disable-next-line no-console
    // console.log('operatorMap:', operatorMap);
+
    const params = {
+      limit: this.resultsPerPage,
      boards: [],
      swimlanes: [],
      lists: [],
@@ -196,7 +271,11 @@ BlazeComponent.extendComponent({
      members: [],
      assignees: [],
      labels: [],
-      is: [],
+      status: [],
+      dueAt: null,
+      createdAt: null,
+      modifiedAt: null,
+      comments: [],
    };

    let text = '';
@@ -215,16 +294,71 @@ BlazeComponent.extendComponent({
        if (m.groups.operator) {
          op = m.groups.operator.toLowerCase();
        } else {
-          op = m.groups.abbrev;
+          op = m.groups.abbrev.toLowerCase();
        }
-        if (op in operatorMap) {
+        if (operatorMap.hasOwnProperty(op)) {
          let value = m.groups.value;
          if (operatorMap[op] === 'labels') {
            if (value in this.colorMap) {
              value = this.colorMap[value];
+              // console.log('found color:', value);
+            }
+          } else if (
+            ['dueAt', 'createdAt', 'modifiedAt'].includes(operatorMap[op])
+          ) {
+            let days = parseInt(value, 10);
+            let duration = null;
+            if (isNaN(days)) {
+              if (predicateTranslations.durations[value]) {
+                duration = predicateTranslations.durations[value];
+                value = moment();
+              } else if (predicateTranslations.due[value] === 'overdue') {
+                value = moment();
+                duration = 'days';
+                days = 0;
+              } else {
+                this.parsingErrors.push({
+                  tag: 'operator-number-expected',
+                  value: { operator: op, value },
+                });
+                value = null;
+              }
+            } else {
+              value = moment();
+            }
+            if (value) {
+              if (operatorMap[op] === 'dueAt') {
+                value = value.add(days, duration ? duration : 'days').format();
+              } else {
+                value = value
+                  .subtract(days, duration ? duration : 'days')
+                  .format();
+              }
+            }
+          } else if (operatorMap[op] === 'sort') {
+            if (!predicateTranslations.sorts[value]) {
+              this.parsingErrors.push({
+                tag: 'operator-sort-invalid',
+                value,
+              });
+            } else {
+              value = predicateTranslations.sorts[value];
+            }
+          } else if (operatorMap[op] === 'status') {
+            if (!predicateTranslations.status[value]) {
+              this.parsingErrors.push({
+                tag: 'operator-status-invalid',
+                value,
+              });
+            } else {
+              value = predicateTranslations.status[value];
            }
          }
-          params[operatorMap[op]].push(value);
+          if (Array.isArray(params[operatorMap[op]])) {
+            params[operatorMap[op]].push(value);
+          } else {
+            params[operatorMap[op]] = value;
+          }
        } else {
          this.parsingErrors.push({
            tag: 'operator-unknown-error',
@@ -253,17 +387,83 @@ BlazeComponent.extendComponent({
    params.text = text;

    // eslint-disable-next-line no-console
-    // console.log('params:', params);
+    console.log('params:', params);

    this.queryParams = params;

+    if (this.parsingErrors.length) {
+      this.searching.set(false);
+      this.queryErrors = this.parsingErrorMessages();
+      this.hasResults.set(true);
+      this.hasQueryErrors.set(true);
+      return;
+    }
+
    this.autorun(() => {
-      const handle = subManager.subscribe('globalSearch', params);
+      const handle = Meteor.subscribe(
+        'globalSearch',
+        SessionData.getSessionId(),
+        params,
+      );
      Tracker.nonreactive(() => {
        Tracker.autorun(() => {
-          // eslint-disable-next-line no-console
-          // console.log('ready:', handle.ready());
          if (handle.ready()) {
+            this.getResults();
+            this.searching.set(false);
+            this.hasResults.set(true);
+          }
+        });
+      });
+    });
+  },
+
+  nextPage() {
+    sessionData = this.getSessionData();
+
+    const params = {
+      limit: this.resultsPerPage,
+      selector: sessionData.getSelector(),
+      skip: sessionData.lastHit,
+    };
+
+    this.autorun(() => {
+      const handle = Meteor.subscribe(
+        'globalSearch',
+        SessionData.getSessionId(),
+        params,
+      );
+      Tracker.nonreactive(() => {
+        Tracker.autorun(() => {
+          if (handle.ready()) {
+            this.getResults();
+            this.searching.set(false);
+            this.hasResults.set(true);
+          }
+        });
+      });
+    });
+  },
+
+  previousPage() {
+    sessionData = this.getSessionData();
+
+    const params = {
+      limit: this.resultsPerPage,
+      selector: sessionData.getSelector(),
+      skip:
+        sessionData.lastHit - sessionData.resultsCount - this.resultsPerPage,
+    };
+
+    this.autorun(() => {
+      const handle = Meteor.subscribe(
+        'globalSearch',
+        SessionData.getSessionId(),
+        params,
+      );
+      Tracker.nonreactive(() => {
+        Tracker.autorun(() => {
+          if (handle.ready()) {
+            this.getResults();
            this.searching.set(false);
            this.hasResults.set(true);
          }
@@ -282,8 +482,8 @@ BlazeComponent.extendComponent({
    }

    return TAPi18n.__('n-n-of-n-cards-found', {
-      start: 1,
-      end: this.resultsCount,
+      start: this.resultsStart,
+      end: this.resultsEnd,
      total: this.totalHits,
    });
  },
@@ -298,6 +498,7 @@ BlazeComponent.extendComponent({
      operator_board: TAPi18n.__('operator-board'),
      operator_list: TAPi18n.__('operator-list'),
      operator_swimlane: TAPi18n.__('operator-swimlane'),
+      operator_comment: TAPi18n.__('operator-comment'),
      operator_label: TAPi18n.__('operator-label'),
      operator_label_abbrev: TAPi18n.__('operator-label-abbrev'),
      operator_user: TAPi18n.__('operator-user'),
@@ -306,6 +507,18 @@ BlazeComponent.extendComponent({
      operator_member_abbrev: TAPi18n.__('operator-member-abbrev'),
      operator_assignee: TAPi18n.__('operator-assignee'),
      operator_assignee_abbrev: TAPi18n.__('operator-assignee-abbrev'),
+      operator_due: TAPi18n.__('operator-due'),
+      operator_created: TAPi18n.__('operator-created'),
+      operator_modified: TAPi18n.__('operator-modified'),
+      operator_status: TAPi18n.__('operator-status'),
+      predicate_overdue: TAPi18n.__('predicate-overdue'),
+      predicate_archived: TAPi18n.__('predicate-archived'),
+      predicate_all: TAPi18n.__('predicate-all'),
+      predicate_ended: TAPi18n.__('predicate-ended'),
+      predicate_week: TAPi18n.__('predicate-week'),
+      predicate_month: TAPi18n.__('predicate-month'),
+      predicate_quarter: TAPi18n.__('predicate-quarter'),
+      predicate_year: TAPi18n.__('predicate-year'),
    };

    text = `# ${TAPi18n.__('globalSearch-instructions-heading')}`;
@@ -323,6 +536,10 @@ BlazeComponent.extendComponent({
      'globalSearch-instructions-operator-swimlane',
      tags,
    )}`;
+    text += `\n* ${TAPi18n.__(
+      'globalSearch-instructions-operator-comment',
+      tags,
+    )}`;
    text += `\n* ${TAPi18n.__(
      'globalSearch-instructions-operator-label',
      tags,
@@ -344,17 +561,41 @@ BlazeComponent.extendComponent({
      'globalSearch-instructions-operator-assignee',
      tags,
    )}`;
+    text += `\n* ${TAPi18n.__('globalSearch-instructions-operator-due', tags)}`;
+    text += `\n* ${TAPi18n.__(
+      'globalSearch-instructions-operator-created',
+      tags,
+    )}`;
+    text += `\n* ${TAPi18n.__(
+      'globalSearch-instructions-operator-modified',
+      tags,
+    )}`;
+    text += `\n* ${TAPi18n.__(
+      'globalSearch-instructions-status-archived',
+      tags,
+    )}`;
+    text += `\n* ${TAPi18n.__('globalSearch-instructions-status-all', tags)}`;
+    text += `\n* ${TAPi18n.__('globalSearch-instructions-status-ended', tags)}`;

    text += `\n## ${TAPi18n.__('heading-notes')}`;
    text += `\n* ${TAPi18n.__('globalSearch-instructions-notes-1', tags)}`;
    text += `\n* ${TAPi18n.__('globalSearch-instructions-notes-2', tags)}`;
    text += `\n* ${TAPi18n.__('globalSearch-instructions-notes-3', tags)}`;
+    text += `\n* ${TAPi18n.__('globalSearch-instructions-notes-3-2', tags)}`;
    text += `\n* ${TAPi18n.__('globalSearch-instructions-notes-4', tags)}`;
    text += `\n* ${TAPi18n.__('globalSearch-instructions-notes-5', tags)}`;

    return text;
  },

+  labelColors() {
+    return Boards.simpleSchema()._schema['labels.$.color'].allowedValues.map(
+      color => {
+        return { color, name: TAPi18n.__(`color-${color}`) };
+      },
+    );
+  },
+
  events() {
    return [
      {
@@ -362,6 +603,54 @@ BlazeComponent.extendComponent({
          evt.preventDefault();
          this.searchAllBoards(evt.target.searchQuery.value);
        },
+        'click .js-next-page'(evt) {
+          evt.preventDefault();
+          this.nextPage();
+        },
+        'click .js-previous-page'(evt) {
+          evt.preventDefault();
+          this.previousPage();
+        },
+        'click .js-label-color'(evt) {
+          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
+          this.query.set(
+            `${input.value} ${TAPi18n.__('operator-label')}:"${
+              evt.currentTarget.textContent
+            }"`,
+          );
+          document.getElementById('global-search-input').focus();
+        },
+        'click .js-board-title'(evt) {
+          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
+          this.query.set(
+            `${input.value} ${TAPi18n.__('operator-board')}:"${
+              evt.currentTarget.textContent
+            }"`,
+          );
+          document.getElementById('global-search-input').focus();
+        },
+        'click .js-list-title'(evt) {
+          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
+          this.query.set(
+            `${input.value} ${TAPi18n.__('operator-list')}:"${
+              evt.currentTarget.textContent
+            }"`,
+          );
+          document.getElementById('global-search-input').focus();
+        },
+        'click .js-label-name'(evt) {
+          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
+          this.query.set(
+            `${input.value} ${TAPi18n.__('operator-label')}:"${
+              evt.currentTarget.textContent
+            }"`,
+          );
+          document.getElementById('global-search-input').focus();
+        },
      },
    ];
  },
@@ -78,6 +78,12 @@
  margin-left: auto
  line-height: 150%

+.global-search-instructions h1
+  margin-top: 2rem;
+
+.global-search-instructions h2
+  margin-top: 1rem;
+
 .global-search-query-input
  width: 90% !important
  margin-right: auto
@@ -95,3 +101,18 @@ code
  background-color: lightgrey
  padding: 0.1rem !important
  font-size: 0.7rem !important
+
+.list-title
+  background-color: darkgray
+
+.global-search-footer
+  border: none
+  width: 100%
+
+.global-search-next-page
+  border: none
+  text-align: right;
+
+.global-search-previous-page
+  border: none
+  text-align: left;
@@ -7,16 +7,21 @@ template(name="header")
  if currentUser
    #header-quick-access(class=currentBoard.colorClass)
      if isMiniScreen
-        ul
-          li
-            a(href="{{pathFor 'home'}}")
-              span.fa.fa-home
+        span
+          a(href="{{pathFor 'home'}}")
+            span.fa.fa-home

+        ul
          if currentList
            each currentBoard.lists
              li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}")
                a.js-select-list
                  = title
+          else
+            each currentUser.starredBoards
+              li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
+                a(href="{{pathFor 'board' id=_id slug=slug}}")
+                  = title
        #header-new-board-icon
      else
        //-
@@ -32,18 +37,16 @@ template(name="header")
              img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="{{#if currentSetting.customTopLeftCornerLogoHeight}}#{currentSetting.customTopLeftCornerLogoHeight}{{else}}27{{/if}}" width="auto" margin="0" padding="0")
          unless currentSetting.customTopLeftCornerLogoImageUrl
            img(src="{{pathFor '/logo-header.png'}}" alt="")
+        span
+          a(href="{{pathFor 'home'}}")
+            span.fa.fa-home
+            | {{_ 'all-boards'}}
        ul
-          li
-            a(href="{{pathFor 'home'}}")
-              span.fa.fa-home
-              | {{_ 'all-boards'}}
-          li.separator -
          //li
          //  a(href="{{pathFor 'public'}}")
          //    span.fa.fa-globe
          //    | {{_ 'public'}}
          each currentUser.starredBoards
-            li.separator -
            li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
              a(href="{{pathFor 'board' id=_id slug=slug}}")
                = title
@@ -100,6 +100,7 @@
  font-size: 12px
  display: flex
  z-index: 21
+  padding: 10px 0px

  #header-user-bar,
  #header-new-board-icon,
@@ -114,15 +115,22 @@

  ul
    transition: opacity 0.2s
-    margin: 4px 0 0 5px
-    overflow: hidden
+    overflow-x: auto
+    overflow-y: hidden
+    white-space: nowrap
+    padding: 10px
+    margin: -10px

    li
-      display: block
-      float: left
+      display: inline
      width: auto
      color: darken(white, 15%)
-      padding: 2px 5px 0
+      padding: 12px 0px
+      margin: -10px 0px
+
+      a
+        padding: 12px 10px
+        margin: -10px 0px

      &.current
        color: darken(white, 5%)
@@ -186,37 +194,31 @@
  #header-quick-access
    transition: background-color 0.4s
    width: 100%
-    padding: 10px 0px
    z-index: 30

    ul
      width: calc(100% - 60px)
-      overflow: ellipsis
-      padding: 10px
-      margin: -10px
+      margin-right: 10px

      li
        height: 100%
-        padding: 12px 0px
-        margin: -10px 0px

        a
          height: 100%
-          padding: 12px 10px
-          margin: -10px 0px

-        .fa-home
+    span
+      .fa-home
          font-size: 26px
          margin-top: -2px
+          margin-right: 20px

    #header-new-board-icon
      display: none

    #header-user-bar
-      position: absolute
      right: 0px
      padding: 10px
-      margin: -10px 0 -10px -10px
+      margin: -8px 0 -10px -10px

 .announcement .viewer
  display: inline-block
@@ -29,9 +29,10 @@ template(name="myCards")
        if $eq myCardsSort 'board'
          each board in myCardsList
            .my-cards-board-wrapper
-              .my-cards-board-title
-                +viewer
-                  = board.title
+              .my-cards-board-title(class=board.colorClass, id="header")
+                a(href=board.absoluteUrl)
+                  +viewer 
+                    = board.title
              each swimlane in board.mySwimlanes
                .my-cards-swimlane-title(class="{{#if swimlane.colorClass}}{{ swimlane.colorClass }}{{else}}swimlane-default-color{{/if}}")
                  +viewer
@@ -1,14 +1,14 @@
 .my-cards-board-wrapper
-  border-radius: 8px
+  border-radius: 0 0 4px 4px;
  //padding: 0.5rem
  min-width: 400px
-  border-width: 8px
-  border-color: grey
-  border-style: solid
  margin-bottom: 2rem
  margin-right: auto
  margin-left: auto
-
+  border-width: 2px
+  border-style: solid
+  border-color: #a2a2a2
+  
 .my-cards-board-title
  font-size: 1.4rem
  font-weight: bold
@@ -41,9 +41,9 @@
 .my-cards-list-wrapper
  margin: 1rem
  border-radius: 5px
-  padding: 1.5rem
-  padding-top: 0.75rem
-  display: table-cell
+  //padding: 1.5rem
+  //padding-top: 0.75rem
+  display: inline-grid
  min-width: 250px
  max-width: 350px

@@ -5,7 +5,7 @@
  .notification
    display: flex
    float: none
-    padding: 12px 8px 8px
+    padding: 15px 8px 8px
    color: black
    border-bottom: 1px solid #dbdbdb

@@ -14,6 +14,7 @@

    .read-status
      width: 30px
+      padding: 0px 10px 0px 0px

      input
        width: 24px
@@ -28,13 +29,19 @@
        color: #bbb

    .details
-      width: calc(100% - 30px)

      .activity
        display: flex

+        a.member
+          margin: 0px 0px 0px 0px
+          padding: 0px
+
+          svg
+            padding: 3px
+
        .activity-desc
-          width: 100%;
+          margin: 0px 0px 0px 5px

        .activity-comment
          display: block
@@ -55,3 +62,14 @@
    .remove
      a:hover
        color #eb4646 !important
+
+@media screen and (max-width: 800px)
+  #notifications-drawer
+    .notification
+      height: auto
+
+      .details
+        .activity
+          a.member
+            height: 36px
+            width: 36px
@@ -2,7 +2,7 @@ belize = #2980b9

 section#notifications-drawer
  position: fixed
-  top: 28px
+  top: 48px
  right: 0
  width: 400px
  background-color: #fafafa
@@ -17,7 +17,7 @@ section#notifications-drawer

  .header
    position: fixed
-    top 28px
+    top 48px
    right 0
    width calc(400px - 32px)
    padding: 8px 16px
@@ -63,7 +63,7 @@ section#notifications-drawer

  ul.notifications
    display: block
-    padding: 0px 16px
+    padding: 0px 16px 0px 16px
    margin: 0
-    height: calc(100vh - 102px)
+    height: calc(100vh - 122px)
    overflow-y: scroll
@@ -110,6 +110,7 @@ template(name="peopleGeneral")
        th {{_ 'createdAt'}}
        th {{_ 'active'}}
        th {{_ 'authentication-method'}}
+        th {{_ 'import-usernames'}}
        th
          +newUserRow
      each user in peopleList
@@ -257,6 +258,10 @@ template(name="peopleRow")
      td <s>{{_ userData.authenticationMethod }}</s>
    else
      td {{_ userData.authenticationMethod }}
+    if userData.loginDisabled
+      td <s>{{ userData.importUsernamesString }}</s>
+    else
+      td {{ userData.importUsernamesString }}
    td
      a.edit-user
        i.fa.fa-edit
@@ -346,6 +351,9 @@ template(name="editUserPopup")
        input.js-profile-email(type="email" value="{{user.emails.[0].address}}" readonly)
      else
        input.js-profile-email(type="email" value="{{user.emails.[0].address}}" required)
+    label
+      | {{_ 'import-usernames'}}
+      input.js-import-usernames(type="text" value=user.importUsernames)
    label
      | {{_ 'verified'}}
      select.select-verified.js-profile-email-verified
@@ -444,6 +452,9 @@ template(name="newUserPopup")
      //  input.js-profile-email(type="email" value="{{user.emails.[0].address}}" readonly)
      //else
      input.js-profile-email(type="email" value="" required)
+    label
+      | {{_ 'import-usernames'}}
+      input.js-import-usernames(type="text" value="")
    label
      | {{_ 'admin'}}
      select.select-role.js-profile-isadmin
@@ -143,7 +143,7 @@ BlazeComponent.extendComponent({
    const orgs = Org.find(this.findOrgsOptions.get(), {
      fields: { _id: true },
    });
-    this.numberOrgs.set(org.count(false));
+    this.numberOrgs.set(orgs.count(false));
    return orgs;
  },
  teamList() {
@@ -421,6 +421,9 @@ Template.editUserPopup.events({
    const authentication = templateInstance
      .find('.js-authenticationMethod')
      .value.trim();
+    const importUsernames = templateInstance
+      .find('.js-import-usernames')
+      .value.trim();

    const isChangePassword = password.length > 0;
    const isChangeUserName = username !== user.username;
@@ -441,6 +444,7 @@ Template.editUserPopup.events({
        isAdmin: isAdmin === 'true',
        loginDisabled: isActive === 'true',
        authenticationMethod: authentication,
+        importUsernames: Users.parseImportUsernames(importUsernames),
      },
    });

@@ -563,6 +567,9 @@ Template.newUserPopup.events({
    const isAdmin = templateInstance.find('.js-profile-isadmin').value.trim();
    const isActive = templateInstance.find('.js-profile-isactive').value.trim();
    const email = templateInstance.find('.js-profile-email').value.trim();
+    const importUsernames = templateInstance
+      .find('.js-import-usernames')
+      .value.trim();

    Meteor.call(
      'setCreateUser',
@@ -572,6 +579,7 @@ Template.newUserPopup.events({
      isAdmin,
      isActive,
      email.toLowerCase(),
+      importUsernames,
      function(error) {
        const usernameMessageElement = templateInstance.$('.username-taken');
        const emailMessageElement = templateInstance.$('.email-taken');
@@ -166,16 +166,16 @@ Template.memberPopup.helpers({
      const noComments = currentBoard.hasNoComments(this.userId);
      const worker = currentBoard.hasWorker(this.userId);
      if (commentOnly) {
-        return TAPi18n.__('comment-only').toLowerCase();
+        return TAPi18n.__('comment-only');
      } else if (noComments) {
-        return TAPi18n.__('no-comments').toLowerCase();
+        return TAPi18n.__('no-comments');
      } else if (worker) {
-        return TAPi18n.__('worker').toLowerCase();
+        return TAPi18n.__('worker');
      } else {
-        return TAPi18n.__(type).toLowerCase();
+        return TAPi18n.__(type);
      }
    } else {
-      return TAPi18n.__(type).toLowerCase();
+      return TAPi18n.__(type);
    }
  },
  isInvited() {
@@ -14,6 +14,11 @@ template(name="archivesSidebar")
          if currentUser.isBoardMember
            unless isWorker
              p.quiet
+                if this.archivedAt
+                  | {{_ 'archived-at' }}
+                  | 
+                  | {{ moment this.archivedAt 'LLL' }}
+                  br
                a.js-restore-card {{_ 'restore'}}
                if currentUser.isBoardAdmin
                  | -
@@ -37,6 +42,11 @@ template(name="archivesSidebar")
              if currentUser.isBoardMember
                unless isWorker
                  p.quiet
+                    if this.archivedAt
+                      | {{_ 'archived-at' }}
+                      | 
+                      | {{ moment this.archivedAt 'LLL' }}
+                      br
                    a.js-restore-list {{_ 'restore'}}
                    if currentUser.isBoardAdmin
                      | -
@@ -58,6 +68,11 @@ template(name="archivesSidebar")
              if currentUser.isBoardMember
                unless isWorker
                  p.quiet
+                    if this.archivedAt
+                      | {{_ 'archived-at' }}
+                      | 
+                      | {{ moment this.archivedAt 'LLL' }}
+                      br
                    a.js-restore-swimlane {{_ 'restore'}}
                    if currentUser.isBoardAdmin
                      | -
@@ -34,6 +34,8 @@ BlazeComponent.extendComponent({
    return Cards.find({
      archived: true,
      boardId: Session.get('currentBoard'),
+    }, {
+      sort: { archivedAt: -1, modifiedAt: -1 },
    });
  },

@@ -41,6 +43,8 @@ BlazeComponent.extendComponent({
    return Lists.find({
      archived: true,
      boardId: Session.get('currentBoard'),
+    }, {
+      sort: { archivedAt: -1, modifiedAt: -1 },
    });
  },

@@ -48,6 +52,8 @@ BlazeComponent.extendComponent({
    return Swimlanes.find({
      archived: true,
      boardId: Session.get('currentBoard'),
+    }, {
+      sort: { archivedAt: -1, modifiedAt: -1 },
    });
  },

@@ -59,6 +59,10 @@ template(name="createCustomFieldPopup")

            span {{_ 'automatically-field-on-card'}}

+        a.flex.js-field-always-on-card(class="{{#if alwaysOnCard}}is-checked{{/if}}")
+            .materialCheckBox(class="{{#if alwaysOnCard}}is-checked{{/if}}")
+            span {{_ 'always-field-on-card'}}
+
        a.flex.js-field-showLabel-on-card(class="{{#if showLabelOnMiniCard}}is-checked{{/if}}")
            .materialCheckBox(class="{{#if showLabelOnMiniCard}}is-checked{{/if}}")

@@ -16,7 +16,7 @@ BlazeComponent.extendComponent({
 }).register('customFieldsSidebar');

 const CreateCustomFieldPopup = BlazeComponent.extendComponent({
-  _types: ['text', 'number', 'date', 'dropdown', 'currency'],
+  _types: ['text', 'number', 'date', 'dropdown', 'currency', 'checkbox'],

  _currencyList: [
    {
@@ -174,6 +174,14 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
          $target.find('.materialCheckBox').toggleClass('is-checked');
          $target.toggleClass('is-checked');
        },
+        'click .js-field-always-on-card'(evt) {
+          let $target = $(evt.target);
+          if (!$target.hasClass('js-field-always-on-card')) {
+            $target = $target.parent();
+          }
+          $target.find('.materialCheckBox').toggleClass('is-checked');
+          $target.toggleClass('is-checked');
+        },
        'click .js-field-showLabel-on-card'(evt) {
          let $target = $(evt.target);
          if (!$target.hasClass('js-field-showLabel-on-card')) {
@@ -194,6 +202,8 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
              this.find('.js-field-showLabel-on-card.is-checked') !== null,
            automaticallyOnCard:
              this.find('.js-field-automatically-on-card.is-checked') !== null,
+            alwaysOnCard:
+              this.find('.js-field-always-on-card.is-checked') !== null,
          };

          // insert or update
@@ -4,24 +4,24 @@

 Meteor.startup(() => {
  TAPi18n.conf.i18n_files_route = Meteor._relativeToSiteRootUrl('/tap-i18n');
-  Tracker.autorun(() => {
-    const currentUser = Meteor.user();
-    let language;
-    if (currentUser) {
-      language = currentUser.profile && currentUser.profile.language;
-    }
+  const currentUser = Meteor.user();
+  let language;
+  if (currentUser) {
+    language = currentUser.profile && currentUser.profile.language;
+  }

-    if (!language) {
-      if (navigator.languages) {
-        language = navigator.languages[0];
-      } else {
-        language = navigator.language || navigator.userLanguage;
-      }
+  if (!language) {
+    if (navigator.languages) {
+      language = navigator.languages[0];
+    } else {
+      language = navigator.language || navigator.userLanguage;
    }
+  }

-    if (language) {
-      TAPi18n.setLanguage(language);
-      T9n.setLanguage(language);
-    }
-  });
+  if (language) {
+    TAPi18n.setLanguage(language);
+    // eslint-disable-next-line no-console
+    // console.log('language set!');
+    T9n.setLanguage(language);
+  }
 });
@@ -48,8 +48,6 @@ Utils = {
    let sort = window.localStorage.getItem('myCardsSort');

    if (!sort || !['board', 'dueAt'].includes(sort)) {
-      window.localStorage.setItem('myCardsSort', 'board');
-      location.reload();
      sort = 'board';
    }

@@ -81,8 +79,6 @@ Utils = {
    let view = window.localStorage.getItem('dueCardsView');

    if (!view || !['me', 'all'].includes(view)) {
-      window.localStorage.setItem('dueCardsView', 'me');
-      location.reload();
      view = 'me';
    }

@@ -95,7 +95,10 @@ services:
    # 2020-12-03:
    # - Mongo image copied from Docker Hub mongo:4.4.2-bionic to Quay
    #   to avoid Docker Hub rate limits.
-    image: quay.io/wekan/mongo:4.4.2-bionic
+    # Quay image does work:
+    #   image: quay.io/wekan/mongo:4.4.2-bionic
+    # Docker Hub MongoDB image does work:
+    image: mongo:4.4
    #-------------------------------------------------------------------------------------
    container_name: wekan-db
    restart: always
@@ -114,12 +117,12 @@ services:
  wekan:
    #-------------------------------------------------------------------------------------
    # ==== MONGODB AND METEOR VERSION ====
-    # a) Quay automatic builds do work, https://quay.io/wekan7wekan
-    image: quay.io/wekan/wekan
+    # a) Quay automatic builds do work work, https://quay.io/wekan/wekan
+    # image: quay.io/wekan/wekan
    # b) Using specific version tag:
    # image: quay.io/wekan/wekan:v4.52
-    # c) Docker Hub builds work https://hub.docker.com/r/wekanteam/wekan
-    # image: wekanteam/wekan
+    # c) Docker Hub builds do work https://hub.docker.com/r/wekanteam/wekan
+    image: wekanteam/wekan
    #-------------------------------------------------------------------------------------
    container_name: wekan-app
    restart: always
@@ -457,8 +460,8 @@ services:
      #
      # The search user DN - You need quotes when you have spaces in parameters
      # 2 examples:
-      #- LDAP_AUTHENTIFICATION_USERDN="CN=ldap admin,CN=users,DC=domainmatter,DC=lan"
-      #- LDAP_AUTHENTIFICATION_USERDN="CN=wekan_adm,OU=serviceaccounts,OU=admin,OU=prod,DC=mydomain,DC=com"
+      #- LDAP_AUTHENTIFICATION_USERDN=CN=ldap admin,CN=users,DC=domainmatter,DC=lan
+      #- LDAP_AUTHENTIFICATION_USERDN=CN=wekan_adm,OU=serviceaccounts,OU=admin,OU=prod,DC=mydomain,DC=com
      #
      # The password for the search user
      #- LDAP_AUTHENTIFICATION_PASSWORD=pwd
@@ -488,10 +491,10 @@ services:
      #- LDAP_REJECT_UNAUTHORIZED=false
      #
      # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
-      #- LDAP_USER_AUTHENTICATION="true"
+      #- LDAP_USER_AUTHENTICATION=true
      #
      # Which field is used to find the user for the user authentication. Default: uid.
-      #- LDAP_USER_AUTHENTICATION_FIELD="uid"
+      #- LDAP_USER_AUTHENTICATION_FIELD=uid
      #
      # Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
      #- LDAP_USER_SEARCH_FILTER=
@@ -556,7 +559,7 @@ services:
      #
      #- LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
      #
-      #- LDAP_SYNC_GROUP_ROLES=''
+      #- LDAP_SYNC_GROUP_ROLES=
      #
      # The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
      # example :
@@ -384,6 +384,7 @@
  "import-csv-placeholder": "Paste your valid CSV/TSV data here",
  "import-map-members": "Map members",
  "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
+  "import-members-map-note": "Note: Unmapped members will be assigned to the current user.",
  "import-show-user-mapping": "Review members mapping",
  "import-user-select": "Pick your existing user you want to use as this member",
  "importMapMembersAddPopup-title": "Select member",
@@ -530,6 +531,7 @@
  "custom-login-logo-link-url": "Custom Login Logo Link URL",
  "text-below-custom-login-logo": "Text below Custom Login Logo",
  "username": "Username",
+  "import-usernames": "Import Usernames",
  "view-it": "View it",
  "warn-list-archived": "warning: this card is in an list at Archive",
  "watch": "Watch",
@@ -601,7 +603,8 @@
  "minutes": "minutes",
  "seconds": "seconds",
  "show-field-on-card": "Show this field on card",
-  "automatically-field-on-card": "Auto create field to all cards",
+  "automatically-field-on-card": "Add field to new cards",
+  "always-field-on-card": "Add field to all cards",
  "showLabel-field-on-card": "Show field label on minicard",
  "yes": "Yes",
  "no": "No",
@@ -875,6 +878,7 @@
  "label-not-found": "Label '%s' not found.",
  "label-color-not-found": "Label color %s not found.",
  "user-username-not-found": "Username '%s' not found.",
+  "comment-not-found": "Card with comment containing text '%s' not found.",
  "globalSearch-title": "Search All Boards",
  "no-cards-found": "No Cards Found",
  "one-card-found": "One Card Found",
@@ -894,8 +898,29 @@
  "operator-member-abbrev": "m",
  "operator-assignee": "assignee",
  "operator-assignee-abbrev": "a",
-  "operator-is": "is",
+  "operator-status": "status",
+  "operator-due": "due",
+  "operator-created": "created",
+  "operator-modified": "modified",
+  "operator-sort": "sort",
+  "operator-comment": "comment",
+  "predicate-archived": "archived",
+  "predicate-ended": "ended",
+  "predicate-all": "all",
+  "predicate-overdue": "overdue",
+  "predicate-week": "week",
+  "predicate-month": "month",
+  "predicate-quarter": "quarter",
+  "predicate-year": "year",
+  "predicate-due": "due",
+  "predicate-modified": "modified",
+  "predicate-created": "created",
  "operator-unknown-error": "%s is not an operator",
+  "operator-number-expected": "operator __operator__ expected a number, got '__value__'",
+  "operator-sort-invalid": "sort of '%s' is invalid",
+  "operator-status-invalid": "'%s' is not a valid status",
+  "next-page": "Next Page",
+  "previous-page": "Previous Page",
  "heading-notes": "Notes",
  "globalSearch-instructions-heading": "Search Instructions",
  "globalSearch-instructions-description": "Searches can include operators to refine the search.  Operators are specified by writing the operator name and value separated by a colon.  For example, an operator specification of `list:Blocked` would limit the search to cards that are contained in a list named *Blocked*.  If the value contains spaces or special characters it must be enclosed in quotation marks (e.g. `__operator_list__:\"To Review\"`).",
@@ -903,18 +928,29 @@
  "globalSearch-instructions-operator-board": "`__operator_board__:title` - cards in boards matching the specified title",
  "globalSearch-instructions-operator-list": "`__operator_list__:title` - cards in lists matching the specified title",
  "globalSearch-instructions-operator-swimlane": "`__operator_swimlane__:title` - cards in swimlanes matching the specified title",
+  "globalSearch-instructions-operator-comment": "`__operator_comment__:text` - cards with with a comment containing *text*.",
  "globalSearch-instructions-operator-label": "`__operator_label__:color` `__operator_label__:name` - cards that have a label matching the given color or name",
  "globalSearch-instructions-operator-hash": "`__operator_label_abbrev__label` - shorthand for `__operator_label__:label`",
  "globalSearch-instructions-operator-user": "`__operator_user__:username` - cards where the specified user is a *member* or *assignee*",
  "globalSearch-instructions-operator-at": "`__operator_user_abbrev__username` - shorthand for `user:username`",
  "globalSearch-instructions-operator-member": "`__operator_member__:username` - cards where the specified user is a *member*",
  "globalSearch-instructions-operator-assignee": "`__operator_assignee__:username` - cards where the specified user is an *assignee*",
+  "globalSearch-instructions-operator-due": "`__operator_due__:n` - cards which are due *n* days from now.  `__operator_due__:__predicate_overdue__ lists all cards past their due date.",
+  "globalSearch-instructions-operator-created": "`__operator_created__:n` - cards which which were created *n* days ago",
+  "globalSearch-instructions-operator-modified": "`__operator_modified__:n` - cards which which were modified *n* days ago",
+  "globalSearch-instructions-status-archived": "`__operator_status__:__predicate_archived__` - cards that are archived.",
+  "globalSearch-instructions-status-all": "`__operator_status__:__predicate_all__` - all archived and unarchived cards.",
+  "globalSearch-instructions-status-ended": "`__operator_status__:__predicate_ended__` - cards with an end date.",
  "globalSearch-instructions-notes-1": "Multiple operators may be specified.",
  "globalSearch-instructions-notes-2": "Similar operators are *OR*ed together.  Cards that match any of the conditions will be returned.\n`__operator_list__:Available __operator_list__:Blocked` would return cards contained in any list named *Blocked* or *Available*.",
-  "globalSearch-instructions-notes-3": "Differing operators are *AND*ed together.  Only cards that match all of the differing operators are returned.\n`__operator_list__:Available __operator_label__:red` returns only cards in the list *Available* with a *red* label.",
+  "globalSearch-instructions-notes-3": "Differing operators are *AND*ed together.  Only cards that match all of the differing operators are returned.  `__operator_list__:Available __operator_label__:red` returns only cards in the list *Available* with a *red* label.",
+  "globalSearch-instructions-notes-3-2": "Days can be specified as an integer or using `__predicate_week__`, `__predicate_month__`, `__predicate_quarter__` or `__predicate_year__`",
  "globalSearch-instructions-notes-4": "Text searches are case insensitive.",
  "globalSearch-instructions-notes-5": "Currently archived cards are not searched.",
  "link-to-search": "Link to this search",
  "excel-font": "Arial",
-  "number": "Number"
+  "number": "Number",
+  "label-colors": "Label Colors",
+  "label-names": "Label Names",
+  "archived-at": "archived at"
 }
@@ -1,3 +1,4 @@
+const escapeForRegex = require('escape-string-regexp');
 Boards = new Mongo.Collection('boards');

 /**
@@ -42,6 +43,13 @@ Boards.attachSchema(
        }
      },
    },
+    archivedAt: {
+      /**
+       * Latest archiving time of the board
+       */
+      type: Date,
+      optional: true,
+    },
    createdAt: {
      /**
       * Creation time of the board
@@ -508,6 +516,8 @@ Boards.helpers({
  copy() {
    const oldId = this._id;
    delete this._id;
+    delete this.slug;
+    this.title = this.copyTitle();
    const _id = Boards.insert(this);

    // Copy all swimlanes in board
@@ -537,7 +547,39 @@ Boards.helpers({
        },
      });
    });
+
+    // copy rules, actions, and triggers
+    const actionsMap = {};
+    Actions.find({ boardId: oldId }).forEach(action => {
+      const id = action._id;
+      delete action._id;
+      action.boardId = _id;
+      actionsMap[id] = Actions.insert(action);
+    });
+    const triggersMap = {};
+    Triggers.find({ boardId: oldId }).forEach(trigger => {
+      const id = trigger._id;
+      delete trigger._id;
+      trigger.boardId = _id;
+      triggersMap[id] = Triggers.insert(trigger);
+    });
+    Rules.find({ boardId: oldId }).forEach(rule => {
+      delete rule._id;
+      rule.boardId = _id;
+      rule.actionId = actionsMap[rule.actionId];
+      rule.triggerId = triggersMap[rule.triggerId];
+      Rules.insert(rule);
+    });
  },
+  /**
+   * Return a unique title based on the current title
+   *
+   * @returns {string|null}
+   */
+  copyTitle() {
+    return Boards.uniqueTitle(this.title);
+  },
+
  /**
   * Is supplied user authorized to view this board?
   */
@@ -1007,7 +1049,7 @@ Boards.helpers({

 Boards.mutations({
  archive() {
-    return { $set: { archived: true } };
+    return { $set: { archived: true, archivedAt: new Date() } };
  },

  restore() {
@@ -1227,45 +1269,74 @@ function boardRemover(userId, doc) {
  );
 }

+Boards.uniqueTitle = title => {
+  const m = title.match(
+    new RegExp('^(?<title>.*?)\\s*(\\[(?<num>\\d+)]\\s*$|\\s*$)'),
+  );
+  const base = escapeForRegex(m.groups.title);
+  let num = 0;
+  Boards.find({ title: new RegExp(`^${base}\\s*\\[\\d+]\\s*$`) }).forEach(
+    board => {
+      const m = board.title.match(
+        new RegExp('^(?<title>.*?)\\s*\\[(?<num>\\d+)]\\s*$'),
+      );
+      if (m) {
+        const n = parseInt(m.groups.num, 10);
+        num = num < n ? n : num;
+      }
+    },
+  );
+
+  return `${base} [${num + 1}]`;
+};
+
 Boards.userSearch = (
  userId,
  selector = {},
  projection = {},
-  includeArchived = false,
+  // includeArchived = false,
 ) => {
-  if (!includeArchived) {
-    selector.archived = false;
-  }
-  selector.$or = [
-    { permission: 'public' },
-    { members: { $elemMatch: { userId, isActive: true } } },
-  ];
+  // if (!includeArchived) {
+  //   selector.archived = false;
+  // }
+  selector.$or = [{ permission: 'public' }];

+  if (userId) {
+    selector.$or.push({ members: { $elemMatch: { userId, isActive: true } } });
+  }
  return Boards.find(selector, projection);
 };

-Boards.userBoards = (userId, includeArchived = false, selector = {}) => {
-  check(userId, String);
-
-  if (!includeArchived) {
-    selector = {
-      archived: false,
-    };
+Boards.userBoards = (userId, archived = false, selector = {}) => {
+  if (typeof archived === 'boolean') {
+    selector.archived = archived;
  }
-  selector.$or = [
-    { permission: 'public' },
-    { members: { $elemMatch: { userId, isActive: true } } },
-  ];
+  selector.$or = [{ permission: 'public' }];

+  if (userId) {
+    selector.$or.push({ members: { $elemMatch: { userId, isActive: true } } });
+  }
  return Boards.find(selector);
 };

-Boards.userBoardIds = (userId, includeArchived = false, selector = {}) => {
-  return Boards.userBoards(userId, includeArchived, selector).map(board => {
+Boards.userBoardIds = (userId, archived = false, selector = {}) => {
+  return Boards.userBoards(userId, archived, selector).map(board => {
    return board._id;
  });
 };

+Boards.colorMap = () => {
+  const colors = {};
+  for (const color of Boards.labelColors()) {
+    colors[TAPi18n.__(`color-${color}`)] = color;
+  }
+  return colors;
+};
+
+Boards.labelColors = () => {
+  return _.clone(Boards.simpleSchema()._schema['labels.$.color'].allowedValues);
+};
+
 if (Meteor.isServer) {
  Boards.allow({
    insert: Meteor.userId,
@@ -1343,6 +1414,26 @@ if (Meteor.isServer) {
        },
      });
    },
+    myLabelNames() {
+      let names = [];
+      Boards.userBoards(Meteor.userId()).forEach(board => {
+        names = names.concat(
+          board.labels
+            .filter(label => !!label.name)
+            .map(label => {
+              return label.name;
+            }),
+        );
+      });
+      return _.uniq(names).sort();
+    },
+    myBoardNames() {
+      return _.uniq(
+        Boards.userBoards(Meteor.userId()).map(board => {
+          return board.title;
+        }),
+      ).sort();
+    },
  });

  Meteor.methods({
@@ -1,3 +1,4 @@
+const escapeForRegex = require('escape-string-regexp');
 CardComments = new Mongo.Collection('card_comments');

 /**
@@ -109,6 +110,28 @@ function commentCreation(userId, doc) {
  });
 }

+CardComments.textSearch = (userId, textArray) => {
+  const selector = {
+    boardId: { $in: Boards.userBoardIds(userId) },
+    $and: [],
+  };
+
+  for (const text of textArray) {
+    selector.$and.push({ text: new RegExp(escapeForRegex(text)) });
+  }
+
+  // eslint-disable-next-line no-console
+  // console.log('cardComments selector:', selector);
+
+  const comments = CardComments.find(selector);
+  // eslint-disable-next-line no-console
+  // console.log('count:', comments.count());
+  // eslint-disable-next-line no-console
+  // console.log('cards with comments:', comments.map(com => { return com.cardId }));
+
+  return comments;
+};
+
 if (Meteor.isServer) {
  // Comments are often fetched within a card, so we create an index to make these
  // queries more efficient.
@@ -145,9 +168,6 @@ if (Meteor.isServer) {
      listId: card.listId,
      swimlaneId: card.swimlaneId,
    });
-  });
-
-  CardComments.after.remove((userId, doc) => {
    const activity = Activities.findOne({ commentId: doc._id });
    if (activity) {
      Activities.remove(activity._id);
@@ -26,6 +26,13 @@ Cards.attachSchema(
        }
      },
    },
+    archivedAt: {
+      /**
+       * latest archiving date
+       */
+      type: Date,
+      optional: true,
+    },
    parentId: {
      /**
       * ID of the parent card
@@ -724,9 +731,12 @@ Cards.helpers({
        definition,
      };
    });
-    if (ret.definition !== undefined) {
-      ret.sort((a, b) => a.definition.name.localeCompare(b.definition.name));
-    }
+    ret.sort(
+      (a, b) =>
+        a.definition.name !== undefined &&
+        b.definition.name !== undefined &&
+        a.definition.name.localeCompare(b.definition.name),
+    );
    return ret;
  },

@@ -1446,6 +1456,7 @@ Cards.mutations({
    return {
      $set: {
        archived: true,
+        archivedAt: new Date(),
      },
    };
  },
@@ -1863,248 +1874,6 @@ Cards.mutations({
  },
 });

-Cards.globalSearch = queryParams => {
-  const userId = Meteor.userId();
-  // eslint-disable-next-line no-console
-  // console.log('userId:', userId);
-
-  const errors = new (class {
-    constructor() {
-      this.notFound = {
-        boards: [],
-        swimlanes: [],
-        lists: [],
-        labels: [],
-        users: [],
-        members: [],
-        assignees: [],
-        is: [],
-      };
-    }
-
-    hasErrors() {
-      for (const prop in this.notFound) {
-        if (this.notFound[prop].length) {
-          return true;
-        }
-      }
-      return false;
-    }
-  })();
-
-  const selector = {
-    archived: false,
-    type: 'cardType-card',
-    boardId: { $in: Boards.userBoardIds(userId) },
-    swimlaneId: { $nin: Swimlanes.archivedSwimlaneIds() },
-    listId: { $nin: Lists.archivedListIds() },
-  };
-
-  if (queryParams.boards.length) {
-    const queryBoards = [];
-    queryParams.boards.forEach(query => {
-      const boards = Boards.userSearch(userId, {
-        title: new RegExp(query, 'i'),
-      });
-      if (boards.count()) {
-        boards.forEach(board => {
-          queryBoards.push(board._id);
-        });
-      } else {
-        errors.notFound.boards.push(query);
-      }
-    });
-
-    selector.boardId.$in = queryBoards;
-  }
-
-  if (queryParams.swimlanes.length) {
-    const querySwimlanes = [];
-    queryParams.swimlanes.forEach(query => {
-      const swimlanes = Swimlanes.find({
-        title: new RegExp(query, 'i'),
-      });
-      if (swimlanes.count()) {
-        swimlanes.forEach(swim => {
-          querySwimlanes.push(swim._id);
-        });
-      } else {
-        errors.notFound.swimlanes.push(query);
-      }
-    });
-
-    selector.swimlaneId.$in = querySwimlanes;
-  }
-
-  if (queryParams.lists.length) {
-    const queryLists = [];
-    queryParams.lists.forEach(query => {
-      const lists = Lists.find({
-        title: new RegExp(query, 'i'),
-      });
-      if (lists.count()) {
-        lists.forEach(list => {
-          queryLists.push(list._id);
-        });
-      } else {
-        errors.notFound.lists.push(query);
-      }
-    });
-
-    selector.listId.$in = queryLists;
-  }
-
-  const queryMembers = [];
-  const queryAssignees = [];
-  if (queryParams.users.length) {
-    queryParams.users.forEach(query => {
-      const users = Users.find({
-        username: query,
-      });
-      if (users.count()) {
-        users.forEach(user => {
-          queryMembers.push(user._id);
-          queryAssignees.push(user._id);
-        });
-      } else {
-        errors.notFound.users.push(query);
-      }
-    });
-  }
-
-  if (queryParams.members.length) {
-    queryParams.members.forEach(query => {
-      const users = Users.find({
-        username: query,
-      });
-      if (users.count()) {
-        users.forEach(user => {
-          queryMembers.push(user._id);
-        });
-      } else {
-        errors.notFound.members.push(query);
-      }
-    });
-  }
-
-  if (queryParams.assignees.length) {
-    queryParams.assignees.forEach(query => {
-      const users = Users.find({
-        username: query,
-      });
-      if (users.count()) {
-        users.forEach(user => {
-          queryAssignees.push(user._id);
-        });
-      } else {
-        errors.notFound.assignees.push(query);
-      }
-    });
-  }
-
-  if (queryMembers.length && queryAssignees.length) {
-    selector.$or = [
-      { members: { $in: queryMembers } },
-      { assignees: { $in: queryAssignees } },
-    ];
-  } else if (queryMembers.length) {
-    selector.members = { $in: queryMembers };
-  } else if (queryAssignees.length) {
-    selector.assignees = { $in: queryAssignees };
-  }
-
-  if (queryParams.labels.length) {
-    queryParams.labels.forEach(label => {
-      const queryLabels = [];
-
-      let boards = Boards.userSearch(userId, {
-        labels: { $elemMatch: { color: label.toLowerCase() } },
-      });
-
-      if (boards.count()) {
-        boards.forEach(board => {
-          // eslint-disable-next-line no-console
-          // console.log('board:', board);
-          // eslint-disable-next-line no-console
-          // console.log('board.labels:', board.labels);
-          board.labels
-            .filter(boardLabel => {
-              return boardLabel.color === label.toLowerCase();
-            })
-            .forEach(boardLabel => {
-              queryLabels.push(boardLabel._id);
-            });
-        });
-      } else {
-        // eslint-disable-next-line no-console
-        // console.log('label:', label);
-        const reLabel = new RegExp(label, 'i');
-        // eslint-disable-next-line no-console
-        // console.log('reLabel:', reLabel);
-        boards = Boards.userSearch(userId, {
-          labels: { $elemMatch: { name: reLabel } },
-        });
-
-        if (boards.count()) {
-          boards.forEach(board => {
-            board.labels
-              .filter(boardLabel => {
-                return boardLabel.name.match(reLabel);
-              })
-              .forEach(boardLabel => {
-                queryLabels.push(boardLabel._id);
-              });
-          });
-        } else {
-          errors.notFound.labels.push(label);
-        }
-      }
-
-      selector.labelIds = { $in: queryLabels };
-    });
-  }
-
-  if (errors.hasErrors()) {
-    return { cards: null, errors };
-  }
-
-  if (queryParams.text) {
-    const regex = new RegExp(queryParams.text, 'i');
-
-    selector.$or = [
-      { title: regex },
-      { description: regex },
-      { customFields: { $elemMatch: { value: regex } } },
-    ];
-  }
-
-  // eslint-disable-next-line no-console
-  // console.log('selector:', selector);
-  const cards = Cards.find(selector, {
-    fields: {
-      _id: 1,
-      archived: 1,
-      boardId: 1,
-      swimlaneId: 1,
-      listId: 1,
-      title: 1,
-      type: 1,
-      sort: 1,
-      members: 1,
-      assignees: 1,
-      colors: 1,
-      dueAt: 1,
-      labelIds: 1,
-    },
-    limit: 50,
-  });
-
-  // eslint-disable-next-line no-console
-  // console.log('count:', cards.count());
-
-  return { cards, errors };
-};
-
 //FUNCTIONS FOR creation of Activities

 function updateActivities(doc, fieldNames, modifier) {
@@ -147,6 +147,7 @@ export class CsvCreator {
        settings,
        showOnCard: false,
        automaticallyOnCard: false,
+        alwaysOnCard: false,
        showLabelOnMiniCard: false,
        boardIds: [boardId],
      });