v5.32

Updated translations.
Updated ChangeLog.
2021-06-09 20:30:02 +03:00 · 2021-06-09 20:23:38 +03:00 · 2021-06-09 20:15:46 +03:00 · 2021-06-09 20:13:19 +03:00 · 2021-06-09 20:08:42 +03:00 · 2021-06-09 01:45:05 +03:00
536 changed files with 125448 additions and 66872 deletions
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive

 ENV \
    DEBUG=false \
-    NODE_VERSION=v12.20.1 \
+    NODE_VERSION=v12.22.1 \
    METEOR_RELEASE=1.10.2 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
@@ -19,6 +19,7 @@ ENV \
    ARCHITECTURE=linux-x64 \
    SRC_PATH=./ \
    WITH_API=true \
+    RESULTS_PER_PAGE="" \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15 \
@@ -81,7 +81,7 @@ parts:
    wekan:
        source: .
        plugin: nodejs
-        node-engine: 12.20.1
+        node-engine: 12.22.1
        node-packages:
            - node-gyp
            - node-pre-gyp
@@ -5,7 +5,7 @@ echo "      with 'sudo dpkg-reconfigure locales' , so that MongoDB works correct
 echo "      You can still use any other locale as your main locale."

 #Below script installs newest node 8.x for Debian/Ubuntu/Mint.
-#NODE_VERSION=12.18.2
+#NODE_VERSION=12.21.0
 #X64NODE="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz"

 function pause(){
@@ -80,7 +80,7 @@ do
 			curl -0 -L https://npmjs.org/install.sh | sudo sh
 			sudo chown -R $(id -u):$(id -g) $HOME/.npm
 			sudo npm -g install n
-			sudo n 12.18.2
+			sudo n 12.21.0
 			#curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
 			#sudo apt-get install -y nodejs
 		elif [[ "$OSTYPE" == "darwin"* ]]; then
@@ -83,7 +83,7 @@ parts:
    wekan:
        source: .
        plugin: nodejs
-        node-engine: 12.20.1
+        node-engine: 12.22.1
        node-packages:
            - node-gyp
            - node-pre-gyp
@@ -1,8 +1,13 @@
 ## Issue

+If you can not login for any reason:
+- https://github.com/wekan/wekan/wiki/Forgot-Password
+
+Email settings:
+- https://github.com/wekan/wekan/wiki/Troubleshooting-Mail
+
 Add these issues to elsewhere:
- Snap: https://github.com/wekan/wekan-snap/issues
- LDAP: https://github.com/wekan/wekan-ldap/issues
+- SECURITY ISSUES: https://github.com/wekan/wekan/blob/master/SECURITY.md
 - UCS: https://github.com/wekan/univention/issues

 Other Wekan issues can be added here.
@@ -31,5 +31,4 @@ Thumbs.db
 ehthumbs.db
 .eslintcache
 .meteor/local
-.meteor-1.6-snap/.meteor/local
 .devcontainer/docker-compose.extend.yml
@@ -6,7 +6,7 @@
 meteor-base@1.4.0

 # Build system
-ecmascript@0.15.0
+ecmascript@0.15.1
 standard-minifier-css@1.7.2
 standard-minifier-js@2.6.0
 mquandalle:jade
@@ -17,13 +17,13 @@ es5-shim@4.8.0

 # Collections
 aldeed:collection2
-cfs:standard-packages
+wekan-cfs-standard-packages
 cottz:publish-relations
 dburles:collection-helpers
 idmontie:migrations
 matb33:collection-hooks
 matteodem:easy-search
-mongo@1.10.1
+mongo@1.11.0
 mquandalle:collection-mutations

 # Account system
@@ -75,7 +75,7 @@ horka:swipebox
 dynamic-import@0.6.0

 accounts-password@1.7.0
-cfs:gridfs
+wekan-cfs-gridfs
 rzymek:fullcalendar
 momentjs:moment@2.22.2
 browser-policy-framing@1.1.0
@@ -91,9 +91,7 @@ meteorhacks:aggregate@1.3.0
 wekan-markdown
 konecty:mongo-counter
 percolate:synced-cron
-easylogic:summernote
-cfs:filesystem
-tmeasday:check-npm-versions
+wekan-cfs-filesystem
 steffo:meteor-accounts-saml
 rajit:bootstrap3-datepicker-fi
 rajit:bootstrap3-datepicker-ar
@@ -145,3 +143,4 @@ rajit:bootstrap3-datepicker-zh-cn
 rajit:bootstrap3-datepicker-zh-tw
 staringatlights:fast-render
 spacebars
+easylogic:summernote
@@ -1 +1 @@
-METEOR@2.0
+METEOR@2.2
@@ -1,7 +1,7 @@
 3stack:presence@1.1.2
-accounts-base@1.8.0
+accounts-base@1.9.0
 accounts-oauth@1.2.0
-accounts-password@1.7.0
+accounts-password@1.7.1
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
@@ -11,36 +11,19 @@ allow-deny@1.1.0
 arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
 autoupdate@1.7.0
-babel-compiler@7.6.0
+babel-compiler@7.6.1
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
-blaze@2.3.4
-blaze-tools@1.0.10
+blaze@2.5.0
+blaze-tools@1.1.2
 boilerplate-generator@1.7.1
 browser-policy-common@1.0.11
 browser-policy-framing@1.1.0
 caching-compiler@1.2.2
-caching-html-compiler@1.1.3
+caching-html-compiler@1.2.0
 callback-hook@1.3.0
-cfs:access-point@0.1.49
-cfs:base-package@0.0.30
-cfs:collection@0.5.5
-cfs:collection-filters@0.2.4
-cfs:data-man@0.0.6
-cfs:file@0.1.17
-cfs:filesystem@0.1.2
-cfs:gridfs@0.0.34
 cfs:http-methods@0.0.32
-cfs:http-publish@0.0.13
-cfs:power-queue@0.9.11
-cfs:reactive-list@0.0.9
-cfs:reactive-property@0.0.4
-cfs:standard-packages@0.5.10
-cfs:storage-adapter@0.2.4
-cfs:tempstore@0.1.6
-cfs:upload-http@0.0.20
-cfs:worker@0.1.5
 check@1.3.1
 chuangbo:cookie@1.1.0
 coagmano:stylus@1.1.0
@@ -49,15 +32,15 @@ coffeescript-compiler@2.4.1
 cottz:publish-relations@2.0.8
 dburles:collection-helpers@1.1.0
 ddp@1.4.0
-ddp-client@2.4.0
+ddp-client@2.4.1
 ddp-common@1.4.0
 ddp-rate-limiter@1.0.9
-ddp-server@2.3.2
+ddp-server@2.3.3
 deps@1.0.12
 diff-sequence@1.1.1
 dynamic-import@0.6.0
 easylogic:summernote@0.8.8
-ecmascript@0.15.0
+ecmascript@0.15.1
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.11.0
 ecmascript-runtime-server@0.10.0
@@ -70,10 +53,10 @@ fortawesome:fontawesome@4.7.0
 geojson-utils@1.0.10
 horka:swipebox@1.0.2
 hot-code-push@1.0.4
-html-tools@1.0.11
-htmljs@1.0.11
-http@1.4.3
-id-map@1.1.0
+html-tools@1.1.2
+htmljs@1.1.1
+http@1.4.4
+id-map@1.1.1
 idmontie:migrations@1.0.3
 inter-process-messaging@0.1.1
 jquery@1.11.11
@@ -84,7 +67,7 @@ kenton:accounts-sandstorm@0.7.0
 konecty:mongo-counter@0.0.5_3
 lamhieu:meteorx@2.1.1
 lamhieu:unblock@1.0.0
-launch-screen@1.2.0
+launch-screen@1.2.1
 livedata@1.0.18
 localstorage@1.2.0
 logging@1.2.0
@@ -100,19 +83,19 @@ meteorhacks:collection-utils@1.2.0
 meteorhacks:picker@1.0.3
 meteorhacks:subs-manager@1.6.4
 meteorspark:util@0.2.0
-minifier-css@1.5.3
+minifier-css@1.5.4
 minifier-js@2.6.0
 minifiers@1.1.8-faster-rebuild.0
-minimongo@1.6.1
+minimongo@1.6.2
 mobile-status-bar@1.1.0
 modern-browsers@0.1.5
 modules@0.16.0
 modules-runtime@0.12.0
 momentjs:moment@2.29.1
-mongo@1.10.1
+mongo@1.11.1
 mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
-mongo-id@1.0.7
+mongo-id@1.0.8
 mongo-livedata@1.0.12
 mousetrap:mousetrap@1.4.6_1
 mquandalle:autofocus@1.0.0
@@ -125,7 +108,7 @@ mquandalle:moment@1.0.1
 mquandalle:mousetrap-bindglobal@0.0.1
 msavin:usercache@1.8.0
 npm-bcrypt@0.9.3
-npm-mongo@3.8.1
+npm-mongo@3.9.0
 oauth@1.3.2
 oauth2@1.3.0
 observe-sequence@1.0.16
@@ -191,7 +174,7 @@ rajit:bootstrap3-datepicker-zh-cn@1.7.1
 rajit:bootstrap3-datepicker-zh-tw@1.7.1
 random@1.2.0
 rate-limit@1.0.9
-react-fast-refresh@0.1.0
+react-fast-refresh@0.1.1
 reactive-dict@1.3.0
 reactive-var@1.0.11
 reload@1.3.1
@@ -208,10 +191,10 @@ simple:json-routes@2.1.0
 simple:rest-accounts-password@1.1.2
 simple:rest-bearer-token-parser@1.0.1
 simple:rest-json-error-handler@1.0.1
-socket-stream-client@0.3.1
+socket-stream-client@0.3.3
 softwarerero:accounts-t9n@1.3.11
-spacebars@1.0.15
-spacebars-compiler@1.1.3
+spacebars@1.2.0
+spacebars-compiler@1.2.1
 srp@1.1.0
 standard-minifier-css@1.7.2
 standard-minifier-js@2.6.0
@@ -220,11 +203,10 @@ staringatlights:inject-data@2.3.0
 steffo:meteor-accounts-saml@0.0.18
 tap:i18n@1.8.2
 templates:tabs@2.3.0
-templating@1.3.2
-templating-compiler@1.3.3
-templating-runtime@1.3.2
-templating-tools@1.1.2
-tmeasday:check-npm-versions@0.3.2
+templating@1.4.0
+templating-compiler@1.4.1
+templating-runtime@1.4.0
+templating-tools@1.2.0
 tracker@1.2.0
 twbs:bootstrap@3.3.6
 ui@1.0.13
@@ -234,10 +216,28 @@ useraccounts:core@1.14.2
 useraccounts:flow-routing@1.14.2
 useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
-webapp@1.10.0
+webapp@1.10.1
 webapp-hashing@1.1.0
 wekan-accounts-cas@0.1.0
 wekan-accounts-oidc@1.0.10
+wekan-cfs-access-point@0.1.50
+wekan-cfs-base-package@0.0.30
+wekan-cfs-collection@0.5.5
+wekan-cfs-collection-filters@0.2.4
+wekan-cfs-data-man@0.0.6
+wekan-cfs-file@0.1.17
+wekan-cfs-filesystem@0.1.2
+wekan-cfs-gridfs@0.0.34
+wekan-cfs-http-methods@0.0.32
+wekan-cfs-http-publish@0.0.13
+wekan-cfs-power-queue@0.9.11
+wekan-cfs-reactive-list@0.0.9
+wekan-cfs-reactive-property@0.0.4
+wekan-cfs-standard-packages@0.5.10
+wekan-cfs-storage-adapter@0.2.4
+wekan-cfs-tempstore@0.1.6
+wekan-cfs-upload-http@0.0.21
+wekan-cfs-worker@0.1.5
 wekan-ldap@0.0.2
 wekan-markdown@1.0.9
 wekan-oidc@1.0.12
@@ -3,7 +3,7 @@ sudo: required

 env:
  TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
-  TRAVIS_NODE_VERSION: 12.20.1
+  TRAVIS_NODE_VERSION: 12.22.1
  TRAVIS_NPM_VERSION: latest

 before_install:
@@ -39,7 +39,7 @@ host = https://www.transifex.com
 # tap:i18n requires us to use `-` separator in the language identifiers whereas
 # Transifex uses a `_` separator, without an option to customize it on one side
 # or the other, so we need to do a Manual mapping.
-lang_map = ar_EG:ar-EG, bg_BG:bg, en_GB:en-GB, es_AR:es-AR, es_CL:es-CL, es_PE:es-PE, es_MX:es-MX, es_TX:es-TX, es_PY:es-PY, el_GR:el, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, no:nb, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, sl_SI:sl, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK
+lang_map = ar_EG:ar-EG, bg_BG:bg, de_CH:de-CH, en_GB:en-GB, es_AR:es-AR, es_CL:es-CL, es_419:es-LA, es_PE:es-PE, es_MX:es-MX, es_TX:es-TX, es_PY:es-PY, el_GR:el, fa_IR:fa-IR, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, sl_SI:sl, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK

 [wekan.application]
 file_filter = i18n/<lang>.i18n.json
@@ -1,3 +1,945 @@
+[Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac)
+
+# v5.32 2021-06-09 Wekan release
+
+This release adds the following new features:
+
+- [Moved many button texts etc to tooltips. Added more tooltips](https://github.com/wekan/wekan/commit/6ce5ab40a7dc013247717b5107a306eb0402cd63).
+  Thanks to JFa-Orkis and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.31 2021-06-09 Wekan release
+
+This release adds the following new features:
+
+- [Admin Panel: Edit Organizations and Teams](https://github.com/wekan/wekan/issues/802).
+  Thanks to Emile840.
+- [Admin Panel: Delete Organizations and Teams](https://github.com/wekan/wekan/commit/14b2c1309f0f910c1e46b5681d3612d7ff0cbf81).
+  Thanks to xet7.
+- [Admin Panel Organizations/Teams: Show confirm text above delete button](https://github.com/wekan/wekan/commit/16379201704ea1a43ce14859633ffb1b9fae6710).
+  Thanks to xet7.
+- [Gantt: Retain links created between tasks. Part 1: Database changes, not active in
+  MIT Wekan](https://github.com/wekan/wekan/commit/07a3a0b3882147effac890514b19ff84f1d76bdb).
+  Thanks to benjaminhrivera.
+
+and adds the following updates:
+
+- [Removed extra package](https://github.com/wekan/wekan/commit/646497c3f041e2f562d032fe28ef29169f671ac1).
+  Thanks to xet7.
+- [Updated dependencies](https://github.com/wekan/wekan/commit/122757ca9c091e98b31d34c3abc25caa295dbdc0).
+  Thanks to developers of dependencies.
+
+and fixes the following bugs:
+
+- [Now new boards do not have any labels added by default](https://github.com/wekan/wekan/commit/481404e8d7bad7799c2ad34d6a94eaf5e87602c2).
+  Thanks to tedkoch and xet7.
+- [Try to fix OAUTH2_LOGIN_STYLE=redirect Has No Effect](https://github.com/wekan/wekan/commit/78324263c1c78e7e9e99f153e3158e39f564b67a).
+  Thanks to 1ubuntuuser and xet7.
+- [Try to fix: Wekan UI fails to finish import of closed Trello boards](https://github.com/wekan/wekan/commit/007e0f1c16c935ce580093a6aec31305c75d1e45).
+  Thanks to berezovskyi and xet7.
+- [Partial Fix: Vote and Planning Poker: Setting date and time now works for some languages that have
+  ascii characters in date format](https://github.com/wekan/wekan/commit/57f31d443faaa32d6c7b53d81af3be133af5f040).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.30 2021-06-03 Wekan release
+
+This release adds the following new features:
+
+- [Planning Poker / Scrum Poker](https://github.com/wekan/wekan/pull/3836),
+  see https://github.com/wekan/wekan/wiki/Planning-Poker .
+  Thanks to helioguardabaxo.
+
+and fixes the following bugs:
+
+- [Fixed Python API example: Edit card, etc](https://github.com/wekan/wekan/commit/bf62a947fbfa7d387074550288376e682fd6ad47).
+  Thanks to Lucky-Shi and xet7.
+- [Default language is still used although this one has been modified previously](https://github.com/wekan/wekan/pull/3833).
+  Thanks to Emile840.
+- [Moved Keyboard Shortcuts from bottom to top of Sidebar](https://github.com/wekan/wekan/commit/659a65b8b919a49ba0beef5cc53d8e61e0f794aa).
+  Thanks to ClaudiaK21 and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.29 2021-05-29 Wekan release
+
+This release adds the following new features:
+
+- [Excel parent card name export](https://github.com/wekan/wekan/pull/3799).
+  Thanks to marcungeschikts and Enishowk.
+
+and adds the following updates:
+
+- Updated dependencies
+  [Part 1](https://github.com/wekan/wekan/commit/62150ce6c406359fba068552b4526c60faf392bb),
+  [Part 2](https://github.com/wekan/wekan/commit/1d9346513e4f378379b9f5192e8dad5535287f8a),
+  [Part 3](https://github.com/wekan/wekan/commit/6be1a330936c89fcf478efe98dd15244a98d266d).
+  Thanks to developers of dependencies.
+- Added updated `Forgot Password` page to GitHub issue template
+  [Part 1](https://github.com/wekan/wekan/commit/6d0578fd5ad5f13f5ff9a285577e35fd62bba95f),
+  [Part 2](https://github.com/wekan/wekan/commit/ea64b17b82cd52320c0495e16385f11031dfbe3a).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Try to fix Snap: Removed linting packages](https://github.com/wekan/wekan/commit/8911fe5c8de941808585a7d3462305d5b3d2763d).
+  Thanks to xet7.
+- [Removed not working GitHub workflow](https://github.com/wekan/wekan/commit/5dd6466c0aa7479015c72519f36c2485b16e3341).
+  Thanks to xet7.
+- [Fix typos](https://github.com/wekan/wekan/pull/3813).
+  Thanks to spasche.
+- [Fix: Impersonate user can now export Excel/CSV/TSV/JSON.
+  Impersonate user and export Excel/CSV/TSV/JSON is now logged into database table
+  impersonatedUsers](https://github.com/wekan/wekan/commit/3908cd5413b775d1ee549f0a95304cf9998d3855).
+  Thanks to xet7.
+- [Fixed Importing JSON exports fails](https://github.com/wekan/wekan/commit/bd1de94312e428e56d6cf5f343098475573cba0b).
+  Thanks to KeptnArgo and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.28 2021-05-07 Wekan release
+
+This release adds the following new features:
+
+- [Mermaid Diagram](https://github.com/wekan/wekan/wiki/Mermaid-Diagram).
+  Thanks to xuguotong and xet7.
+
+and adds the following updates:
+
+- Updated dependencies
+  [Part 1](https://github.com/wekan/wekan/commit/521ef8b6dad4f00662f22702331193c16b91b482),
+  [Part 2](https://github.com/wekan/wekan/commit/48255f6f1e4a0caf0be006196f28295d0825eb95),
+  [Part 3](https://github.com/wekan/wekan/commit/a550c255e6c3bd2d609a1a45a213cdae7ab4f74d).
+  Thanks to developers of dependencies.
+
+and fixes the following bugs:
+
+- [Fix: BG color of StartDate](https://github.com/wekan/wekan/pull/3793).
+  Thanks to listenerri.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.27 2021-04-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed Non-ASCII attachment filename will crash when downloading](https://github.com/wekan/wekan/commit/c2da47773552a61d45b010a095f73d2e441f687c).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.26 2021-04-28 Wekan release
+
+This release adds the following new features:
+
+- [Feature/mini card subtask count](https://github.com/wekan/wekan/pull/3765).
+  Thanks to ryanMushy.
+
+and fixes the following bugs:
+
+- [Bring back Almost-Due for Start Date](https://github.com/wekan/wekan/commit/8ca1b25daf3be60c2dc64f03830dea8437bbd8ad).
+  Thanks to darren-teo.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.25 2021-04-27 Wekan release
+
+This release adds the following new features:
+
+- [Swimlane in Export to Excel](https://github.com/wekan/wekan/pull/3764).
+  Thanks to Keelan and ryanMushy.
+
+and adds the following updates:
+
+- [Updated release scripts](https://github.com/wekan/wekan/commit/9f0f6841b01b88f5559724b047d5e245617a02c8).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Added missing PostgreSQL password to ToroDB](https://github.com/wekan/wekan/commit/995de525d96946702536f0cdcb98ef281b9df94e).
+  Thanks to xet7.
+- [Fixed language name of Deutsch (Schweiz)](https://github.com/wekan/wekan/commit/621c701bef1d09d4ddfc93be411cfad98869f0ae).
+  Thanks to urmel1960.
+- [Bugfix/Summernote on paste](https://github.com/wekan/wekan/pull/3761).
+  Thanks to ryanMushy.
+- [OpenAPI: Better handle nested schemas](https://github.com/wekan/wekan/pull/3762).
+  Thanks to bentiss.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.24 2021-04-24 Wekan release
+
+This release adds the following new features:
+
+- [Copy Swimlane](https://github.com/wekan/wekan/pull/3753).
+  Thanks to jrsupplee.
+
+and adds the following updates:
+
+- [Updated dependencies](https://github.com/wekan/wekan/commit/e738177e081e4a7e83fed3389f47847403551fc2).
+  Thanks to developers of dependencies.
+
+and fixes the following bugs:
+
+- [Fix Snap: Delete extra symlink that prevented building Snap](https://github.com/wekan/wekan/commit/45124a39f34a918b251a4a36fb016639b558f119).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.23 2021-04-22 Wekan release
+
+This release adds the following new features:
+
+- [Filtering by due date](https://github.com/wekan/wekan/pull/3731).
+  Thanks to mcrute.
+
+and adds the following updates:
+
+- [Updated dependencies](https://github.com/wekan/wekan/commit/676bf686c7a121b0da744afce5911807a6be48fe).
+  Thanks to developers of dependencies.
+
+and fixes the following bugs:
+
+- [Fix: Trello data without labels definition](https://github.com/wekan/wekan/pull/3733).
+  Thanks to jrsupplee.
+- [Bug fix for Due Cards](https://github.com/wekan/wekan/pull/3741).
+  Thanks to jrsupplee.
+- [Fix: The bg color of start at button is almost-due](https://github.com/wekan/wekan/pull/3749).
+  Thanks to listenerri.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.22 2021-04-16 Wekan release
+
+This release adds the following new translations:
+
+- Added German (Switzerland) (de_CH) (Schwiizerdütsch). Updated translations.
+  [Part 1](https://github.com/wekan/wekan/commit/09506c78f3c3439db622574eb851fa0c20d3a066),
+  [Part 2](https://github.com/wekan/wekan/commit/dce99c00be80cceba686fd73b4b78b6c778d78a6),
+  [Part 3](https://github.com/wekan/wekan/commit/6ff9c5b58d25ba52b11e5429c9cfe6ed6a97000e).
+  Thanks to translators.
+
+and fixes the following bugs:
+
+- [Remove allowedValues from Cards.type schema](https://github.com/wekan/wekan/pull/3724).
+  Thanks to jrsupplee.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.21 2021-04-16 Wekan release
+
+This release adds the following new features:
+
+- [Summernote Rich Text Editor](https://github.com/wekan/wekan/pull/3720):
+  1) Add new button to insert a URL link.
+  2) Add new popover allowing you to edit existing URL links.
+  3) Enable spell check.
+  4) Allow client side grammerly extension.
+  Thanks to ryanMushy.
+
+and adds the following updates:
+
+- [Upgraded to Meteor 2.2](https://github.com/wekan/wekan/commit/0e7c2b4b94b1c48e8839cfba635b53cdc1a797b1).
+  Thanks to Meteor developers.
+
+and fixes the following bugs:
+
+- [Bugfix, date format not changed to local format](https://github.com/wekan/wekan/pull/3723).
+  Thanks to mfilser.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.20 2021-04-14 Wekan release
+
+This release fixes the following bugs:
+
+- [OpenAPI: rework the allowedValues to allow for imported variables](https://github.com/wekan/wekan/pull/3715).
+  Thanks to bentiss.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.19 2021-04-14 Wekan release
+
+This release adds the following new features:
+
+- [Custom Field "String Template"](https://github.com/wekan/wekan/pull/3701).
+  Thanks to tod31.
+- [1) Admin reports. An option added to the admin panel that has reports an admin can run. 
+      Right now it has two reports for attachments and broken cards.
+  2) Add the creator avatar to `cardDetails` and `minicard`.  Avatar is only shown if it is selected in card settings.
+  3) Added a new search operator `creator`.
+  4) Bug fix for multiple label predicates](https://github.com/wekan/wekan/pull/3705).
+  Thanks to jrsupplee.
+- [Update Admin Panel Rules report icon and add missing translations](https://github.com/wekan/wekan/commit/8417fae89cc89adb4559874050ff7c56cc08eb00).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Upgraded to Meteor 2.1.1 an updated dependencies](https://github.com/wekan/wekan/commit/bb8c4325c60582cdcda5d406071586f18681e737).
+  Thanks to developers of dependencies.
+- [Updated to Node.js v12.22.1](https://github.com/wekan/wekan/commit/2201372744639ade3ba74b6ff9115988f011b9ac).
+  Thanks to Node.js developers.
+- [Updated release scripts](https://github.com/wekan/wekan/commit/9871bf196352edcb5475e1b0ee4983e8f312e449).
+  Thanks to xet7.
+- [Updated caniuse-lite etc dependencies](https://github.com/wekan/wekan/commit/0857a2ea91f672201ba96f2ba635165784b30fd8).
+  Thanks to developers of dependencies.
+
+and fixes the following bugs:
+
+- [Revert stable tag, because it did break Wekan version numbers](https://github.com/wekan/wekan/commit/5ca90f4d2245910580cb0af885fac17dcec44ef0).
+  Thanks to xet7.
+- [Updating ARM Dockerfile](https://github.com/wekan/wekan/pull/3692).
+  Thanks to loganballard.
+- [Added latest arm64 bundle symlink](https://github.com/wekan/wekan/commit/6fe3edebb18414ebe7e69b2de3269438662b6163).
+  Thanks to xet7.
+- [Bug fix: Rules for moving from list/swimlane](https://github.com/wekan/wekan/pull/3706).
+  Thanks to jrsupplee.
+- [Fixed Elements are duplicated on the view "My cards".
+  Rewrite routine for building the My Cards hierarchical list.
+  Use a separate publication for retrieving My Cards.
+  Fixed bug with limit and skip projection](https://github.com/wekan/wekan/pull/3708).
+  Thanks to jrsupplee.
+- [Popover needs to be destroyed anytime the details panel is closed](https://github.com/wekan/wekan/pull/3712).
+  Thanks to ryanMushy.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.18 2021-04-14 Wekan release
+
+Not released version, because some version numbers not changed in all release files.
+
+# v5.17 2021-04-01 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Link dialog closes card when clicking in dialog](https://github.com/wekan/wekan/commit/454d3b5bbeed6cef8ecface7e6094cabfcc4847c).
+  Thanks to ryanMushy.
+
+and adds the following updates:
+
+- [Added stable tag release script](https://github.com/wekan/wekan/commit/8dfb6916c5180f5d074748840d51dd04f9adb2bb).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.16 2021-04-01 Wekan release
+
+This release adds the following new features:
+
+- [Added stable tag](https://github.com/wekan/wekan/commit/c40668be3fb9c35d44698f49ab06fec5bcabbe1b).
+  Thanks to rynr and xet7.
+- [Added back Summernote editor. Removed emoji picker](https://github.com/wekan/wekan/commit/47ecc654b825a875074dfd4826c36e2c5c55f599).
+  Thanks to ryanMushy and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.15 2021-03-31 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed card sort reset](https://github.com/wekan/wekan/pull/3686).
+  Thanks to ednamaeG.
+- [Fix bug in My Cards and Global Search](https://github.com/wekan/wekan/pull/3687).
+  Thanks to jrsupplee.
+- [Fix bug in Due Cards introduced by last bug fix](https://github.com/wekan/wekan/pull/3688).
+  Thanks to jrsupplee.
+- [Fixed Bug: Move Swimlane to Archive does not work anymore. Fixed lint in
+  router.js](https://github.com/wekan/wekan/commit/0b263cf582a9649ef72efbd289927105a27583af).
+  Thanks to marcungeschikts and xet7.
+
+and adds the following updates:
+
+- Updated sandstorm release script and added new node update script
+  [Part 1](https://github.com/wekan/wekan/commit/34b6aa0858678da937eacf9a87878bbcb476fd4b),
+  [Part 2](https://github.com/wekan/wekan/commit/01de3f187c90af3ac94215ba7e8c7e780c98768d),
+  [Part 3](https://github.com/wekan/wekan/commit/1d3673e9d320926127b46383321023f149287d6d),
+  [Part 4](https://github.com/wekan/wekan/commit/09b9f690b162ae2797d1996e82c96ed8b8c74221),
+  [Part 5](https://github.com/wekan/wekan/commit/6819303047eab17b03a0c28108fd9a2cfde23d20).
+  Thanks to xet7.
+- Updated to Node.js v12.22.0
+  [Part 1](https://github.com/wekan/wekan/commit/7a9c3972642601e9d89d5e7a3816643f91448c63),
+  [Part 2](https://github.com/wekan/wekan/commit/c2b7525864048694c39f9cbe8f8c4cd96e36f7aa).
+  Thanks to Node.js developers.
+- Fixed release website script
+  [Part 1](https://github.com/wekan/wekan/commit/b6f60c08e55c2620fe6724ae2b5da0d9dfc9ec31),
+  [Part 2](https://github.com/wekan/wekan/commit/91dae9795ebd1a98b8ed12c68b78ad90a6983402).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.14 2021-03-29 Wekan release
+
+This release adds the following new features:
+
+- [Clean-up Global Search, Due Cards, and My Cards. New environment variable `RESULTS_PER_PAGE` for search
+  results](https://github.com/wekan/wekan/pull/3676).
+  Thanks to jrsupplee.
+- [Added environment variable `RESULTS_PER_PAGE` to all Wekan platforms](https://github.com/wekan/wekan/commit/ba05f383ca29211c5474e06c5ba6673e712afe7a).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Updated release scripts](https://github.com/wekan/wekan/commit/59580e4b0f711ca55e8cb0d73803a4ff8b56352d).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Require signed-in user for My Cards, Due Cards, and global search](https://github.com/wekan/wekan/pull/3677).
+  Thanks to jrsupplee.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.13 2021-03-28 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed Sandstorm Wekan attachments upload](https://github.com/wekan/wekan/commit/d4a1611b86521cd5913277cfa2c86c43958eec7b).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.12 2021-03-28 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix HTTP not defined](https://github.com/wekan/wekan/commit/4c609161915cc46ebfccad3d9e7ffdecdef1f85c).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.11 2021-03-28 Wekan release
+
+This release adds the following new features:
+
+- [Added emoji picker to card description edit and card comment edit.
+  Removed and disabled Summernote wysiwyg editor, package-lock.json
+  etc](https://github.com/wekan/wekan/commit/84fde1ecfc81e89ed1895cab3bcb328e4f166a87).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Updated dependencies. Fixed lint](https://github.com/wekan/wekan/commit/4e1c0fdce82e3b4add8c4ffd1832752181573e88).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.10 2021-03-28 Wekan release
+
+This release adds the following new features:
+
+- [Move swimlane from one board to another](https://github.com/wekan/wekan/pull/3674).
+  Thanks to jrsupplee.
+- [Added translatable Move Swimlane popup title](https://github.com/wekan/wekan/commit/16665bccf912c5e907739c35f7ef5a376c81740e).
+  Thanks to xet7.
+- [REST API: Export one attachment](https://github.com/wekan/wekan/pull/3673).
+  Thanks to vagnernascimento.
+
+and adds the following updates:
+
+- [Updated package-lock.json](https://github.com/wekan/wekan/commit/3145ec65a3defb8ac8d97aed7e43595f661f7100).
+  Thanks to developers of dependencies.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.09 2021-03-26 Wekan release
+
+This release adds the following improvements:
+
+- [Replace edit icon by plus-square on new links](https://github.com/wekan/wekan/pull/3671).
+  Thanks to sim51.
+
+and fixes the following bugs:
+
+- [Fix openapi docs generation](https://github.com/wekan/wekan/pull/3672).
+  Thanks to bentiss.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.08 2021-03-26 Wekan release
+
+This release adds the following new features:
+
+- [Admin Panel/Settings/Accounts: Hide system messages of all users](https://github.com/wekan/wekan/commit/a249ffc8054189d8e3db9b4c8f082cc7ce7dcb52).
+  Thanks to bbyszio, r4nc0r and xet7.
+
+and adds the following improvements:
+
+- [Add Trello attached links to the card description](https://github.com/wekan/wekan/pull/3669).
+  Thanks to jrsupplee.
+- [Added package-lock.json and updated .gitignore](https://github.com/wekan/wekan/commit/d532a3591f338cec9a3839d43d9a1e9d69f59dc2).
+  Thanks to xet7.
+
+and adds the following new translations:
+
+- [Added translation: español de América Latina](https://github.com/wekan/wekan/commit/ccc9efb2703efda4e199a861920b9ec88e634b59).
+  Thanks to translators.
+
+and fixes the following bugs:
+
+- [Fix typos in translations](https://github.com/wekan/wekan/commit/a0e1b6f918dbb252a13db05d6b9e1f832c28654f).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.07 2021-03-19 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed sort cards feature](https://github.com/wekan/wekan/pull/3662).
+  Thanks to ednamaeG.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.06 2021-03-18 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed Bug: Calendar & parent cards URLs used absolute URLs](https://github.com/wekan/wekan/pull/3648).
+  Thanks to Majed6.
+- [Fixed Bug: copy to clipboard uses pathname](https://github.com/wekan/wekan/pull/3661).
+  Thanks to Majed6.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.05 2021-03-11 Wekan release
+
+This release fixes the following bugs:
+
+- [Change URL scheme recognition for allowing abasurl to link](https://github.com/wekan/wekan/pull/3641).
+  Thanks to tod31 and chrisi51.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.04 2021-03-07 Wekan release
+
+This release adds the following speed improvements:
+
+- [Speed improvement: Delete presences older than one week, and add database index to presences
+  serverId](https://github.com/wekan/wekan/commit/9db3c931161adfbeb6fc52d3e4cf621fb9a4955f).
+  Thanks to xet7.
+
+and adds the following new features:
+
+- [Added autolinking settings in Admin Panel](https://github.com/wekan/wekan/pull/3633).
+  Thanks to chrisi51.
+- [Add custom field editing to the REST API](https://github.com/wekan/wekan/pull/3593).
+  Thanks to dudeofawesome.
+- [Related to custom field editing, Fixed generating API docs and Wekan Custom Fields
+  REST API](https://github.com/wekan/wekan/commit/0bb3b670753c6ba20b0ad63f63d273036f609ee5).
+  Thanks to xet7.
+
+and adds back the following platforms:
+
+- [OpenPower Minicloud emergency maintenance has finished, so can now build Wekan for
+  ppc64le](https://github.com/wekan/wekan/commit/ac9b23f00f10b0170b8693e1e997bfb54f807adc).
+  Thanks to OpenPower Minicloud.
+
+and fixes the following bugs:
+
+- [Try to fix Snap: Removed fibers multi arch from Snap, because Snap build servers do not build correctly with
+  it](https://github.com/wekan/wekan/commit/a44ca39eb84508441f0f8bdac852745f417f12e7).
+  Thanks to xet7.
+- [Fix search on labels server error](https://github.com/wekan/wekan/pull/3634).
+  Thanks to jrsupplee.
+- [Fixed Bug: inconsistent use of relative/absolute URLs](https://github.com/wekan/wekan/pull/3635).
+  Thanks to Majed6.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.03 2021-03-03 Wekan release
+
+This release adds the following changes:
+
+- [Hide email settings from Sandstorm Wekan Admin Panel](https://github.com/wekan/wekan/commit/626f435edf75fac68448ba2e14c62acb749f9c9b).
+  Thanks to ocdtrekkie and xet7.
+
+and fixes the following bugs:
+
+- [Revert Removed extra imports of Meteor. Hopefully fixes email notifications and rules
+  on old cars not working](https://github.com/wekan/wekan/commit/e4a9dc25ecc230829afea07dbb3915b96115f7f7).
+  Thanks to xet7.
+- [Fixed Bug: Link at board title can not be edited](https://github.com/wekan/wekan/commit/7d3917adb79be09356d32612585029392bac1e49).
+  Thanks to jonesrussell42, aiac, bbyszio and xet7.
+
+Thanks to above GitHub and Wekan vanila.io community users for their contributions and translators for their translations.
+
+# v5.02 2021-03-02 Wekan release
+
+This release adds the following improvements:
+
+- [Added sort to edit card REST API](https://github.com/wekan/wekan/pull/3618).
+  Thanks to ChrisMagnuson.
+- [Add attachmentId to the Webhook data](https://github.com/wekan/wekan/pull/3620).
+  Thanks to n8ores.
+
+and fixes the following bugs:
+
+- [Fix SMTP port lost after upgrade. STMP settings are made only with environment variables on non-Sandstorm platforms.
+  Note: Sending email on Sandstorm Wekan does not work yet](https://github.com/wekan/wekan/commit/65b8220fe53349695a335bdb8b9692f82d4b3329).
+  Thanks to jrsupplee and xet7.
+- [Removed extra imports of Meteor](https://github.com/wekan/wekan/commit/de13b8b9bafbfb186a037ae20e845846b296ac69).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.01 2021-02-26 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix typo in activities code. Fixes can not edit Custom Field](https://github.com/wekan/wekan/pull/3610).
+  Thanks to n8ores.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.00 2021-02-25 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed Unable to remove old Board, reappears](https://github.com/wekan/wekan/commit/332f830cc2e44ab66ca891690b09a425b9fd7e68).
+  Thanks to chirrut2, uusijani, cimm, anicolaides, Philipoo0 and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.99 2021-02-25 Wekan release
+
+This release fixes the following CRITICAL SECURITY ISSUES:
+
+- [Fixed SMTP password visible to Admin at Admin Panel by using browser inspect
+  to see behind asterisks](https://github.com/wekan/wekan/commit/71725f1b262b385162b2544f10658a0bc22f6b41).
+  Thanks to Georg Krause and xet7.
+
+and adds the following updates:
+
+- [Update wekan/releases/up.sh script: Can not build ppc64le version because OpenPower Minicloud
+  is having emergency maintenance](https://github.com/wekan/wekan/commit/a43736b5c6196c65770d8ae17af927406dce2c43).
+  Thanks to xet7.
+- [Updated to Meteor 2.1](https://github.com/wekan/wekan/commit/f2241ba3de82e393161ee1c456e1a947c6bdb5fc).
+  Thanks to Meteor developers.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.98 2021-02-24 Wekan release
+
+This release adds the following CRITICAL SECURITY FIXES:
+
+- [Updated Node.js to v12.21.0](https://github.com/wekan/wekan/commit/fde6a6593379277d601408ec83f6f5a4347afef0).
+  Thanks to Node.js developers.
+
+and adds the following new features:
+
+- [Added sort feature for viewing of cards](https://github.com/wekan/wekan/pull/3586).
+  Thanks to ednamaeG.
+- [Made sort cards feature translatable](https://github.com/wekan/wekan/commit/09a13ef75f478b0fc02ae3cdbfe918367664aa0c).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix development script to escape character](https://github.com/wekan/wekan/commit/2e9ad941c0b63b384ee215548a3f31b4a635b28b).
+  Thanks to xet7.
+- [Fix bugs with customFields in Webhooks](https://github.com/wekan/wekan/pull/3584).
+  Thanks to n8ores.
+
+and adds the following improvements:
+
+- [Global Search Updates](https://github.com/wekan/wekan/pull/3597).
+  Thanks to jrsupplee.
+- [Updated GitHub issue template links](https://github.com/wekan/wekan/commit/c23aca78babd51857271134aed9247615b87b895).
+  Thanks to atlantsecurity and xet7.
+- [Admin Panel/People/People/New User: Added Initials](https://github.com/wekan/wekan/commit/3a2deb00399eb213472ef169826bd15ad655e490).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Update release-bundle.sh script: Can not build ppc64le version because OpenPower Minicloud
+  is having emergency maintenance](https://github.com/wekan/wekan/commit/799ae886c5fedad3bafa18a14f8fbbca7ad2c227).
+  Thanks to xet7.
+- [Update release.sh script: Also build Sandstorm version of Wekan with same
+  script](https://github.com/wekan/wekan/commit/b105088c2858bc04120551a8a8e5a75f187041e5).
+  Thanks to xet7.
+
+and adds the following new translations:
+
+- [Added translation: Persian (Iran)](https://github.com/wekan/wekan/commit/0a728f805b336588741ca93f2ecbd1ca31ee53f2).
+  Thanks to translators.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.97 2021-02-24 Wekan release
+
+Release skipped, because not all required files had new version number updated yet.
+
+# v4.96 2021-02-13 Wekan release
+
+This release adds the following new features:
+
+- [Add /api/boards_count endpoint for statistics](https://github.com/wekan/wekan/pull/3556).
+  Thanks to pichouk.
+- [Added possibility to specify hours in single digits in 24 hour format](https://github.com/wekan/wekan/pull/3557).
+  Thanks to lindhork.
+- [Added replacement from comma to dot](https://github.com/wekan/wekan/pull/3564).
+  Thanks to lindhork.
+
+and adds the following improvements:
+
+- [Checklistitems are now inserted always at the end of the checklist](https://github.com/wekan/wekan/pull/3551).
+  Thanks to mfilser.
+- [Teams/Organizations: Added more code to Admin Panel for saving and editing. In Progress, does not work yet](https://github.com/wekan/wekan/commit/1bc07b1b4a3e8cd1a177f3f1776ed8e189bc627a).
+  Thanks to xet7.
+- [Mobile View, list header is now always at top and only lists/cards view have a scroll area](https://github.com/wekan/wekan/pull/3563).
+  Thanks to mfilser.
+- [Added ChangeLog update script](https://github.com/wekan/wekan/commit/c7ec07ed4748fe9b00f622af7472fd291cf1a3ce).
+  Thanks to xet7.
+- [Helm: Made SecretEnv a secret and added default mongodb name as Wekan](https://github.com/wekan/wekan/pull/3570).
+  Thanks to meerkampdvv.
+- [Checklist drag handle now at the left side (same place as for the checklist items)](https://github.com/wekan/wekan/pull/3571).
+  Thanks to mfilser.
+- [Lists, show also 0 cards at column description](https://github.com/wekan/wekan/pull/3572).
+  Thanks to mfilser.
+
+and adds the following updates:
+
+- [Updated Node.js to v12.20.2](https://github.com/wekan/wekan/commit/011f86f368a83c2e70f597c11ec60ec857e0fab0).
+  Thanks to Node.js developers.
+
+and fixes the following bugs:
+
+- [Minicard, remove red line below member avatar icon](https://github.com/wekan/wekan/pull/3560).
+  Thanks to mfilser.
+- [Added padding](https://github.com/wekan/wekan/pull/3559).
+  Thanks to lindhork.
+- [Changed default behaviour for BIGEVENTS that no activity matches it](https://github.com/wekan/wekan/pull/3561).
+  Thanks to bronger.
+- [Modern theme: Remove font color when the card has a color](https://github.com/wekan/wekan/pull/3569).
+  Thanks to helioguardabaxo.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.95 2021-02-08 Wekan release
+
+This release adds back the following features:
+
+- [Added back Custom Fields sorting, because it now does not prevent loading boards](https://github.com/wekan/wekan/pull/3547).
+  Thanks to mfilser.
+
+and adds the following updates:
+
+- [Updated dependencies](https://github.com/wekan/wekan/commit/1c494803b091d987e26ccb783432434e7fee15a5).
+  Thanks to xet7.
+- [Fix typo](https://github.com/wekan/wekan/commit/0bd0a70564d3dda67706deb1bbfbd1d5a96f811f).
+  Thanks to xet7.
+- Updated release scripts
+  [Part 1](https://github.com/wekan/wekan/commit/d0df3a2915d08b255d7ab92f9bcac195a1e7f442),
+  [Part 2](https://github.com/wekan/wekan/commit/e34a2840366351c0e069515ac2210db3911dbc0f).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.94 2021-02-08 Wekan release
+
+This release adds the following new features:
+
+- [Settings, "Show cards count" now works at mobile view too](https://github.com/wekan/wekan/pull/3545).
+  Thanks to mfilser.
+
+and adds the following updates:
+
+- [Updated dependencies](https://github.com/wekan/wekan/commit/b4352ada27545fadc425ca7024532aede3cc1a6f).
+  Thanks to developers of dependencies.
+- [Update release scripts](https://github.com/wekan/wekan/commit/dcec5b5cb05ac9e0dfae8f360def169f5f9b6fa2).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix bug in adding new users](https://github.com/wekan/wekan/pull/3544).
+  Thanks to jrsupplee.
+- [Fixed Board does not load, by disabling Custom Fields sorting](https://github.com/wekan/wekan/commit/d57eb6a2fc73c7b25c957ad42b5f7a06f680e1a1).
+  Thanks to marcungeschikts, olivierlambert and xet7.
+- [Fixed lint](https://github.com/wekan/wekan/commit/60fedad3fe384a2b0652941e57ecaa5fc4b7897a).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# 4.93 2021-02-06 Wekan release
+
+This release adds the following new features:
+
+- [Add the ability to call get_user operation with username](https://github.com/wekan/wekan/pull/3530).
+  Thanks to magicbelette.
+
+and adds the following updates:
+
+- [Updated Ubuntu base image in Dockerfile](https://github.com/wekan/wekan/commit/bcdaf77a9c675530cfa21d038e8abd7c62aef70d).
+  Thanks to Ubuntu and xet7.
+
+and fixes the following bugs:
+
+- [Set the language on `TAPi18n` when user selects language](https://github.com/wekan/wekan/pull/3525).
+  Thanks to jrsupplee.
+- [Fix bug in `uniqueTitle`](https://github.com/wekan/wekan/pull/3526).
+  Thanks to jrsupplee.
+- [Fixed file permissions in build scripts](https://github.com/wekan/wekan/commit/ea697f2238842893953dee76bed03ffd5b4a107e).
+  Thanks to xet7.
+- [Red line below the avatar now correctly on FireFox](https://github.com/wekan/wekan/pull/3532).
+  Thanks to mfilser.
+- [Notifications, enable line wrapping](https://github.com/wekan/wekan/pull/3533).
+  Thanks to mfilser.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# 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:
@@ -1,4 +1,4 @@
-FROM quay.io/wekan/ubuntu:groovy-20201125.2
+FROM quay.io/wekan/ubuntu:groovy-20210115
 LABEL maintainer="wekan"

 # 2020-12-03:
@@ -12,7 +12,7 @@ ARG DEBIAN_FRONTEND=noninteractive

 ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
    DEBUG=false \
-    NODE_VERSION=v12.20.1 \
+    NODE_VERSION=v12.22.1 \
    METEOR_RELEASE=1.10.2 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
@@ -21,6 +21,7 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
    ARCHITECTURE=linux-x64 \
    SRC_PATH=./ \
    WITH_API=true \
+    RESULTS_PER_PAGE="" \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \
    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15 \
@@ -274,11 +275,12 @@ RUN \
    mkdir -p /home/wekan/.npm && \
    chown wekan --recursive /home/wekan/.npm /home/wekan/.config /home/wekan/.meteor && \
    #gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
+    chmod u+w *.json && \
    gosu wekan:wekan npm install && \
    gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \
-    cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
+    #cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
    #rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs && \
-    chown wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
+    #chown wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
    #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
    #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
    #https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
@@ -291,10 +293,11 @@ RUN \
    #find . -name "*phantomjs*" | xargs rm -rf && \
    #
    cd /home/wekan/app_build/bundle/programs/server/ && \
+    chmod u+w *.json && \
    gosu wekan:wekan npm install && \
    #gosu wekan:wekan npm install bcrypt && \
    # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc.
-		rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy && \
+    rm -rf /home/wekan/app_build/bundle/programs/web.browser.legacy && \
    mv /home/wekan/app_build/bundle /build && \
    \
    # Put back the original tar
@@ -4,16 +4,16 @@ FROM amd64/alpine:3.7 AS builder
 ENV QEMU_VERSION=v4.2.0-6 \
    QEMU_ARCHITECTURE=aarch64 \
    NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.20.1 \
-    WEKAN_VERSION=3.96  \
+    NODE_VERSION=v12.22.1 \
+    WEKAN_VERSION=latest  \
    WEKAN_ARCHITECTURE=arm64

-     # Install dependencies
-RUN  apk update && apk add ca-certificates outils-sha1 && \
-     \
-     # Download qemu static for our architecture
-     wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-${QEMU_ARCHITECTURE}-static.tar.gz -O - | tar -xz && \
-     \
+    # Install dependencies
+RUN apk update && apk add ca-certificates outils-sha1 && \
+    \
+    # Download qemu static for our architecture
+    wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-${QEMU_ARCHITECTURE}-static.tar.gz -O - | tar -xz && \
+    \
    # Download wekan and shasum
    wget https://releases.wekan.team/raspi3/wekan-${WEKAN_VERSION}-${WEKAN_ARCHITECTURE}.zip && \
    wget https://releases.wekan.team/raspi3/SHA256SUMS.txt && \
@@ -40,7 +40,7 @@ LABEL maintainer="wekan"
 # Set the environment variables (defaults where required)
 ENV QEMU_ARCHITECTURE=aarch64 \
    NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.20.1 \
+    NODE_VERSION=v12.22.1 \
    NODE_ENV=production \
    NPM_VERSION=latest \
    WITH_API=true \
@@ -1,4 +1,4 @@
-[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/wekan/wekan) 
+[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/wekan/wekan)

 # Wekan - Open Source kanban

@@ -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,19 +21,18 @@ 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)

 ## FAQ

-**NOTE**: 
+**NOTE**:
 - Please read the [FAQ](https://github.com/wekan/wekan/wiki/FAQ) first
 - Please don't feed the [trolls](https://github.com/wekan/wekan/wiki/FAQ#why-am-i-called-a-troll) and [spammers](https://github.com/wekan/wekan/wiki/FAQ#why-am-i-called-a-spammer) that are mentioned in the FAQ :)

@@ -52,7 +52,7 @@ that by providing one-click installation on various platforms.

 - Wekan is used in [most countries of the world](https://snapcraft.io/wekan).
 - Wekan largest user has 13k users using Wekan in their company.
- Wekan has been [translated](https://transifex.com/wekan/wekan) to about 60 languages.
+- Wekan has been [translated](https://transifex.com/wekan/wekan) to about 63 languages.
 - [Features][features]: Wekan has real-time user interface.
 - [Platforms][platforms]: Wekan supports many platforms.
  Wekan is critical part of new platforms Wekan is currently being integrated to.
@@ -64,7 +64,7 @@ that by providing one-click installation on various platforms.
  [More Platforms](https://github.com/wekan/wekan/wiki/Platforms), bundle for RasPi3 ARM and other CPUs where Node.js and MongoDB exists.
 - 1 GB RAM minimum free for Wekan. Production server should have minimum total 4 GB RAM.
  For thousands of users, for example with [Docker](https://github.com/wekan/wekan/blob/master/docker-compose.yml): 3 frontend servers,
-  each having 2 CPU and 2 wekan-app containers. One backend wekan-db server with many CPUs.  
+  each having 2 CPU and 2 wekan-app containers. One backend wekan-db server with many CPUs.
 - Enough disk space and alerts about low disk space. If you run out disk space, MongoDB database gets corrupted.
 - SECURITY: Updating to newest Wekan version very often. Please check you do not have automatic updates of Sandstorm or Snap turned off.
  Old versions have security issues because of old versions Node.js etc. Only newest Wekan is supported.
@@ -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.85.0"
+appVersion: "v5.32.0"
 files:
  userUploads:
    - README.md
@@ -28,12 +28,16 @@ if arguments == 0:
    print("  python3 api.py board BOARDID      # Info of BOARDID")
    print("  python3 api.py swimlanes BOARDID  # Swimlanes of BOARDID")
    print("  python3 api.py lists BOARDID      # Lists of BOARDID")
+    print("  python3 api.py list BOARDID LISTID # Info of LISTID")
    print("  python3 api.py createlist BOARDID LISTTITLE # Create list")
    print("  python3 api.py addcard AUTHORID BOARDID SWIMLANEID LISTID CARDTITLE CARDDESCRIPTION")
+    print("  python3 api.py editcard BOARDID LISTID CARDID NEWCARDTITLE NEWCARDDESCRIPTION")
    print("  python3 api.py listattachments BOARDID # List attachments")
 # TODO:
-#    print("  python3 api.py attachmentdownload BOARDID ATTACHMENTID # One attachment as file")
-#    print("  python3 api.py attachmentsdownload BOARDID # All attachments as files")
+#   print("  python3 api.py attachmentjson BOARDID ATTACHMENTID # One attachment as JSON base64")
+#   print("  python3 api.py attachmentbinary BOARDID ATTACHMENTID # One attachment as binary file")
+#   print("  python3 api.py attachmentdownload BOARDID ATTACHMENTID # One attachment as file")
+#   print("  python3 api.py attachmentsdownload BOARDID # All attachments as files")
    exit

 # ------- SETTINGS START -------------
@@ -61,13 +65,15 @@ chmod +x api.py
 === Wekan API Python CLI: Shows IDs for addcard ===
 AUTHORID is USERID that writes card.
 Syntax:
-  python3 api.py users              # All users
-  python3 api.py boards USERID      # Boards of USERID
-  python3 api.py board BOARDID      # Info of BOARDID
-  python3 api.py swimlanes BOARDID  # Swimlanes of BOARDID
-  python3 api.py lists BOARDID      # Lists of BOARDID
+  python3 api.py users               # All users
+  python3 api.py boards USERID       # Boards of USERID
+  python3 api.py board BOARDID       # Info of BOARDID
+  python3 api.py swimlanes BOARDID   # Swimlanes of BOARDID
+  python3 api.py lists BOARDID       # Lists of BOARDID
+  python3 api.py list BOARDID LISTID # Info of LISTID
  python3 api.py createlist BOARDID LISTTITLE # Create list
  python3 api.py addcard AUTHORID BOARDID SWIMLANEID LISTID CARDTITLE CARDDESCRIPTION
+  python3 api.py editcard BOARDID LISTID CARDID NEWCARDTITLE NEWCARDDESCRIPTION
  python3 api.py listattachments BOARDID # List attachments
  python3 api.py attachmentjson BOARDID ATTACHMENTID # One attachment as JSON base64
  python3 api.py attachmentbinary BOARDID ATTACHMENTID # One attachment as binary file
@@ -162,6 +168,27 @@ if arguments == 7:
        print(body.text)
        # ------- WRITE TO CARD END -----------

+if arguments == 6:
+
+    if sys.argv[1] == 'editcard':
+
+        # ------- LIST OF BOARD START -----------
+        boardid = sys.argv[2]
+        listid = sys.argv[3]
+        cardid = sys.argv[4]
+        newcardtitle = sys.argv[5]
+        newcarddescription = sys.argv[6]
+        edcard = wekanurl + apiboards + boardid + s + l + s + listid + s + cs + s + cardid
+        print(edcard)
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        put_data = {'title': '{}'.format(newcardtitle), 'description': '{}'.format(newcarddescription)}
+        body = requests.put(edcard, data=put_data, headers=headers)
+        print("=== EDIT CARD ===\n")
+        body = requests.get(edcard, headers=headers)
+        data2 = body.text.replace('}',"}\n")
+        print(data2)
+        # ------- LISTS OF BOARD END -----------
+
 if arguments == 3:

    if sys.argv[1] == 'createlist':
@@ -177,6 +204,19 @@ if arguments == 3:
        print(body.text)
        # ------- CREATE LIST END -----------

+    if sys.argv[1] == 'list':
+
+        # ------- LIST OF BOARD START -----------
+        boardid = sys.argv[2]
+        listid = sys.argv[3]
+        listone = wekanurl + apiboards + boardid + s + l + s + listid
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        print("=== INFO OF ONE LIST ===\n")
+        body = requests.get(listone, headers=headers)
+        data2 = body.text.replace('}',"}\n")
+        print(data2)
+        # ------- LISTS OF BOARD END -----------
+
 if arguments == 2:

    # ------- BOARDS LIST START -----------
@@ -217,7 +257,7 @@ if arguments == 2:

        # ------- LISTS OF BOARD START -----------
        boardid = sys.argv[2]
-        attachments = wekanurl + apiboards + boardid
+        lists = wekanurl + apiboards + boardid + s + l
        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
        print("=== LISTS ===\n")
        body = requests.get(lists, headers=headers)
@@ -82,7 +82,7 @@ template(name="activity")
            +viewer
              = activity.checklist.title
        else
-          a.activity-checklist(href="{{ activity.card.absoluteUrl }}")
+          a.activity-checklist(href="{{ activity.card.originRelativeUrl }}")
            +viewer
              = activity.checklist.title

@@ -103,7 +103,7 @@ template(name="activity")

      if($eq activity.activityType 'addChecklistItem')
        | {{{_ 'activity-checklist-item-added' (sanitize activity.checklist.title) cardLink}}}.
-        .activity-checklist(href="{{ activity.card.absoluteUrl }}")
+        .activity-checklist(href="{{ activity.card.originRelativeUrl }}")
          +viewer
            = activity.checklistItem.title

@@ -139,7 +139,7 @@ template(name="activity")
        //- if we are not in card mode we only display a summary of the comment
        if($eq activity.activityType 'addComment')
          | {{{_ 'activity-on' cardLink}}}
-          a.activity-comment(href="{{ activity.card.absoluteUrl }}")
+          a.activity-comment(href="{{ activity.card.originRelativeUrl }}")
            +viewer
              = activity.comment.text

@@ -1,4 +1,4 @@
-import sanitizeXss from 'xss';
+import DOMPurify from 'dompurify';

 const activitiesPerPage = 500;

@@ -162,11 +162,15 @@ BlazeComponent.extendComponent({
            {
              href: source.url,
            },
-            sanitizeXss(source.system),
+            DOMPurify.sanitize(source.system, {
+              ALLOW_UNKNOWN_PROTOCOLS: true,
+            }),
          ),
        );
      } else {
-        return sanitizeXss(source.system);
+        return DOMPurify.sanitize(source.system, {
+          ALLOW_UNKNOWN_PROTOCOLS: true,
+        });
      }
    }
    return null;
@@ -190,10 +194,10 @@ BlazeComponent.extendComponent({
              href: attachment.url({ download: true }),
              target: '_blank',
            },
-            sanitizeXss(attachment.name()),
+            DOMPurify.sanitize(attachment.name()),
          ),
        )) ||
-      sanitizeXss(this.currentData().activity.attachmentName)
+      DOMPurify.sanitize(this.currentData().activity.attachmentName)
    );
  },

@@ -232,7 +236,7 @@ BlazeComponent.extendComponent({

 Template.activity.helpers({
  sanitize(value) {
-    return sanitizeXss(value);
+    return DOMPurify.sanitize(value, { ALLOW_UNKNOWN_PROTOCOLS: true });
  },
 });

@@ -243,10 +247,10 @@ function createCardLink(card) {
    Blaze.toHTML(
      HTML.A(
        {
-          href: card.absoluteUrl(),
+          href: card.originRelativeUrl(),
          class: 'action-card',
        },
-        sanitizeXss(card.title),
+        DOMPurify.sanitize(card.title, { ALLOW_UNKNOWN_PROTOCOLS: true }),
      ),
    )
  );
@@ -260,10 +264,10 @@ function createBoardLink(board, list) {
    Blaze.toHTML(
      HTML.A(
        {
-          href: board.absoluteUrl(),
+          href: board.originRelativeUrl(),
          class: 'action-board',
        },
-        sanitizeXss(text),
+        DOMPurify.sanitize(text, { ALLOW_UNKNOWN_PROTOCOLS: true }),
      ),
    )
  );
@@ -1,7 +1,7 @@
 template(name="commentForm")
  .new-comment.js-new-comment(
    class="{{#if commentFormIsOpen}}is-open{{/if}}")
-    +userAvatar(userId=currentUser._id)
+    +userAvatar(userId=currentUser._id noRemove=true)
    form.js-new-comment-form
      +editor(class="js-new-comment-input")
        | {{getUnsavedValue 'cardComment' currentCard._id}}
@@ -3,6 +3,7 @@ const commentFormIsOpen = new ReactiveVar(false);
 BlazeComponent.extendComponent({
  onDestroyed() {
    commentFormIsOpen.set(false);
+    $('.note-popover').hide();
  },

  commentFormIsOpen() {
@@ -11,7 +11,7 @@ BlazeComponent.extendComponent({
    return Boards.find(
      { archived: true },
      {
-        sort: { sort: 1 /* boards default sorting */ },
+        sort: { archivedAt: -1, modifiedAt: -1 },
      },
    );
  },
@@ -360,7 +360,7 @@ BlazeComponent.extendComponent({
            end: end || card.endAt,
            allDay:
              Math.abs(end.getTime() - start.getTime()) / 1000 === 24 * 3600,
-            url: FlowRouter.url('card', {
+            url: FlowRouter.path('card', {
              boardId: currentBoard._id,
              slug: currentBoard.slug,
              cardId: card._id,
@@ -654,7 +654,6 @@ setBoardClear(color1,color2)

  /* Card changes */
  .minicard
-    background: #FFF
    padding: 15px 15px 10px
    box-shadow: 0 3px 8px rgba(0,0,0,.05)

@@ -1,14 +1,17 @@
 template(name="boardHeaderBar")
  h1.header-board-menu
    with currentBoard
-      a(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}")
-        +viewer
-          = title
+      +viewer
+        = title

  .board-header-btns.left
    unless isMiniScreen
      if currentBoard
        if currentUser
+          with currentBoard
+            a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title)
+              i.fa.fa-pencil-square-o
+
          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
@@ -31,6 +34,12 @@ template(name="boardHeaderBar")
            if $eq watchLevel "muted"
              i.fa.fa-bell-slash
            span {{_ watchLevel}}
+          a.board-header-btn(title="{{_ 'sort-cards'}}" class="{{#if isSortActive }}emphasis{{else}} js-sort-cards {{/if}}")
+            i.fa.fa-sort
+            span {{#if isSortActive }}{{_ 'Sort is on'}}{{else}}{{_ 'sort-cards'}}{{/if}}
+            if isSortActive
+              a.board-header-btn-close.js-sort-reset(title="Remove Sort")
+                i.fa.fa-times-thin

        else
          a.board-header-btn.js-log-in(
@@ -42,6 +51,10 @@ template(name="boardHeaderBar")
    if currentBoard
      if isMiniScreen
        if currentUser
+          with currentBoard
+            a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title)
+              i.fa.fa-pencil-square-o
+
          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
@@ -118,7 +131,7 @@ template(name="boardHeaderBar")
              i.fa.fa-times-thin

      .separator
-      a.board-header-btn.js-toggle-sidebar
+      a.board-header-btn.js-toggle-sidebar(title="{{_ 'sidebar-open'}} {{_ 'or'}} {{_ 'sidebar-close'}}")
        i.fa.fa-navicon

 template(name="boardVisibilityList")
@@ -247,3 +260,19 @@ template(name="boardChangeTitlePopup")
 template(name="boardCreateRulePopup")
  p {{_ 'close-board-pop'}}
  button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
+
+
+template(name="cardsSortPopup")
+  ul.pop-over-list
+    li
+      a.js-sort-due {{_ 'due-date'}}
+      hr
+    li
+      a.js-sort-title {{_ 'title-alphabetically'}}
+      hr
+    li
+      a.js-sort-created-desc {{_ 'created-at-newest-first'}}
+      hr
+    li
+      a.js-sort-created-asc {{_ 'created-at-oldest-first'}}
+
@@ -2,6 +2,7 @@
 const DOWNCLS = 'fa-sort-down';
 const UPCLS = 'fa-sort-up';
 */
+const sortCardsBy = new ReactiveVar('');
 Template.boardMenuPopup.events({
  'click .js-rename-board': Popup.open('boardChangeTitle'),
  'click .js-custom-fields'() {
@@ -110,6 +111,7 @@ BlazeComponent.extendComponent({
        'click .js-open-filter-view'() {
          Sidebar.setView('filter');
        },
+        'click .js-sort-cards': Popup.open('cardsSort'),
        /*
        'click .js-open-sort-view'(evt) {
          const target = evt.target;
@@ -127,6 +129,9 @@ BlazeComponent.extendComponent({
          Sidebar.setView();
          Filter.reset();
        },
+        'click .js-sort-reset'() {
+          Session.set('sortBy', '');
+        },
        'click .js-open-search-view'() {
          Sidebar.setView('search');
        },
@@ -160,6 +165,9 @@ Template.boardHeaderBar.helpers({
  boardView() {
    return Utils.boardView();
  },
+  isSortActive() {
+    return Session.get('sortBy') ? true : false;
+  },
 });

 Template.boardChangeViewPopup.events({
@@ -368,3 +376,44 @@ BlazeComponent.extendComponent({
  },
 }).register('listsortPopup');
 */
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click .js-sort-due'() {
+          const sortBy = {
+            dueAt: 1,
+          };
+          Session.set('sortBy', sortBy);
+          sortCardsBy.set(TAPi18n.__('due-date'));
+          Popup.close();
+        },
+        'click .js-sort-title'() {
+          const sortBy = {
+            title: 1,
+          };
+          Session.set('sortBy', sortBy);
+          sortCardsBy.set(TAPi18n.__('title'));
+          Popup.close();
+        },
+        'click .js-sort-created-asc'() {
+          const sortBy = {
+            createdAt: 1,
+          };
+          Session.set('sortBy', sortBy);
+          sortCardsBy.set(TAPi18n.__('date-created-newest-first'));
+          Popup.close();
+        },
+        'click .js-sort-created-desc'() {
+          const sortBy = {
+            createdAt: -1,
+          };
+          Session.set('sortBy', sortBy);
+          sortCardsBy.set(TAPi18n.__('date-created-oldest-first'));
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('cardsSortPopup');
@@ -2,7 +2,8 @@ template(name="boardList")
  .wrapper
    ul.board-list.clearfix.js-boards
      li.js-add-board
-        a.board-list-item.label {{_ 'add-board'}}
+        a.board-list-item.label(title="{{_ 'add-board'}}")
+          | {{_ 'add-board'}}
      each boards
        li(class="{{#if isStarred}}starred{{/if}}" class=colorClass).js-board
          if isInvited
@@ -18,7 +19,7 @@ template(name="boardList")
          else
            a.js-open-board.board-list-item(href="{{pathFor 'board' id=_id slug=slug}}")
              span.details
-                span.board-list-item-name
+                span.board-list-item-name(title="{{_ 'board-drag-drop-reorder-or-click-open'}}")
                  +viewer
                    = title
                i.fa.js-star-board(
@@ -22,6 +22,15 @@ Template.boardListHeaderBar.helpers({
 BlazeComponent.extendComponent({
  onCreated() {
    Meteor.subscribe('setting');
+    let currUser = Meteor.user();
+    let userLanguage;
+    if(currUser && currUser.profile){
+      userLanguage = currUser.profile.language
+    }
+    if (userLanguage) {
+      TAPi18n.setLanguage(userLanguage);
+      T9n.setLanguage(userLanguage);
+    }
  },

  onRendered() {
@@ -129,7 +138,7 @@ BlazeComponent.extendComponent({
            {
              sort: Boards.find({ archived: false }).count(),
              type: 'board',
-              title: Boards.findOne(this.currentData()._id).copyTitle(),
+              title: Boards.findOne(this.currentData()._id).title,
            },
            (err, res) => {
              if (err) {
@@ -55,6 +55,5 @@ template(name="attachmentsGalery")
      unless currentUser.isCommentOnly
        unless currentUser.isWorker
          //li.attachment-item.add-attachment
-          a.js-add-attachment
+          a.js-add-attachment(title="{{_ 'add-attachment' }}")
            i.fa.fa-plus
-            | {{_ 'add-attachment' }}
@@ -119,3 +119,24 @@ template(name="cardCustomField-dropdown")
        if value
            +viewer
                = selectedItem
+
+template(name="cardCustomField-stringtemplate")
+    if canModifyCard
+        +inlinedForm(classNames="js-card-customfield-stringtemplate")
+            each item in stringtemplateItems.get
+                input.js-card-customfield-stringtemplate-item(type="text" value=item placeholder="")
+            input.js-card-customfield-stringtemplate-item.last(type="text" value="" placeholder="{{_ 'custom-field-stringtemplate-item-placeholder'}}")
+            .edit-controls.clearfix
+                button.primary(type="submit") {{_ 'save'}}
+                a.fa.fa-times-thin.js-close-inlined-form
+        else
+            a.js-open-inlined-form
+                if value
+                    +viewer
+                        = formattedValue
+                else
+                    | {{_ 'edit'}}
+    else
+        if value
+            +viewer
+                = formattedValue
@@ -1,3 +1,6 @@
+import { DatePicker } from '/client/lib/datepicker';
+import Cards from '/models/cards';
+
 Template.cardCustomFieldsPopup.helpers({
  hasCustomField() {
    const card = Cards.findOne(Session.get('currentCard'));
@@ -121,7 +124,8 @@ CardCustomField.register('cardCustomField');
      {
        'submit .js-card-customfield-currency'(event) {
          event.preventDefault();
-          const value = Number(this.find('input').value, 10);
+          // To allow input separated by comma, the comma is replaced by a period.
+          const value = Number(this.find('input').value.replace(/,/i, '.'), 10);
          this.card.setCustomField(this.customFieldId, value);
        },
      },
@@ -233,3 +237,90 @@ CardCustomField.register('cardCustomField');
    ];
  }
 }.register('cardCustomField-dropdown'));
+
+// cardCustomField-stringtemplate
+(class extends CardCustomField {
+  onCreated() {
+    super.onCreated();
+
+    this.stringtemplateFormat = this.data().definition.settings.stringtemplateFormat;
+    this.stringtemplateSeparator = this.data().definition.settings.stringtemplateSeparator;
+
+    this.stringtemplateItems = new ReactiveVar(this.data().value ?? []);
+  }
+
+  formattedValue() {
+    return (this.data().value ?? [])
+      .filter(value => !!value.trim())
+      .map(value => this.stringtemplateFormat.replace(/%\{value\}/gi, value))
+      .join(this.stringtemplateSeparator ?? '');
+  }
+
+  getItems() {
+    return Array.from(this.findAll('input'))
+      .map(input => input.value)
+      .filter(value => !!value.trim());
+  }
+
+  events() {
+    return [
+      {
+        'submit .js-card-customfield-stringtemplate'(event) {
+          event.preventDefault();
+          const items = this.getItems();
+          this.card.setCustomField(this.customFieldId, items);
+        },
+
+        'keydown .js-card-customfield-stringtemplate-item'(event) {
+          if (event.keyCode === 13) {
+            event.preventDefault();
+
+            if (event.metaKey || event.ctrlKey) {
+              this.find('button[type=submit]').click();
+            } else if (event.target.value.trim()) {
+              const inputLast = this.find('input.last');
+
+              let items = this.getItems();
+
+              if (event.target === inputLast) {
+                inputLast.value = '';
+              } else if (event.target.nextSibling === inputLast) {
+                inputLast.focus();
+              } else {
+                event.target.blur();
+
+                const idx = Array.from(this.findAll('input')).indexOf(
+                  event.target,
+                );
+                items.splice(idx + 1, 0, '');
+
+                Tracker.afterFlush(() => {
+                  const element = this.findAll('input')[idx + 1];
+                  element.focus();
+                  element.value = '';
+                });
+              }
+
+              this.stringtemplateItems.set(items);
+            }
+          }
+        },
+
+        'blur .js-card-customfield-stringtemplate-item'(event) {
+          if (
+            !event.target.value.trim() ||
+            event.target === this.find('input.last')
+          ) {
+            const items = this.getItems();
+            this.stringtemplateItems.set(items);
+            this.find('input.last').value = '';
+          }
+        },
+
+        'click .js-close-inlined-form'(event) {
+          this.stringtemplateItems.set(this.data().value ?? []);
+        },
+      },
+    ];
+  }
+}.register('cardCustomField-stringtemplate'));
@@ -1,96 +1,4 @@
-// Edit received, start, due & end dates
-BlazeComponent.extendComponent({
-  template() {
-    return 'editCardDate';
-  },
-
-  onCreated() {
-    this.error = new ReactiveVar('');
-    this.card = this.data();
-    this.date = new ReactiveVar(moment.invalid());
-  },
-
-  onRendered() {
-    const $picker = this.$('.js-datepicker')
-      .datepicker({
-        todayHighlight: true,
-        todayBtn: 'linked',
-        language: TAPi18n.getLanguage(),
-      })
-      .on(
-        'changeDate',
-        function(evt) {
-          this.find('#date').value = moment(evt.date).format('L');
-          this.error.set('');
-          this.find('#time').focus();
-        }.bind(this),
-      );
-
-    if (this.date.get().isValid()) {
-      $picker.datepicker('update', this.date.get().toDate());
-    }
-  },
-
-  showDate() {
-    if (this.date.get().isValid()) return this.date.get().format('L');
-    return '';
-  },
-  showTime() {
-    if (this.date.get().isValid()) return this.date.get().format('LT');
-    return '';
-  },
-  dateFormat() {
-    return moment.localeData().longDateFormat('L');
-  },
-  timeFormat() {
-    return moment.localeData().longDateFormat('LT');
-  },
-
-  events() {
-    return [
-      {
-        'keyup .js-date-field'() {
-          // parse for localized date format in strict mode
-          const dateMoment = moment(this.find('#date').value, 'L', true);
-          if (dateMoment.isValid()) {
-            this.error.set('');
-            this.$('.js-datepicker').datepicker('update', dateMoment.toDate());
-          }
-        },
-        'keyup .js-time-field'() {
-          // parse for localized time format in strict mode
-          const dateMoment = moment(this.find('#time').value, 'LT', true);
-          if (dateMoment.isValid()) {
-            this.error.set('');
-          }
-        },
-        'submit .edit-date'(evt) {
-          evt.preventDefault();
-
-          // if no time was given, init with 12:00
-          const time =
-            evt.target.time.value ||
-            moment(new Date().setHours(12, 0, 0)).format('LT');
-
-          const dateString = `${evt.target.date.value} ${time}`;
-          const newDate = moment(dateString, 'L LT', true);
-          if (newDate.isValid()) {
-            this._storeDate(newDate.toDate());
-            Popup.close();
-          } else {
-            this.error.set('invalid-date');
-            evt.target.date.focus();
-          }
-        },
-        'click .js-delete-date'(evt) {
-          evt.preventDefault();
-          this._deleteDate();
-          Popup.close();
-        },
-      },
-    ];
-  },
-});
+import { DatePicker } from '/client/lib/datepicker';

 Template.dateBadge.helpers({
  canModifyCard() {
@@ -279,7 +187,7 @@ class CardStartDate extends CardDate {
    // if dueAt or endAt exist & are > startAt, startAt doesn't need to be flagged
    if ((endAt && theDate.isAfter(endAt)) || (dueAt && theDate.isAfter(dueAt)))
      classes += 'long-overdue';
-    else if (theDate.isBefore(now, 'minute')) classes += 'almost-due';
+    else if (theDate.isAfter(now)) classes += '';
    else classes += 'current';
    return classes;
  }
@@ -446,3 +354,30 @@ class VoteEndDate extends CardDate {
  }
 }
 VoteEndDate.register('voteEndDate');
+
+class PokerEndDate extends CardDate {
+  onCreated() {
+    super.onCreated();
+    const self = this;
+    self.autorun(() => {
+      self.date.set(moment(self.data().getPokerEnd()));
+    });
+  }
+  classes() {
+    const classes = 'end-date' + ' ';
+    return classes;
+  }
+  showDate() {
+    return this.date.get().format('l LT');
+  }
+  showTitle() {
+    return `${TAPi18n.__('card-end-on')} ${this.date.get().format('LLLL')}`;
+  }
+
+  events() {
+    return super.events().concat({
+      'click .js-edit-date': Popup.open('editPokerEndDate'),
+    });
+  }
+}
+PokerEndDate.register('pokerEndDate');
@@ -3,5 +3,5 @@ template(name="descriptionForm")
  .new-description.js-new-description(
    class="{{#if descriptionFormIsOpen}}is-open{{/if}}")
    form.js-new-description-form
-      +editor(class="js-new-description-input" data-meteor-emoji-large="true" autofocus="autofocus")
+      +editor(class="js-new-description-input" autofocus="autofocus")
        | {{getUnsavedValue 'cardDescription' _id getDescription}}
@@ -3,6 +3,7 @@ const descriptionFormIsOpen = new ReactiveVar(false);
 BlazeComponent.extendComponent({
  onDestroyed() {
    descriptionFormIsOpen.set(false);
+    $('.note-popover').hide();
  },

  descriptionFormIsOpen() {
@@ -5,19 +5,18 @@ template(name="cardDetails")
        +editCardTitleForm
      else
        unless isMiniScreen
-          a.fa.fa-times-thin.close-card-details.js-close-card-details
+          a.fa.fa-times-thin.close-card-details.js-close-card-details(title="{{_ 'close-card'}}")
          if currentUser.isBoardMember
-            a.fa.fa-navicon.card-details-menu.js-open-card-details-menu
-            input.inline-input(type="text" id="cardURL_copy" value="{{ absoluteUrl }}")
+            a.fa.fa-navicon.card-details-menu.js-open-card-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
+            input.inline-input(type="text" id="cardURL_copy" value="{{ originRelativeUrl }}")
            a.fa.fa-link.card-copy-button.js-copy-link(
              class="fa-link"
              title="{{_ 'copy-card-link-to-clipboard'}}"
-              value="{{ absoluteUrl }}"
            )
        if isMiniScreen
-          a.fa.fa-times-thin.close-card-details-mobile-web.js-close-card-details
+          a.fa.fa-times-thin.close-card-details-mobile-web.js-close-card-details(title="{{_ 'close-card'}}")
          if currentUser.isBoardMember
-            a.fa.fa-navicon.card-details-menu-mobile-web.js-open-card-details-menu
+            a.fa.fa-navicon.card-details-menu-mobile-web.js-open-card-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}")
            a.fa.fa-link.card-copy-mobile-button
        h2.card-details-title.js-card-title(
          class="{{#if canModifyCard}}js-open-inlined-form is-editable{{/if}}")
@@ -111,15 +110,24 @@ template(name="cardDetails")
                a.card-label.add-label.js-end-date
                  i.fa.fa-plus

+      hr
+      if currentBoard.allowsCreator
+        .card-details-item.card-details-item-creator
+          h3.card-details-item-title
+            i.fa.fa-user
+            | {{_ 'creator'}}
+
+          +userAvatar(userId=userId noRemove=true)
+          | {{! XXX Hack to hide syntaxic coloration /// }}
+
      //.card-details-items
      if currentBoard.allowsMembers
-        hr
        .card-details-item.card-details-item-members
          h3.card-details-item-title
            i.fa.fa-users
            | {{_ 'members'}}
-          each getMembers
-            +userAvatar(userId=this cardId=../_id)
+          each userId in getMembers
+            +userAvatar(userId=userId cardId=_id)
            | {{! XXX Hack to hide syntaxic coloration /// }}
          if canModifyCard
            unless currentUser.isWorker
@@ -132,8 +140,8 @@ template(name="cardDetails")
          h3.card-details-item-title
            i.fa.fa-user
            | {{_ 'assignee'}}
-          each getAssignees
-            +userAvatarAssignee(userId=this cardId=../_id)
+          each userId in getAssignees
+            +userAvatar(userId=userId cardId=_id assignee=true)
            | {{! XXX Hack to hide syntaxic coloration /// }}
          if canModifyCard
            a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}")
@@ -235,6 +243,205 @@ template(name="cardDetails")
            i.fa.fa-thumbs-down
          | {{_ 'vote-against'}}

+    if getPokerQuestion
+      hr
+      .poker-title
+        div.flex
+          h3
+            i.fa.fa-thumbs-up
+            | {{_ 'poker-question'}}
+          if getPokerEnd
+            +pokerEndDate
+        div.flex
+          .poker-result
+            if expiredPoker
+              unless ($and currentBoard.isPublic pokerAllowNonBoardMembers )
+                .card-label.card-label-gray  {{ pokerCount }} {{_ 'r-of' }} {{ currentBoard.activeMembers.length }}
+      if showPlanningPokerButtons
+        .poker-result
+          .poker-deck
+            .poker-card
+              span.inner.js-poker.js-poker-vote-one(class="{{#if $eq pokerState 'one'}}poker-voted{{/if}}") {{_ 'poker-one'}}
+            if $eq pokerState "one"
+              i.fa.fa-check
+          .poker-deck
+            .poker-card
+              span.inner.js-poker.js-poker-vote-two(class="{{#if $eq pokerState 'two'}}poker-voted{{/if}}") {{_ 'poker-two'}}
+            if $eq pokerState "two"
+              i.fa.fa-check
+          .poker-deck
+            .poker-card
+              span.inner.js-poker.js-poker-vote-three(class="{{#if $eq pokerState 'three'}}poker-voted{{/if}}") {{_ 'poker-three'}}
+            if $eq pokerState "three"
+              i.fa.fa-check
+          .poker-deck
+            .poker-card
+              span.inner.js-poker.js-poker-vote-five(class="{{#if $eq pokerState 'five'}}poker-voted{{/if}}") {{_ 'poker-five'}}
+            if $eq pokerState "five"
+              i.fa.fa-check
+          .poker-deck
+            .poker-card
+              span.inner.js-poker.js-poker-vote-eight(class="{{#if $eq pokerState 'eight'}}poker-voted{{/if}}") {{_ 'poker-eight'}}
+            if $eq pokerState "eight"
+              i.fa.fa-check
+          .poker-deck
+            .poker-card
+              span.inner.js-poker.js-poker-vote-thirteen(class="{{#if $eq pokerState 'thirteen'}}poker-voted{{/if}}") {{_ 'poker-thirteen'}}
+            if $eq pokerState "thirteen"
+              i.fa.fa-check
+          .poker-deck
+            .poker-card
+              span.inner.js-poker.js-poker-vote-twenty(class="{{#if $eq pokerState 'twenty'}}poker-voted{{/if}}") {{_ 'poker-twenty'}}
+            if $eq pokerState "twenty"
+              i.fa.fa-check
+          .poker-deck
+            .poker-card
+              span.inner.js-poker.js-poker-vote-forty(class="{{#if $eq pokerState 'forty'}}poker-voted{{/if}}") {{_ 'poker-forty'}}
+            if $eq pokerState "forty"
+              i.fa.fa-check
+          .poker-deck
+            .poker-card
+              span.inner.js-poker.js-poker-vote-one-hundred(class="{{#if $eq pokerState 'oneHundred'}}poker-voted{{/if}}") {{_ 'poker-oneHundred'}}
+            if $eq pokerState "oneHundred"
+              i.fa.fa-check
+          .poker-deck
+            .poker-card
+              span.inner.js-poker.js-poker-vote-unsure(class="{{#if $eq pokerState 'unsure'}}poker-voted{{/if}}") {{_ 'poker-unsure'}}
+            if $eq pokerState "unsure"
+              i.fa.fa-check
+
+        if currentUser.isBoardAdmin
+          button.card-details-blue.js-poker-finish(class="{{#if $eq voteState false}}poker-voted{{/if}}") {{_ 'poker-finish'}}
+
+      if expiredPoker
+        .poker-table
+          .poker-table-side-left
+            .poker-table-heading-left
+              .poker-table-row
+                .poker-table-cell
+                .poker-table-cell
+                  | {{_ 'poker-result-votes' }}
+                .poker-table-cell.poker-table-cell-who
+                  | {{_ 'poker-result-who' }}
+            .poker-table-body
+              .poker-table-row
+                .poker-table-cell
+                  button.card-details-gray.js-poker.poker-card-result(class="{{#if $eq pokerWinner 1}}winner{{else}}loser{{/if}}") {{_ 'poker-one'}}
+                .poker-table-cell {{ pokerCountOne }}
+                .poker-table-cell.poker-table-cell-who
+                  .poker-result
+                      each m in pokerMemberOne
+                        a.name
+                          +userAvatar(userId=m._id noRemove=true)
+
+              .poker-table-row
+                .poker-table-cell
+                  button.card-details-gray.js-poker.poker-card-result(class="{{#if $eq pokerWinner 2}}winner{{else}}loser{{/if}}") {{_ 'poker-two'}}
+                .poker-table-cell {{ pokerCountTwo }}
+                .poker-table-cell.poker-table-cell-who
+                  .poker-result
+                      each m in pokerMemberTwo
+                        a.name
+                          +userAvatar(userId=m._id noRemove=true)
+
+              .poker-table-row
+                .poker-table-cell
+                  button.card-details-gray.js-poker.poker-card-result(class="{{#if $eq pokerWinner 3}}winner{{else}}loser{{/if}}") {{_ 'poker-three'}}
+                .poker-table-cell {{ pokerCountThree }}
+                .poker-table-cell.poker-table-cell-who
+                  .poker-result
+                      each m in pokerMemberThree
+                        a.name
+                          +userAvatar(userId=m._id noRemove=true)
+
+              .poker-table-row
+                .poker-table-cell
+                  button.card-details-gray.js-poker.poker-card-result(class="{{#if $eq pokerWinner 5}}winner{{else}}loser{{/if}}") {{_ 'poker-five'}}
+                .poker-table-cell {{ pokerCountFive }}
+                .poker-table-cell.poker-table-cell-who
+                  .poker-result
+                      each m in pokerMemberFive
+                        a.name
+                          +userAvatar(userId=m._id noRemove=true)
+
+              .poker-table-row
+                .poker-table-cell
+                  button.card-details-gray.js-poker.poker-card-result(class="{{#if $eq pokerWinner 8}}winner{{else}}loser{{/if}}") {{_ 'poker-eight'}}
+                .poker-table-cell {{ pokerCountEight }}
+                .poker-table-cell.poker-table-cell-who
+                  .poker-result
+                      each m in pokerMemberEight
+                        a.name
+                          +userAvatar(userId=m._id noRemove=true)
+
+          .poker-table-side-right
+            .poker-table-heading-right
+              .poker-table-row
+                .poker-table-cell
+                .poker-table-cell
+                  | {{_ 'poker-result-votes' }}
+                .poker-table-cell.poker-table-cell-who
+                  | {{_ 'poker-result-who' }}
+            .poker-table-body
+              .poker-table-row
+                .poker-table-cell
+                  button.card-details-gray.js-poker.poker-card-result(class="{{#if $eq pokerWinner 13}}winner{{else}}loser{{/if}}") {{_ 'poker-thirteen'}}
+                .poker-table-cell {{ pokerCountThirteen }}
+                .poker-table-cell.poker-table-cell-who
+                  .poker-result
+                      each m in pokerMemberThirteen
+                        a.name
+                          +userAvatar(userId=m._id noRemove=true)
+
+              .poker-table-row
+                .poker-table-cell
+                  button.card-details-gray.js-poker.poker-card-result(class="{{#if $eq pokerWinner 20}}winner{{else}}loser{{/if}}") {{_ 'poker-twenty'}}
+                .poker-table-cell {{ pokerCountTwenty }}
+                .poker-table-cell.poker-table-cell-who
+                  .poker-result
+                      each m in pokerMemberTwenty
+                        a.name
+                          +userAvatar(userId=m._id noRemove=true)
+
+              .poker-table-row
+                .poker-table-cell
+                  button.card-details-gray.js-poker.poker-card-result(class="{{#if $eq pokerWinner 40}}winner{{else}}loser{{/if}}") {{_ 'poker-forty'}}
+                .poker-table-cell {{ pokerCountForty }}
+                .poker-table-cell.poker-table-cell-who
+                  .poker-result
+                      each m in pokerMemberForty
+                        a.name
+                          +userAvatar(userId=m._id noRemove=true)
+
+              .poker-table-row
+                .poker-table-cell
+                  button.card-details-gray.js-poker.poker-card-result(class="{{#if $eq pokerWinner 100}}winner{{else}}loser{{/if}}") {{_ 'poker-oneHundred'}}
+                .poker-table-cell {{ pokerCountOneHundred }}
+                .poker-table-cell.poker-table-cell-who
+                  .poker-result
+                      each m in pokerMemberOneHundred
+                        a.name
+                          +userAvatar(userId=m._id noRemove=true)
+
+              .poker-table-row
+                .poker-table-cell
+                  button.card-details-gray.js-poker.poker-card-result(class="{{#if $eq pokerWinner 'unsure'}}winner{{else}}loser{{/if}}") {{_ 'poker-unsure'}}
+                .poker-table-cell {{ pokerCountUnsure }}
+                .poker-table-cell.poker-table-cell-who
+                  .poker-result
+                      each m in pokerMemberUnsure
+                        a.name
+                          +userAvatar(userId=m._id noRemove=true)
+
+        if currentUser.isBoardAdmin
+          div.estimation-add
+            button.card-details-red.js-poker-replay(class="{{#if $eq voteState false}}voted{{/if}}") {{_ 'poker-replay'}}
+          div.estimation-add
+            button.js-poker-estimation
+              i.fa.fa-plus
+              | {{_ 'set-estimation'}}
+            input(type=text,autofocus value=getPokerEstimation,id="pokerEstimation")
+
    //- XXX We should use "editable" to avoid repetiting ourselves
    if canModifyCard
      unless currentUser.isWorker
@@ -294,8 +501,8 @@ template(name="cardDetails")
          i.fa.fa-history
          | {{ _ 'activity'}}
        if currentUser.isBoardMember
-          .material-toggle-switch
-            span.toggle-switch-title {{_ 'hide-system-messages'}}
+          .material-toggle-switch(title="{{_ 'hide-system-messages'}}")
+            //span.toggle-switch-title
            if hiddenSystemMessages
              input.toggle-switch(type="checkbox" id="toggleButton" checked="checked")
            else
@@ -354,6 +561,10 @@ template(name="cardDetailsActionsPopup")
          a.js-start-voting
            i.fa.fa-thumbs-up
            | {{_ 'card-edit-voting'}}
+        li
+          a.js-start-planning-poker
+            i.fa.fa-thumbs-up
+            | {{_ 'card-edit-planning-poker'}}
        if currentUser.isBoardAdmin
          li
            a.js-custom-fields
@@ -489,23 +700,6 @@ template(name="cardAssigneesPopup")
          if currentUser.isCardAssignee
            i.fa.fa-check

-template(name="userAvatarAssignee")
-  a.assignee.js-assignee(title="{{userData.profile.fullname}} ({{userData.username}})")
-    if userData.profile.avatarUrl
-      img.avatar.avatar-image(src="{{userData.profile.avatarUrl}}")
-    else
-      +userAvatarAssigneeInitials(userId=userData._id)
-
-    if showStatus
-      span.assignee-presence-status(class=presenceStatusClassName)
-      span.member-type(class=memberType)
-
-    unless isSandstorm
-      if showEdit
-        if $eq currentUser._id userData._id
-          a.edit-avatar.js-change-avatar
-            i.fa.fa-pencil
-
 template(name="cardAssigneePopup")
  .board-assignee-menu
    .mini-profile-info
@@ -523,17 +717,13 @@ template(name="cardAssigneePopup")
          with currentUser
            li: a.js-edit-profile {{_ 'edit-profile'}}

-template(name="userAvatarAssigneeInitials")
-  svg.avatar.avatar-assignee-initials(viewBox="0 0 {{viewPortWidth}} 15")
-    text(x="50%" y="13" text-anchor="middle")= initials
-
 template(name="cardMorePopup")
  p.quiet
    span.clearfix
      span {{_ 'link-card'}}
      = ' '
      i.fa.colorful(class="{{#if board.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
-      input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}" autofocus="autofocus")
+      input.inline-input(type="text" id="cardURL" readonly value="{{ originRelativeUrl }}" autofocus="autofocus")
      button.js-copy-card-link-to-clipboard(class="btn" id="clipboard") {{_ 'copy-card-link-to-clipboard'}}
    span.clearfix
    br
@@ -634,3 +824,29 @@ template(name="negativeVoteMembersPopup")
          span.full-name
            = m.profile.fullname
            | (<span class="username">{{ m.username }}</span>)
+
+template(name="deletePokerPopup")
+  p {{_ "poker-delete-pop"}}
+  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
+
+template(name="cardStartPlanningPokerPopup")
+  form.edit-poker-question
+    .fields
+      .check-div
+        a.flex(class="{{#if getPokerQuestion}}is-disabled{{else}}js-toggle-poker-allow-non-members{{/if}}")
+          .materialCheckBox#poker-allow-non-members(name="poker-allow-non-members" class="{{#if pokerAllowNonBoardMembers}}is-checked{{/if}}")
+          span {{_ 'allowNonBoardMembers'}}
+      .check-div.flex
+        i.fa.fa-hourglass-end
+        a.js-end-date
+          span
+            | {{_ 'card-end'}}
+            unless getPokerEnd
+              i.fa.fa-plus
+        if getPokerEnd
+          +pokerEndDate
+
+    button.primary.js-submit {{_ 'save'}}
+    if getPokerQuestion
+      if currentUser.isBoardAdmin
+        button.js-remove-poker.negate.wide.right {{_ 'delete'}}
@@ -1,11 +1,18 @@
+import { DatePicker } from '/client/lib/datepicker';
+import Cards from '/models/cards';
+import Boards from '/models/boards';
+import Checklists from '/models/checklists';
+import Integrations from '/models/integrations';
+import Users from '/models/users';
+import Lists from '/models/lists';
+import CardComments from '/models/cardComments';
+import { ALLOWED_COLORS } from '/config/const';
+import moment from 'moment';
+import { UserAvatar } from '../users/userAvatar';
+
 const subManager = new SubsManager();
 const { calculateIndexData } = Utils;

-let cardColors;
-Meteor.startup(() => {
-  cardColors = Cards.simpleSchema()._schema.color.allowedValues;
-});
-
 BlazeComponent.extendComponent({
  mixins() {
    return [Mixins.InfiniteScrolling];
@@ -114,7 +121,7 @@ BlazeComponent.extendComponent({
    if (card) {
      const board = Boards.findOne(card.boardId);
      if (board) {
-        result = FlowRouter.url('card', {
+        result = FlowRouter.path('card', {
          boardId: card.boardId,
          slug: board.slug,
          cardId: card._id,
@@ -133,6 +140,15 @@ BlazeComponent.extendComponent({
    );
  },

+  showPlanningPokerButtons() {
+    const card = this.currentData();
+    return (
+      (currentUser.isBoardMember() ||
+        (currentUser && card.pokerAllowNonBoardMembers())) &&
+      !card.expiredPoker()
+    );
+  },
+
  onRendered() {
    if (Meteor.settings.public.CARD_OPENED_WEBHOOK_ENABLED) {
      // Send Webhook but not create Activities records ---
@@ -154,15 +170,13 @@ BlazeComponent.extendComponent({
      }).fetch();

      if (integrations.length > 0) {
-        integrations.forEach(integration => {
+        integrations.forEach((integration) => {
          Meteor.call(
            'outgoingWebhooks',
            integration,
            'CardSelected',
            params,
-            () => {
-              return;
-            },
+            () => {},
          );
        });
      }
@@ -290,7 +304,9 @@ BlazeComponent.extendComponent({
          Utils.goBoardId(this.data().boardId);
        },
        'click .js-copy-link'() {
-          StringToCopyElement = document.getElementById('cardURL_copy');
+          const StringToCopyElement = document.getElementById('cardURL_copy');
+          StringToCopyElement.value =
+            window.location.origin + window.location.pathname;
          StringToCopyElement.select();
          if (document.execCommand('copy')) {
            StringToCopyElement.blur();
@@ -320,9 +336,7 @@ BlazeComponent.extendComponent({
        },
        'submit .js-card-details-title'(event) {
          event.preventDefault();
-          const title = this.currentComponent()
-            .getValue()
-            .trim();
+          const title = this.currentComponent().getValue().trim();
          if (title) {
            this.data().setTitle(title);
          } else {
@@ -331,9 +345,7 @@ BlazeComponent.extendComponent({
        },
        'submit .js-card-details-assigner'(event) {
          event.preventDefault();
-          const assigner = this.currentComponent()
-            .getValue()
-            .trim();
+          const assigner = this.currentComponent().getValue().trim();
          if (assigner) {
            this.data().setAssignedBy(assigner);
          } else {
@@ -342,9 +354,7 @@ BlazeComponent.extendComponent({
        },
        'submit .js-card-details-requester'(event) {
          event.preventDefault();
-          const requester = this.currentComponent()
-            .getValue()
-            .trim();
+          const requester = this.currentComponent().getValue().trim();
          if (requester) {
            this.data().setRequestedBy(requester);
          } else {
@@ -400,127 +410,85 @@ BlazeComponent.extendComponent({
          }
          this.data().setVote(Meteor.userId(), newState);
        },
+        'click .js-poker'(e) {
+          let newState = null;
+          if ($(e.target).hasClass('js-poker-vote-one')) {
+            newState = 'one';
+            this.data().setPoker(Meteor.userId(), newState);
+          }
+          if ($(e.target).hasClass('js-poker-vote-two')) {
+            newState = 'two';
+            this.data().setPoker(Meteor.userId(), newState);
+          }
+          if ($(e.target).hasClass('js-poker-vote-three')) {
+            newState = 'three';
+            this.data().setPoker(Meteor.userId(), newState);
+          }
+          if ($(e.target).hasClass('js-poker-vote-five')) {
+            newState = 'five';
+            this.data().setPoker(Meteor.userId(), newState);
+          }
+          if ($(e.target).hasClass('js-poker-vote-eight')) {
+            newState = 'eight';
+            this.data().setPoker(Meteor.userId(), newState);
+          }
+          if ($(e.target).hasClass('js-poker-vote-thirteen')) {
+            newState = 'thirteen';
+            this.data().setPoker(Meteor.userId(), newState);
+          }
+          if ($(e.target).hasClass('js-poker-vote-twenty')) {
+            newState = 'twenty';
+            this.data().setPoker(Meteor.userId(), newState);
+          }
+          if ($(e.target).hasClass('js-poker-vote-forty')) {
+            newState = 'forty';
+            this.data().setPoker(Meteor.userId(), newState);
+          }
+          if ($(e.target).hasClass('js-poker-vote-one-hundred')) {
+            newState = 'oneHundred';
+            this.data().setPoker(Meteor.userId(), newState);
+          }
+          if ($(e.target).hasClass('js-poker-vote-unsure')) {
+            newState = 'unsure';
+            this.data().setPoker(Meteor.userId(), newState);
+          }
+        },
+        'click .js-poker-finish'(e) {
+          if ($(e.target).hasClass('js-poker-finish')) {
+            e.preventDefault();
+            const now = moment().format('YYYY-MM-DD HH:mm');
+            this.data().setPokerEnd(now);
+          }
+        },
+
+        'click .js-poker-replay'(e) {
+          if ($(e.target).hasClass('js-poker-replay')) {
+            e.preventDefault();
+            this.currentCard = this.currentData();
+            this.currentCard.replayPoker();
+            this.data().unsetPokerEnd();
+            this.data().unsetPokerEstimation();
+          }
+        },
+        'click .js-poker-estimation'(event) {
+          event.preventDefault();
+
+          const ruleTitle = this.find('#pokerEstimation').value;
+          if (ruleTitle !== undefined && ruleTitle !== '') {
+            this.find('#pokerEstimation').value = '';
+
+            if (ruleTitle) {
+              this.data().setPokerEstimation(parseInt(ruleTitle, 10));
+            } else {
+              this.data().setPokerEstimation('');
+            }
+          }
+        },
      },
    ];
  },
 }).register('cardDetails');

-Template.cardDetails.helpers({
-  userData() {
-    // We need to handle a special case for the search results provided by the
-    // `matteodem:easy-search` package. Since these results gets published in a
-    // separate collection, and not in the standard Meteor.Users collection as
-    // expected, we use a component parameter ("property") to distinguish the
-    // two cases.
-    const userCollection = this.esSearch ? ESSearchResults : Users;
-    return userCollection.findOne(this.userId, {
-      fields: {
-        profile: 1,
-        username: 1,
-      },
-    });
-  },
-
-  receivedSelected() {
-    if (this.getReceived().length === 0) {
-      return false;
-    } else {
-      return true;
-    }
-  },
-
-  startSelected() {
-    if (this.getStart().length === 0) {
-      return false;
-    } else {
-      return true;
-    }
-  },
-
-  endSelected() {
-    if (this.getEnd().length === 0) {
-      return false;
-    } else {
-      return true;
-    }
-  },
-
-  dueSelected() {
-    if (this.getDue().length === 0) {
-      return false;
-    } else {
-      return true;
-    }
-  },
-
-  memberSelected() {
-    if (this.getMembers().length === 0) {
-      return false;
-    } else {
-      return true;
-    }
-  },
-
-  labelSelected() {
-    if (this.getLabels().length === 0) {
-      return false;
-    } else {
-      return true;
-    }
-  },
-
-  assigneeSelected() {
-    if (this.getAssignees().length === 0) {
-      return false;
-    } else {
-      return true;
-    }
-  },
-
-  requestBySelected() {
-    if (this.getRequestBy().length === 0) {
-      return false;
-    } else {
-      return true;
-    }
-  },
-
-  assigneeBySelected() {
-    if (this.getAssigneeBy().length === 0) {
-      return false;
-    } else {
-      return true;
-    }
-  },
-
-  memberType() {
-    const user = Users.findOne(this.userId);
-    return user && user.isBoardAdmin() ? 'admin' : 'normal';
-  },
-
-  presenceStatusClassName() {
-    const user = Users.findOne(this.userId);
-    const userPresence = presences.findOne({ userId: this.userId });
-    if (user && user.isInvitedTo(Session.get('currentBoard'))) return 'pending';
-    else if (!userPresence) return 'disconnected';
-    else if (Session.equals('currentBoard', userPresence.state.currentBoardId))
-      return 'active';
-    else return 'idle';
-  },
-});
-
-Template.userAvatarAssigneeInitials.helpers({
-  initials() {
-    const user = Users.findOne(this.userId);
-    return user && user.getInitials();
-  },
-
-  viewPortWidth() {
-    const user = Users.findOne(this.userId);
-    return ((user && user.getInitials().length) || 1) * 12;
-  },
-});
-
 // We extends the normal InlinedForm component to support UnsavedEdits draft
 // feature.
 (class extends InlinedForm {
@@ -586,6 +554,7 @@ Template.cardDetailsActionsPopup.events({
  'click .js-labels': Popup.open('cardLabels'),
  'click .js-attachments': Popup.open('cardAttachments'),
  'click .js-start-voting': Popup.open('cardStartVoting'),
+  'click .js-start-planning-poker': Popup.open('cardStartPlanningPoker'),
  'click .js-custom-fields': Popup.open('cardCustomFields'),
  'click .js-received-date': Popup.open('editCardReceivedDate'),
  'click .js-start-date': Popup.open('editCardStartDate'),
@@ -601,7 +570,7 @@ Template.cardDetailsActionsPopup.events({
    const minOrder = _.min(
      this.list()
        .cards(this.swimlaneId)
-        .map(c => c.sort),
+        .map((c) => c.sort),
    );
    this.move(this.boardId, this.swimlaneId, this.listId, minOrder - 1);
  },
@@ -610,7 +579,7 @@ Template.cardDetailsActionsPopup.events({
    const maxOrder = _.max(
      this.list()
        .cards(this.swimlaneId)
-        .map(c => c.sort),
+        .map((c) => c.sort),
    );
    this.move(this.boardId, this.swimlaneId, this.listId, maxOrder + 1);
  },
@@ -629,7 +598,7 @@ Template.cardDetailsActionsPopup.events({
  },
 });

-Template.editCardTitleForm.onRendered(function() {
+Template.editCardTitleForm.onRendered(function () {
  autosize(this.$('.js-edit-card-title'));
 });

@@ -643,7 +612,7 @@ Template.editCardTitleForm.events({
  },
 });

-Template.editCardRequesterForm.onRendered(function() {
+Template.editCardRequesterForm.onRendered(function () {
  autosize(this.$('.js-edit-card-requester'));
 });

@@ -656,7 +625,7 @@ Template.editCardRequesterForm.events({
  },
 });

-Template.editCardAssignerForm.onRendered(function() {
+Template.editCardAssignerForm.onRendered(function () {
  autosize(this.$('.js-edit-card-assigner'));
 });

@@ -695,7 +664,7 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    const boards = Boards.find(
+    return Boards.find(
      {
        archived: false,
        'members.userId': Meteor.userId(),
@@ -705,7 +674,6 @@ BlazeComponent.extendComponent({
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
-    return boards;
  },

  swimlanes() {
@@ -734,7 +702,7 @@ Template.copyCardPopup.events({
  'click .js-done'() {
    const card = Cards.findOne(Session.get('currentCard'));
    const lSelect = $('.js-select-lists')[0];
-    listId = lSelect.options[lSelect.selectedIndex].value;
+    const listId = lSelect.options[lSelect.selectedIndex].value;
    const slSelect = $('.js-select-swimlanes')[0];
    const swimlaneId = slSelect.options[slSelect.selectedIndex].value;
    const bSelect = $('.js-select-boards')[0];
@@ -742,9 +710,7 @@ Template.copyCardPopup.events({
    const textarea = $('#copy-card-title');
    const title = textarea.val().trim();
    // insert new card to the bottom of new list
-    card.sort = Lists.findOne(card.listId)
-      .cards()
-      .count();
+    card.sort = Lists.findOne(card.listId).cards().count();

    if (title) {
      card.title = title;
@@ -775,9 +741,7 @@ Template.copyChecklistToManyCardsPopup.events({
    const textarea = $('#copy-card-title');
    const titleEntry = textarea.val().trim();
    // insert new card to the bottom of new list
-    card.sort = Lists.findOne(card.listId)
-      .cards()
-      .count();
+    card.sort = Lists.findOne(card.listId).cards().count();

    if (titleEntry) {
      const titleList = JSON.parse(titleEntry);
@@ -794,13 +758,13 @@ Template.copyChecklistToManyCardsPopup.events({
        Filter.addException(_id);

        // copy checklists
-        Checklists.find({ cardId: oldId }).forEach(ch => {
+        Checklists.find({ cardId: oldId }).forEach((ch) => {
          ch.copy(_id);
        });

        // copy subtasks
-        cursor = Cards.find({ parentId: oldId });
-        cursor.forEach(function() {
+        const cursor = Cards.find({ parentId: oldId });
+        cursor.forEach(function () {
          'use strict';
          const subtask = arguments[0];
          subtask.parentId = _id;
@@ -809,7 +773,7 @@ Template.copyChecklistToManyCardsPopup.events({
        });

        // copy card comments
-        CardComments.find({ cardId: oldId }).forEach(cmt => {
+        CardComments.find({ cardId: oldId }).forEach((cmt) => {
          cmt.copy(_id);
        });
      }
@@ -825,7 +789,7 @@ BlazeComponent.extendComponent({
  },

  colors() {
-    return cardColors.map(color => ({ color, name: '' }));
+    return ALLOWED_COLORS.map((color) => ({ color, name: '' }));
  },

  isSelected(color) {
@@ -869,7 +833,7 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    const boards = Boards.find(
+    return Boards.find(
      {
        archived: false,
        'members.userId': Meteor.userId(),
@@ -881,7 +845,6 @@ BlazeComponent.extendComponent({
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
-    return boards;
  },

  cards() {
@@ -949,7 +912,7 @@ BlazeComponent.extendComponent({
            }
          }
        },
-        'click .js-delete': Popup.afterConfirm('cardDelete', function() {
+        'click .js-delete': Popup.afterConfirm('cardDelete', function () {
          Popup.close();
          // verify that there are no linked cards
          if (Cards.find({ linkedId: this._id }).count() === 0) {
@@ -1056,6 +1019,8 @@ BlazeComponent.extendComponent({
            moment(new Date().setHours(12, 0, 0)).format('LT');

          const dateString = `${evt.target.date.value} ${time}`;
+
+          /*
          const newDate = moment(dateString, 'L LT', true);
          if (newDate.isValid()) {
            // if active vote -  store it
@@ -1066,6 +1031,159 @@ BlazeComponent.extendComponent({
              this.currentData().vote = { end: newDate.toDate() }; // set vote end temp
              Popup.back();
            }
+
+
+          */
+
+          // Try to parse different date formats of all languages.
+          // This code is same for vote and planning poker.
+          const usaDate = moment(dateString, 'L LT', true);
+          const euroAmDate = moment(dateString, 'DD.MM.YYYY LT', true);
+          const euro24hDate = moment(dateString, 'DD.MM.YYYY HH.mm', true);
+          const eurodotDate = moment(dateString, 'DD.MM.YYYY HH:mm', true);
+          const minusDate = moment(dateString, 'YYYY-MM-DD HH:mm', true);
+          const slashDate = moment(dateString, 'DD/MM/YYYY HH.mm', true);
+          const dotDate = moment(dateString, 'DD/MM/YYYY HH:mm', true);
+          const brezhonegDate = moment(dateString, 'DD/MM/YYYY h[e]mm A', true);
+          const hrvatskiDate = moment(dateString, 'DD. MM. YYYY H:mm', true);
+          const latviaDate = moment(dateString, 'YYYY.MM.DD. H:mm', true);
+          const nederlandsDate = moment(dateString, 'DD-MM-YYYY HH:mm', true);
+          // greekDate does not work: el Greek Ελληνικά ,
+          // it has date format DD/MM/YYYY h:mm MM like 20/06/2021 11:15 MM
+          // where MM is maybe some text like AM/PM ?
+          // Also some other languages that have non-ascii characters in dates
+          // do not work.
+          const greekDate = moment(dateString, 'DD/MM/YYYY h:mm A', true);
+          const macedonianDate = moment(dateString, 'D.MM.YYYY H:mm', true);
+
+          if (usaDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(usaDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: usaDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (euroAmDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(euroAmDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: euroAmDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (euro24hDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(euro24hDate.toDate());
+              this.card.setPokerEnd(euro24hDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: euro24hDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (eurodotDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(eurodotDate.toDate());
+              this.card.setPokerEnd(eurodotDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: eurodotDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (minusDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(minusDate.toDate());
+              this.card.setPokerEnd(minusDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: minusDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (slashDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(slashDate.toDate());
+              this.card.setPokerEnd(slashDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: slashDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (dotDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(dotDate.toDate());
+              this.card.setPokerEnd(dotDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: dotDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (brezhonegDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(brezhonegDate.toDate());
+              this.card.setPokerEnd(brezhonegDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: brezhonegDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (hrvatskiDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(hrvatskiDate.toDate());
+              this.card.setPokerEnd(hrvatskiDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: hrvatskiDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (latviaDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(latviaDate.toDate());
+              this.card.setPokerEnd(latviaDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: latviaDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (nederlandsDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(nederlandsDate.toDate());
+              this.card.setPokerEnd(nederlandsDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: nederlandsDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (greekDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(greekDate.toDate());
+              this.card.setPokerEnd(greekDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: greekDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (macedonianDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(macedonianDate.toDate());
+              this.card.setPokerEnd(macedonianDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: macedonianDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
          } else {
            this.error.set('invalid-date');
            evt.target.date.focus();
@@ -1087,6 +1205,277 @@ BlazeComponent.extendComponent({
  }
 }.register('editVoteEndDatePopup'));

+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentCard = this.currentData();
+    this.pokerQuestion = new ReactiveVar(this.currentCard.pokerQuestion);
+  },
+
+  events() {
+    return [
+      {
+        'click .js-end-date': Popup.open('editPokerEndDate'),
+        'submit .edit-poker-question'(evt) {
+          evt.preventDefault();
+          const pokerQuestion = true;
+          const allowNonBoardMembers = $('#poker-allow-non-members').hasClass(
+            'is-checked',
+          );
+          const endString = this.currentCard.getPokerEnd();
+
+          this.currentCard.setPokerQuestion(
+            pokerQuestion,
+            allowNonBoardMembers,
+          );
+          if (endString) {
+            this.currentCard.setPokerEnd(endString);
+          }
+          Popup.close();
+        },
+        'click .js-remove-poker': Popup.afterConfirm('deletePoker', (event) => {
+          event.preventDefault();
+          this.currentCard.unsetPoker();
+          Popup.close();
+        }),
+        'click a.js-toggle-poker-allow-non-members'(event) {
+          event.preventDefault();
+          $('#poker-allow-non-members').toggleClass('is-checked');
+        },
+      },
+    ];
+  },
+}).register('cardStartPlanningPokerPopup');
+
+// editPokerEndDatePopup
+(class extends DatePicker {
+  onCreated() {
+    super.onCreated(moment().format('YYYY-MM-DD HH:mm'));
+    this.data().getPokerEnd() &&
+      this.date.set(moment(this.data().getPokerEnd()));
+  }
+
+  /*
+  Tried to use dateFormat and timeFormat from client/components/lib/datepicker.js
+  to make detecting all date formats not necessary,
+  but got error "language mk does not exist".
+  Maybe client/components/lib/datepicker.jade could have hidden input field for
+  datepicker format that could be used to detect date format?
+
+  dateFormat() {
+    return moment.localeData().longDateFormat('L');
+  }
+
+  timeFormat() {
+    return moment.localeData().longDateFormat('LT');
+  }
+
+  const newDate = moment(dateString, dateformat() + ' ' + timeformat(), true);
+  */
+
+  events() {
+    return [
+      {
+        'submit .edit-date'(evt) {
+          evt.preventDefault();
+
+          // if no time was given, init with 12:00
+          const time =
+            evt.target.time.value ||
+            moment(new Date().setHours(12, 0, 0)).format('LT');
+
+          const dateString = `${evt.target.date.value} ${time}`;
+
+          /*
+          Tried to use dateFormat and timeFormat from client/components/lib/datepicker.js
+          to make detecting all date formats not necessary,
+          but got error "language mk does not exist".
+          Maybe client/components/lib/datepicker.jade could have hidden input field for
+          datepicker format that could be used to detect date format?
+
+          const newDate = moment(dateString, dateformat() + ' ' + timeformat(), true);
+
+          if (newDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(newDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: newDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          */
+
+          // Try to parse different date formats of all languages.
+          // This code is same for vote and planning poker.
+          const usaDate = moment(dateString, 'L LT', true);
+          const euroAmDate = moment(dateString, 'DD.MM.YYYY LT', true);
+          const euro24hDate = moment(dateString, 'DD.MM.YYYY HH.mm', true);
+          const eurodotDate = moment(dateString, 'DD.MM.YYYY HH:mm', true);
+          const minusDate = moment(dateString, 'YYYY-MM-DD HH:mm', true);
+          const slashDate = moment(dateString, 'DD/MM/YYYY HH.mm', true);
+          const dotDate = moment(dateString, 'DD/MM/YYYY HH:mm', true);
+          const brezhonegDate = moment(dateString, 'DD/MM/YYYY h[e]mm A', true);
+          const hrvatskiDate = moment(dateString, 'DD. MM. YYYY H:mm', true);
+          const latviaDate = moment(dateString, 'YYYY.MM.DD. H:mm', true);
+          const nederlandsDate = moment(dateString, 'DD-MM-YYYY HH:mm', true);
+          // greekDate does not work: el Greek Ελληνικά ,
+          // it has date format DD/MM/YYYY h:mm MM like 20/06/2021 11:15 MM
+          // where MM is maybe some text like AM/PM ?
+          // Also some other languages that have non-ascii characters in dates
+          // do not work.
+          const greekDate = moment(dateString, 'DD/MM/YYYY h:mm A', true);
+          const macedonianDate = moment(dateString, 'D.MM.YYYY H:mm', true);
+
+          if (usaDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(usaDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: usaDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (euroAmDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(euroAmDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: euroAmDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (euro24hDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(euro24hDate.toDate());
+              this.card.setPokerEnd(euro24hDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: euro24hDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (eurodotDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(eurodotDate.toDate());
+              this.card.setPokerEnd(eurodotDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: eurodotDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (minusDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(minusDate.toDate());
+              this.card.setPokerEnd(minusDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: minusDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (slashDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(slashDate.toDate());
+              this.card.setPokerEnd(slashDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: slashDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (dotDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(dotDate.toDate());
+              this.card.setPokerEnd(dotDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: dotDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (brezhonegDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(brezhonegDate.toDate());
+              this.card.setPokerEnd(brezhonegDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: brezhonegDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (hrvatskiDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(hrvatskiDate.toDate());
+              this.card.setPokerEnd(hrvatskiDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: hrvatskiDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (latviaDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(latviaDate.toDate());
+              this.card.setPokerEnd(latviaDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: latviaDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (nederlandsDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(nederlandsDate.toDate());
+              this.card.setPokerEnd(nederlandsDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: nederlandsDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (greekDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(greekDate.toDate());
+              this.card.setPokerEnd(greekDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: greekDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else if (macedonianDate.isValid()) {
+            // if active poker -  store it
+            if (this.currentData().getPokerQuestion()) {
+              this._storeDate(macedonianDate.toDate());
+              this.card.setPokerEnd(macedonianDate.toDate());
+              Popup.close();
+            } else {
+              this.currentData().poker = { end: macedonianDate.toDate() }; // set poker end temp
+              Popup.back();
+            }
+          } else {
+            // this.error.set('invalid-date);
+            this.error.set('invalid-date' + ' ' + dateString);
+            evt.target.date.focus();
+          }
+        },
+        'click .js-delete-date'(evt) {
+          evt.preventDefault();
+          this._deleteDate();
+          Popup.close();
+        },
+      },
+    ];
+  }
+  _storeDate(newDate) {
+    this.card.setPokerEnd(newDate);
+  }
+  _deleteDate() {
+    this.card.unsetPokerEnd();
+  }
+}.register('editPokerEndDatePopup'));
+
 // Close the card details pane by pressing escape
 EscapeActions.register(
  'detailsPane',
@@ -211,6 +211,7 @@ avatar-radius = 50%
        word-wrap: break-word
        max-width: 36%
        flex-grow: 1
+      &.card-details-item-creator,
      &.card-details-item-received,
      &.card-details-item-start,
      &.card-details-item-due,
@@ -356,3 +357,131 @@ card-details-color(background, color...)
  display: flex
 .js-show-positive-votes
  cursor: pointer
+
+.poker-voted
+  opacity: .7
+
+.poker-title
+  display: flex
+  justify-content: space-between
+
+  .js-edit-date
+    align-self: baseline
+    margin-left: 5px
+
+.poker-result
+  display: flex
+  flex-flow: row wrap
+.js-show-positive-poker-votes
+  cursor: pointer
+
+.poker-deck
+  display: grid
+  flex-direction: column
+  text-align: center
+
+.poker-card-result
+  width: 32px
+  font-size: 1em
+  font-weight: bold
+  padding: 4px 2px 4px 2px
+  cursor: default
+
+.winner
+  font-weight: bold
+  outline: #2d2d2d solid 2px
+
+.loser
+  opacity: .5
+
+.responsive-table
+  overflow-x: auto
+
+.poker-table
+  display: table
+  width: 100%
+  padding-top: 10px
+
+.poker-table-row
+  display: table-row
+
+.poker-table-heading
+  background-color: #EEE
+  display: table-header-group
+
+.poker-table-cell
+  display: table-cell
+  padding: 0 0 5px 2px
+  border-bottom: 1px solid #d2d0d0
+  text-align: center
+  min-width: 45px
+
+.poker-table-cell-who
+  width: 150px
+  vertical-align: middle
+
+.poker-table-heading-left,
+.poker-table-heading-right
+  display: table-header-group
+  font-weight: bold
+  border-top: 1px solid #808080
+
+@media (max-width: 400px)
+  .poker-table-heading-right
+    display: none
+
+.poker-table-body
+  display: table-row-group
+
+.poker-table-side-left,
+.poker-table-side-right
+  display: inline-block
+
+.poker-table-side-right
+  padding-left: 10px
+
+@media (max-width: 400px)
+  .poker-table-side-right
+    padding-left: 0px
+
+.estimation-add
+  display: block
+  overflow: auto
+  margin-top: 15px
+  margin-bottom: 5px
+  input
+    display: inline-block
+    float: right
+    margin: auto
+    margin-right: 10px
+    width: 100px
+  button
+    display: inline-block
+    float: right
+    margin: auto
+
+.poker-card
+  width:48px
+  height:72px
+  float:left
+  background:#fff
+  border-radius:5px
+  display:table
+  box-sizing:border-box
+  padding:5px
+  margin:3px
+  font-size:20px
+  font-weight: bold
+  text-shadow: #2d2d2d 1px 1px 0
+  box-shadow:0 0 5px #aaaaaa
+  text-align:center
+  position:relative
+  cursor: pointer
+
+  .inner
+    display:table-cell
+    vertical-align:middle
+    border-radius:5px
+    overflow:hidden
+    background-color: #cecece
+
@@ -4,8 +4,8 @@ template(name="checklists")
      i.fa.fa-check
      | {{_ 'checklists'}}
    if currentUser.isBoardMember
-      .material-toggle-switch
-        span.toggle-switch-title {{_ 'hide-checked-items'}}
+      .material-toggle-switch(title="{{_ 'hide-checked-items'}}")
+        //span.toggle-switch-title
        if hideCheckedItems
          input.toggle-switch(type="checkbox" id="toggleHideCheckedItemsButton" checked="checked")
        else
@@ -25,9 +25,8 @@ template(name="checklists")
    +inlinedForm(autoclose=false classNames="js-add-checklist" cardId = cardId)
      +addChecklistItemForm
    else
-      a.js-open-inlined-form
+      a.js-open-inlined-form(title="{{_ 'add-checklist'}}")
        i.fa.fa-plus
-        | {{_ 'add-checklist'}}...

 template(name="checklistDetail")
  .js-checklist.checklist
@@ -93,9 +92,8 @@ template(name="checklistItems")
      +inlinedForm(autoclose=false classNames="js-add-checklist-item" checklist = checklist)
        +addChecklistItemForm
      else
-        a.add-checklist-item.js-open-inlined-form
+        a.add-checklist-item.js-open-inlined-form(title="{{_ 'add-checklist-item'}}")
          i.fa.fa-plus
-          | {{_ 'add-checklist-item'}}...

 template(name='checklistItemDetail')
  .js-checklist-item.checklist-item(class="{{#if item.isFinished }}is-checked{{#if hideCheckedItems}} invisible{{/if}}{{/if}}")
@@ -111,7 +111,7 @@ BlazeComponent.extendComponent({
        title,
        checklistId: checklist._id,
        cardId: checklist.cardId,
-        sort: checklist.itemCount(),
+        sort: Utils.calculateIndexData(checklist.lastItem()).base,
      });
    }
    // We keep the form opened, empty it.
@@ -44,8 +44,8 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item

  span.fa.checklist-handle
    padding-right: 20px
-    padding-top: 6px
-    float: right
+    padding-top: 3px
+    float: left


 .js-confirm-checklist-delete
@@ -82,6 +82,9 @@ template(name="minicard")
                    +minicardCustomFieldDate
                else if $eq definition.type "checkbox"
                  .materialCheckBox(class="{{#if value }}is-checked{{/if}}")
+                else if $eq definition.type "stringtemplate"
+                  +viewer
+                    = formattedStringtemplateCustomFieldValue(definition)
                else
                  +viewer
                    = trueValue
@@ -90,13 +93,16 @@ template(name="minicard")
      .minicard-assignees.js-minicard-assignees
        each getAssignees
          +userAvatar(userId=this)
-        hr(class="assigneehr" title="{{_ 'assignee'}}")

    if getMembers
      .minicard-members.js-minicard-members
        each getMembers
          +userAvatar(userId=this)

+    if showCreator
+      .minicard-creator
+        +userAvatar(userId=this.userId noRemove=true)
+
    .badges
      unless currentUser.isNoComments
        if comments.count
@@ -115,6 +121,11 @@ template(name="minicard")
          span.badge-text {{ voteCountPositive }}
          span.badge-icon.fa.fa-thumbs-down(class="{{#if $eq voteState false}}text-red{{/if}}")
          span.badge-text {{ voteCountNegative }}
+      if getPokerQuestion
+        .badge.badge-state-image-only(title=getPokerQuestion)
+          span.badge-icon.fa.fa-check(class="{{#if pokerState}}text-green{{/if}}")
+          if expiredPoker
+            span.badge-text {{ getPokerEstimation }}
      if attachments.count
        .badge
          span.badge-icon.fa.fa-paperclip
@@ -123,3 +134,8 @@ template(name="minicard")
        .badge(class="{{#if checklistFinished}}is-finished{{/if}}")
          span.badge-icon.fa.fa-check-square-o
          span.badge-text.check-list-text {{checklistFinishedCount}}/{{checklistItemCount}}
+      if allSubtasks.count
+        .badge
+          span.badge-icon.fa.fa-sitemap
+          span.badge-text.check-list-text {{subtasksFinishedCount}}/{{allSubtasksCount}}
+          //{{subtasksFinishedCount}}/{{subtasksCount}} does not work because when a subtaks is archived, the count goes down
@@ -21,6 +21,34 @@ BlazeComponent.extendComponent({
    }).format(customFieldTrueValue);
  },

+  formattedStringtemplateCustomFieldValue(definition) {
+    const customField = this.data()
+      .customFieldsWD()
+      .find(f => f._id === definition._id);
+
+    const customFieldTrueValue =
+      customField && customField.trueValue ? customField.trueValue : [];
+
+    return customFieldTrueValue
+      .filter(value => !!value.trim())
+      .map(value =>
+        definition.settings.stringtemplateFormat.replace(/%\{value\}/gi, value),
+      )
+      .join(definition.settings.stringtemplateSeparator ?? '');
+  },
+
+  showCreator() {
+    if (this.data().board()) {
+      return (
+        this.data().board.allowsCreator === null ||
+        this.data().board().allowsCreator === undefined ||
+        this.data().board().allowsCreator
+      );
+      // return this.data().board().allowsCreator;
+    }
+    return false;
+  },
+
  events() {
    return [
      {
@@ -89,7 +89,7 @@
      border-radius: 2px
      margin-right: 3px
      margin-bottom: 3px
-      
+
  .minicard-custom-fields
    display:block;
  .minicard-custom-field
@@ -163,19 +163,18 @@
        line-height: 12px

  .minicard-members,
-  .minicard-assignees
+  .minicard-assignees,
+  .minicard-creator
    float: right
    margin-left: 5px
-
-    .assigneehr
-      border-top: 1px solid red
-      margin-bottom: 4px
+    margin-bottom: 4px

    .member
      float: right
      border-radius: 50%
      height: 28px
      width: @height
+      margin-bottom: 4px

    .assignee
      float: right
@@ -186,6 +185,12 @@
    + .badges
      margin-top: 5px

+  .minicard-assignees
+    border-bottom: 1px solid red
+
+  .minicard-creator
+    border-bottom: 1px solid green
+
  .minicard-members:empty,
  .minicard-assignees:empty
    display: none
@@ -1,23 +1,44 @@
 template(name="resultCard")
  .result-card-wrapper
-    a.minicard-wrapper.card-title(href=absoluteUrl)
+    a.minicard-wrapper.card-title(href=originRelativeUrl)
      +minicard(this)
      //= card.title
    ul.result-card-context-list
      li.result-card-context(title="{{_ 'board'}}")
-        +viewer
-          = getBoard.title
+        .result-card-block-wrapper
+          if boardId
+            +viewer
+              = getBoard.title
+          else
+            .broken-cards-null
+              | NULL
+        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
+          if swimlaneId
+            +viewer
+              = getSwimlane.title
+          else
+            .broken-cards-null
+              | NULL
+        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
+          if listId
+            +viewer
+              = getList.title
+          else
+            .broken-cards-null
+              | NULL
+        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
@@ -15,9 +15,8 @@ template(name="subtasks")
    +inlinedForm(autoclose=false classNames="js-add-subtask" cardId = cardId)
      +addSubtaskItemForm
    else
-      a.js-open-inlined-form
+      a.js-open-inlined-form(title="{{_ 'add-subtask'}}")
        i.fa.fa-plus
-        | {{_ 'add-subtask'}}...

 template(name="subtaskDetail")
  .js-subtasks.subtask
@@ -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
@@ -180,7 +180,8 @@
    border-bottom: 1px solid darken(white, 20%)

  .list
-    display: block
+    display: contents
+    flex-basis: auto
    width: 100%
    border-left: 0px
    &:first-child
@@ -5,7 +5,7 @@ template(name="listBody")
        +inlinedForm(autoclose=false position="top")
          +addCardForm(listId=_id position="top")
      each (cardsWithLimit (idOrNull ../../_id))
-        a.minicard-wrapper.js-minicard(href=absoluteUrl
+        a.minicard-wrapper.js-minicard(href=originRelativeUrl
          class="{{#if cardIsSelected}}is-selected{{/if}}"
          class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
          if MultiSelection.isActive
@@ -19,9 +19,8 @@ template(name="listBody")
        +inlinedForm(autoclose=false position="bottom")
          +addCardForm(listId=_id position="bottom")
        else
-          a.open-minicard-composer.js-card-composer.js-open-inlined-form
+          a.open-minicard-composer.js-card-composer.js-open-inlined-form(title="{{_ 'add-card-to-bottom-of-list'}}")
            i.fa.fa-plus
-            | {{_ 'add-card'}}

 template(name="spinnerList")
  .sk-spinner.sk-spinner-wave.sk-spinner-list(
@@ -168,13 +168,16 @@ BlazeComponent.extendComponent({

  cardsWithLimit(swimlaneId) {
    const limit = this.cardlimit.get();
+    const defaultSort = { sort: 1 };
+    const sortBy = Session.get('sortBy') ? Session.get('sortBy') : defaultSort;
    const selector = {
      listId: this.currentData()._id,
      archived: false,
    };
    if (swimlaneId) selector.swimlaneId = swimlaneId;
    return Cards.find(Filter.mongoSelector(selector), {
-      sort: ['sort'],
+      // sort: ['sort'],
+      sort: sortBy,
      limit,
    });
  },
@@ -28,8 +28,8 @@ template(name="listHeader")
          div.list-header-menu
            unless currentUser.isCommentOnly
              if canSeeAddCard
-                a.js-add-card.fa.fa-plus.list-header-plus-icon
-              a.fa.fa-navicon.js-open-list-menu
+                a.js-add-card.fa.fa-plus.list-header-plus-icon(title="{{_ 'add-card-to-top-of-list'}}")
+              a.fa.fa-navicon.js-open-list-menu(title="{{_ 'listActionPopup-title'}}")
        else
          a.list-header-menu-icon.fa.fa-angle-right.js-select-list
          a.list-header-handle.handle.fa.fa-arrows.js-list-handle
@@ -41,8 +41,8 @@ template(name="listHeader")
            //if isBoardAdmin
            //  a.fa.js-list-star.list-header-plus-icon(class="fa-star{{#unless starred}}-o{{/unless}}")
            if canSeeAddCard
-              a.js-add-card.fa.fa-plus.list-header-plus-icon
-            a.fa.fa-navicon.js-open-list-menu
+              a.js-add-card.fa.fa-plus.list-header-plus-icon(title="{{_ 'add-card-to-top-of-list'}}")
+            a.fa.fa-navicon.js-open-list-menu(title="{{_ 'listActionPopup-title'}}")
          if currentUser.isBoardAdmin
            if showDesktopDragHandles
              a.list-header-handle.handle.fa.fa-arrows.js-list-handle
@@ -82,7 +82,7 @@ BlazeComponent.extendComponent({

  showCardsCountForList(count) {
    const limit = this.limitToShowCardsCount();
-    return limit > 0 && count > limit;
+    return limit >= 0 && count >= limit;
  },

  events() {
@@ -3,39 +3,15 @@ template(name="brokenCardsHeaderBar")
    | {{_ 'broken-cards'}}

 template(name="brokenCards")
-  .wrapper
-    .broken-cards-wrapper
-      each card in brokenCardsList
-        .broken-cards-card-wrapper
-          .broken-cards-card-title
-            = card.title
-          ul.broken-cards-context-list
-            li.broken-cards-context(title="{{_ 'board'}}")
-              if card.boardId
-                +viewer
-                  = card.getBoard.title
-              else
-                .broken-cards-null
-                  | NULL
-            li.broken-cards-context.broken-cards-context-separator
-              = ' '
-              | {{_ 'context-separator'}}
-              = ' '
-            li.broken-cards-context(title="{{_ 'swimlane'}}")
-              if card.swimlaneId
-                +viewer
-                  = card.getSwimlane.title
-              else
-                .broken-cards-null
-                  | NULL
-            li.broken-cards-context
-              = ' '
-              | {{_ 'context-separator'}}
-              = ' '
-            li.broken-cards-context(title="{{_ 'list'}}")
-              if card.listId
-                +viewer
-                  = card.getList.title
-              else
-                .broken-cards-null
-                  | NULL
+  if currentUser
+    if searching.get
+      +spinner
+    else if hasResults.get
+      .global-search-results-list-wrapper
+        if hasQueryErrors.get
+          div
+            each msg in errorMessages
+              span.global-search-error-messages
+                = msg
+        else
+          +resultsPaged(this)
@@ -1,3 +1,5 @@
+import { CardSearchPagedComponent } from '../../lib/cardSearch';
+
 BlazeComponent.extendComponent({}).register('brokenCardsHeaderBar');

 Template.brokenCards.helpers({
@@ -6,23 +8,11 @@ Template.brokenCards.helpers({
  },
 });

-BlazeComponent.extendComponent({
+class BrokenCardsComponent extends CardSearchPagedComponent {
  onCreated() {
-    Meteor.subscribe('setting');
-    Meteor.subscribe('brokenCards');
-  },
+    super.onCreated();

-  brokenCardsList() {
-    const selector = {
-      $or: [
-        { boardId: { $in: [null, ''] } },
-        { swimlaneId: { $in: [null, ''] } },
-        { listId: { $in: [null, ''] } },
-        { permission: 'public' },
-        { members: { $elemMatch: { userId: user._id, isActive: true } } },
-      ],
-    };
-
-    return Cards.find(selector);
-  },
-}).register('brokenCards');
+    Meteor.subscribe('brokenCards', this.sessionId);
+  }
+}
+BrokenCardsComponent.register('brokenCards');
@@ -22,13 +22,17 @@ template(name="dueCardsModalTitle")

 template(name="dueCards")
  if currentUser
-    if isPageReady.get
-      .wrapper
-        .due-cards-dueat-list-wrapper
-          each card in dueCardsList
-            +resultCard(card)
-    else
+    if searching.get
      +spinner
+    else if hasResults.get
+      .global-search-results-list-wrapper
+        if hasQueryErrors.get
+          div
+            each msg in errorMessages
+              span.global-search-error-messages
+                = msg
+        else
+          +resultsPaged(this)

 template(name="dueCardsViewChangePopup")
  if currentUser
@@ -1,4 +1,14 @@
-const subManager = new SubsManager();
+import { CardSearchPagedComponent } from '../../lib/cardSearch';
+import {
+  OPERATOR_HAS,
+  OPERATOR_SORT,
+  OPERATOR_USER,
+  ORDER_ASCENDING,
+  PREDICATE_DUE_AT,
+} from '../../../config/search-const';
+import { QueryParams } from '../../../config/query-classes';
+
+// const subManager = new SubsManager();

 BlazeComponent.extendComponent({
  dueCardsView() {
@@ -40,106 +50,51 @@ BlazeComponent.extendComponent({
  },
 }).register('dueCardsViewChangePopup');

-BlazeComponent.extendComponent({
+class DueCardsComponent extends CardSearchPagedComponent {
  onCreated() {
-    this.isPageReady = new ReactiveVar(false);
+    super.onCreated();

-    this.autorun(() => {
-      const handle = subManager.subscribe(
-        'dueCards',
-        Utils.dueCardsView() === 'all',
-      );
-      Tracker.nonreactive(() => {
-        Tracker.autorun(() => {
-          this.isPageReady.set(handle.ready());
-        });
-      });
+    const queryParams = new QueryParams();
+    queryParams.addPredicate(OPERATOR_HAS, {
+      field: PREDICATE_DUE_AT,
+      exists: true,
    });
-    Meteor.subscribe('setting');
-  },
+    // queryParams[OPERATOR_LIMIT] = 5;
+    queryParams.addPredicate(OPERATOR_SORT, {
+      name: PREDICATE_DUE_AT,
+      order: ORDER_ASCENDING,
+    });
+
+    if (Utils.dueCardsView() !== 'all') {
+      queryParams.addPredicate(OPERATOR_USER, Meteor.user().username);
+    }
+
+    this.runGlobalSearch(queryParams);
+  }

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

  sortByBoard() {
    return this.dueCardsView() === 'board';
-  },
+  }

  dueCardsList() {
-    const allUsers = Utils.dueCardsView() === 'all';
-
-    const user = Meteor.user();
-
-    const archivedBoards = [];
-    Boards.find({ archived: true }).forEach(board => {
-      archivedBoards.push(board._id);
-    });
-
-    const permiitedBoards = [];
-    let selector = {
-      archived: false,
-    };
-    // for every user including admin allow her to see cards only from public boards
-    // or those where she is a member
-    //if (!user.isAdmin) {
-    selector.$or = [
-      { permission: 'public' },
-      { members: { $elemMatch: { userId: user._id, isActive: true } } },
-    ];
-    //}
-    Boards.find(selector).forEach(board => {
-      permiitedBoards.push(board._id);
-    });
-
-    const archivedSwimlanes = [];
-    Swimlanes.find({ archived: true }).forEach(swimlane => {
-      archivedSwimlanes.push(swimlane._id);
-    });
-
-    const archivedLists = [];
-    Lists.find({ archived: true }).forEach(list => {
-      archivedLists.push(list._id);
-    });
-
-    selector = {
-      archived: false,
-      boardId: {
-        $nin: archivedBoards,
-        $in: permiitedBoards,
-      },
-      swimlaneId: { $nin: archivedSwimlanes },
-      listId: { $nin: archivedLists },
-      dueAt: { $ne: null },
-      endAt: null,
-    };
-
-    if (!allUsers) {
-      selector.$or = [{ members: user._id }, { assignees: user._id }];
+    const results = this.getResults();
+    console.log('results:', results);
+    const cards = [];
+    if (results) {
+      results.forEach(card => {
+        cards.push(card);
+      });
    }

-    const cards = [];
-
-    // eslint-disable-next-line no-console
-    // console.log('cards selector:', selector);
-    Cards.find(selector).forEach(card => {
-      cards.push(card);
-      // eslint-disable-next-line no-console
-      // console.log(
-      //   'board:',
-      //   card.board(),
-      //   'swimlane:',
-      //   card.swimlane(),
-      //   'list:',
-      //   card.list(),
-      // );
-    });
-
    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;
+      const x = a.dueAt === null ? new Date('2100-12-31') : a.dueAt;
+      const y = b.dueAt === null ? new Date('2100-12-31') : b.dueAt;

      if (x > y) return 1;
      else if (x < y) return -1;
@@ -148,7 +103,9 @@ BlazeComponent.extendComponent({
    });

    // eslint-disable-next-line no-console
-    // console.log('cards:', cards);
+    console.log('cards:', cards);
    return cards;
-  },
-}).register('dueCards');
+  }
+}
+
+DueCardsComponent.register('dueCards');
@@ -49,7 +49,7 @@ Template.editor.onRendered(() => {
          ['para', ['ul', 'ol', 'paragraph']],
          ['table', ['table']],
          //['insert', ['link', 'picture', 'video']], // iframe tag will be sanitized TODO if iframe[class=note-video-clip] can be added into safe list, insert video can be enabled
-          //['insert', ['link', 'picture']], // modal popup has issue somehow :(
+          ['insert', ['link']], //, 'picture']], // modal popup has issue somehow :(
          ['view', ['fullscreen', 'help']],
        ];
    const cleanPastedHTML = function(input) {
@@ -145,6 +145,7 @@ Template.editor.onRendered(() => {
                const MAX_IMAGE_PIXEL = Utils.MAX_IMAGE_PIXEL;
                const COMPRESS_RATIO = Utils.IMAGE_COMPRESS_RATIO;
                const insertImage = src => {
+                  // process all image upload types to the description/comment window
                  const img = document.createElement('img');
                  img.src = src;
                  img.setAttribute('width', '100%');
@@ -210,7 +211,16 @@ Template.editor.onRendered(() => {
                }
              }
            },
-            onPaste() {
+            onPaste(e) {
+              var clipboardData = e.clipboardData;
+              var pastedData = clipboardData.getData('Text');
+
+              //if pasted data is an image, exit
+              if (!pastedData.length) {
+                e.preventDefault();
+                return;
+              }
+
              // clear up unwanted tag info when user pasted in text
              const thisNote = this;
              const updatePastedText = function(object) {
@@ -219,7 +229,7 @@ Template.editor.onRendered(() => {
                // (and multiplies by pasting more) by changing paste "p" to "br".
                // Fixes https://github.com/wekan/wekan/2890 .
                // == Fix Start ==
-                someNote.execCommand('defaultParagraphSeparator', false, 'br');
+                //someNote.execCommand('defaultParagraphSeparator', false, 'br');
                // == Fix End ==
                const original = someNote.summernote('code');
                const cleaned = cleanPastedHTML(original); //this is where to call whatever clean function you want. I have mine in a different file, called CleanPastedHTML.
@@ -234,17 +244,17 @@ Template.editor.onRendered(() => {
            },
          },
          dialogsInBody: true,
-          disableDragAndDrop: true,
+          spellCheck: true,
+          disableGrammar: false,
+          disableDragAndDrop: false,
          toolbar,
          popover: {
            image: [
-              [
-                'image',
-                ['resizeFull', 'resizeHalf', 'resizeQuarter', 'resizeNone'],
-              ],
+              ['imagesize', ['imageSize100', 'imageSize50', 'imageSize25']],
              ['float', ['floatLeft', 'floatRight', 'floatNone']],
              ['remove', ['removeMedia']],
            ],
+            link: [['link', ['linkDialogShow', 'unlink']]],
            table: [
              ['add', ['addRowDown', 'addRowUp', 'addColLeft', 'addColRight']],
              ['delete', ['deleteRow', 'deleteCol', 'deleteTable']],
@@ -263,10 +273,12 @@ Template.editor.onRendered(() => {
  }
 });

-import sanitizeXss from 'xss';
+import DOMPurify from 'dompurify';

 // Additional  safeAttrValue function to allow for other specific protocols
 // See https://github.com/leizongmin/js-xss/issues/52#issuecomment-241354114
+
+/*
 function mySafeAttrValue(tag, name, value, cssFilter) {
  // only when the tag is 'a' and attribute is 'href'
  // then use your custom function
@@ -278,6 +290,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;
@@ -290,6 +304,7 @@ function mySafeAttrValue(tag, name, value, cssFilter) {
    return sanitizeXss.safeAttrValue(tag, name, value, cssFilter);
  }
 }
+*/

 // XXX I believe we should compute a HTML rendered field on the server that
 // would handle markdown and user mentions. We can simply have two
@@ -305,7 +320,9 @@ Blaze.Template.registerHelper(
    let content = Blaze.toHTML(view.templateContentBlock);
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
    if (!currentBoard)
-      return HTML.Raw(sanitizeXss(content, { safeAttrValue: mySafeAttrValue }));
+      return HTML.Raw(
+        DOMPurify.sanitize(content, { ALLOW_UNKNOWN_PROTOCOLS: true }),
+      );
    const knowedUsers = currentBoard.members.map(member => {
      const u = Users.findOne(member.userId);
      if (u) {
@@ -349,7 +366,9 @@ Blaze.Template.registerHelper(
      content = content.replace(fullMention, Blaze.toHTML(link));
    }

-    return HTML.Raw(sanitizeXss(content, { safeAttrValue: mySafeAttrValue }));
+    return HTML.Raw(
+      DOMPurify.sanitize(content, { ALLOW_UNKNOWN_PROTOCOLS: true }),
+    );
  }),
 );

@@ -10,11 +10,30 @@ template(name="globalSearchModalTitle")
      i.fa.fa-keyboard-o
      | {{_ 'globalSearch-title'}}

+template(name="resultsPaged")
+  if resultsHeading.get
+    h1
+      = resultsHeading.get
+      a.fa.fa-link(title="{{_ 'link-to-search' }}" href="{{ getSearchHref }}")
+  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' }}
+
 template(name="globalSearch")
  if currentUser
    .wrapper
-      form.global-search-instructions.js-search-query-form
+      form.global-search-page.js-search-query-form
        input.global-search-query-input(
+          style="{# if hasResults.get #}display: inline-block;{#/if#}"
          id="global-search-input"
          type="text"
          name="searchQuery"
@@ -22,63 +41,46 @@ template(name="globalSearch")
          value="{{ query.get }}"
          autofocus dir="auto"
        )
+        a.js-new-search.fa.fa-eraser
      if searching.get
        +spinner
      else if hasResults.get
        .global-search-results-list-wrapper
          if hasQueryErrors.get
-            div
+            ul
              each msg in errorMessages
-                span.global-search-error-messages
-                  | {{_ msg.tag msg.value }}
-          else
-            h1
-              = resultsHeading.get
-              a.fa.fa-link(title="{{_ 'link-to-search' }}" href="{{ getSearchHref }}")
-            each card in results
-              +resultCard(card)
+                li.global-search-error-messages
+                  = msg
+          +resultsPaged(this)
+      else if serverError.get
+        .global-search-page
+          .global-search-help
+            h1 {{_ 'server-error' }}
+            +viewer
+              | {{_ 'server-error-troubleshooting' }}
      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' }}
+        .global-search-page
+          .global-search-help
+            h2 {{_ 'boards' }}
            .lists-wrapper
-              each name in myLabelNames.get
-                span.card-label.list-title.js-label-name
-                  = name
-          +viewer
-            = searchInstructions
-
-template(name="globalSearchViewChangePopup")
-  if currentUser
-    ul.pop-over-list
-      li
-        with "globalSearchViewChange-choice-me"
-          a.js-global-search-view-me
-            i.fa.fa-user.colorful
-            | {{_ 'globalSearchViewChange-choice-me'}}
-            if $eq Utils.globalSearchView "me"
-              i.fa.fa-check
-      li
-        with "globalSearchViewChange-choice-all"
-          a.js-global-search-view-all
-            i.fa.fa-users.colorful
-            | {{_ 'globalSearchViewChange-choice-all'}}
-            span.sub-name
-              +viewer
-                | {{_ 'globalSearchViewChange-choice-all-description' }}
-            if $eq Utils.globalSearchView "all"
-              i.fa.fa-check
+              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
+          .global-search-instructions
+            +viewer
+              = searchInstructions
@@ -1,4 +1,8 @@
-const subManager = new SubsManager();
+import { CardSearchPagedComponent } from '../../lib/cardSearch';
+import Boards from '../../../models/boards';
+import { Query, QueryErrors } from '../../../config/query-classes';
+
+// const subManager = new SubsManager();

 BlazeComponent.extendComponent({
  events() {
@@ -16,48 +20,14 @@ Template.globalSearch.helpers({
  },
 });

-BlazeComponent.extendComponent({
-  events() {
-    return [
-      {
-        'click .js-due-cards-view-me'() {
-          Utils.setDueCardsView('me');
-          Popup.close();
-        },
-
-        'click .js-due-cards-view-all'() {
-          Utils.setDueCardsView('all');
-          Popup.close();
-        },
-      },
-    ];
-  },
-}).register('globalSearchViewChangePopup');
-
-BlazeComponent.extendComponent({
+class GlobalSearchComponent extends CardSearchPagedComponent {
  onCreated() {
-    this.searching = new ReactiveVar(false);
-    this.hasResults = new ReactiveVar(false);
-    this.hasQueryErrors = new ReactiveVar(false);
-    this.query = new ReactiveVar('');
-    this.resultsHeading = new ReactiveVar('');
-    this.searchLink = new ReactiveVar(null);
+    super.onCreated();
    this.myLists = new ReactiveVar([]);
    this.myLabelNames = new ReactiveVar([]);
    this.myBoardNames = new ReactiveVar([]);
+    this.parsingErrors = new QueryErrors();
    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);

    Meteor.call('myLists', (err, data) => {
      if (!err) {
@@ -76,293 +46,75 @@ BlazeComponent.extendComponent({
        this.myBoardNames.set(data);
      }
    });
+  }

+  onRendered() {
    Meteor.subscribe('setting');
+
+    // eslint-disable-next-line no-console
+    //console.log('lang:', TAPi18n.getLanguage());
+
    if (Session.get('globalQuery')) {
      this.searchAllBoards(Session.get('globalQuery'));
    }
-  },
+  }

  resetSearch() {
-    this.searching.set(false);
-    this.hasResults.set(false);
-    this.hasQueryErrors.set(false);
-    this.resultsHeading.set('');
-    this.parsingErrors = [];
-    this.resultsCount = 0;
-    this.totalHits = 0;
-    this.queryErrors = null;
-  },
-
-  results() {
-    // eslint-disable-next-line no-console
-    // console.log('getting results');
-    if (this.queryParams) {
-      const results = Cards.globalSearch(this.queryParams);
-      this.queryErrors = results.errors;
-      // eslint-disable-next-line no-console
-      // console.log('errors:', this.queryErrors);
-      if (this.errorMessages().length) {
-        this.hasQueryErrors.set(true);
-        return null;
-      }
-
-      if (results.cards) {
-        const sessionData = SessionData.findOne({ userId: Meteor.userId() });
-        this.totalHits = sessionData.totalHits;
-        this.resultsCount = results.cards.count();
-        this.resultsHeading.set(this.getResultsHeading());
-        return results.cards;
-      }
-    }
-    this.resultsCount = 0;
-    return [];
-  },
+    super.resetSearch();
+    this.parsingErrors = new QueryErrors();
+  }

  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 = Object.entries(this.colorMap)
-          .filter(value => value[1] === label)
-          .map(value => value[0]);
-        if (color.length) {
-          messages.push({
-            tag: 'label-color-not-found',
-            value: color[0],
-          });
-        } 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.hasErrors()) {
+      return this.parsingErrors.errorMessages();
    }
+    return this.queryErrorMessages();
+  }

-    if (this.parsingErrors.length) {
-      this.parsingErrors.forEach(err => {
-        messages.push(err);
-      });
-    }
+  parsingErrorMessages() {
+    this.parsingErrors.errorMessages();
+  }

-    return messages;
-  },
+  searchAllBoards(queryText) {
+    queryText = queryText.trim();
+    // eslint-disable-next-line no-console
+    //console.log('queryText:', queryText);

-  searchAllBoards(query) {
-    query = query.trim();
-    this.query.set(query);
+    this.query.set(queryText);

    this.resetSearch();

-    if (!query) {
+    if (!queryText) {
      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 = /^((?<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-is': 'is',
-      'operator-due': 'dueAt',
-      'operator-created': 'createdAt',
-      'operator-modified': 'modifiedAt',
-    };
-
-    const operatorMap = {};
-    for (const op in operators) {
-      operatorMap[TAPi18n.__(op).toLowerCase()] = operators[op];
-    }
+    const query = new Query();
+    query.buildParams(queryText);

    // eslint-disable-next-line no-console
-    console.log('operatorMap:', operatorMap);
-    const params = {
-      boards: [],
-      swimlanes: [],
-      lists: [],
-      users: [],
-      members: [],
-      assignees: [],
-      labels: [],
-      is: [],
-      dueAt: null,
-      createdAt: null,
-      modifiedAt: null,
-    };
+    // console.log('params:', query.getParams());

-    let text = '';
-    while (query) {
-      m = query.match(reOperator1);
-      if (!m) {
-        m = query.match(reOperator2);
-        if (m) {
-          query = query.replace(reOperator2, '');
-        }
-      } else {
-        query = query.replace(reOperator1, '');
-      }
-      if (m) {
-        let op;
-        if (m.groups.operator) {
-          op = m.groups.operator.toLowerCase();
-        } else {
-          op = m.groups.abbrev;
-        }
-        if (op !== '__proto__') {
-          if (op in operatorMap) {
-            let value = m.groups.value;
-            if (operatorMap[op] === 'labels') {
-              if (value in this.colorMap) {
-                value = this.colorMap[value];
-              }
-            } else if (
-              ['dueAt', 'createdAt', 'modifiedAt'].includes(operatorMap[op])
-            ) {
-              const days = parseInt(value, 10);
-              if (isNaN(days)) {
-                if (
-                  ['day', 'week', 'month', 'quarter', 'year'].includes(value)
-                ) {
-                  value = moment()
-                    .subtract(1, value)
-                    .format();
-                } else {
-                  this.parsingErrors.push({
-                    tag: 'operator-number-expected',
-                    value: { operator: op, value },
-                  });
-                  value = null;
-                }
-              } else {
-                value = moment()
-                  .subtract(days, 'days')
-                  .format();
-              }
-            }
-            if (Array.isArray(params[operatorMap[op]])) {
-              params[operatorMap[op]].push(value);
-            } else {
-              params[operatorMap[op]] = value;
-            }
-          } else {
-            this.parsingErrors.push({
-              tag: 'operator-unknown-error',
-              value: op,
-            });
-          }
-        }
-        continue;
-      }
+    this.queryParams = query.getQueryParams().getParams();

-      m = query.match(reQuotedText);
-      if (!m) {
-        m = query.match(reText);
-        if (m) {
-          query = query.replace(reText, '');
-        }
-      } else {
-        query = query.replace(reQuotedText, '');
-      }
-      if (m) {
-        text += (text ? ' ' : '') + m.groups.text;
-      }
+    if (query.hasErrors()) {
+      this.searching.set(false);
+      this.queryErrors = query.errors();
+      this.hasResults.set(true);
+      this.hasQueryErrors.set(true);
+      return;
    }

-    // eslint-disable-next-line no-console
-    // console.log('text:', text);
-    params.text = text;
-
-    // eslint-disable-next-line no-console
-    // console.log('params:', params);
-
-    this.queryParams = params;
-
-    this.autorun(() => {
-      const handle = subManager.subscribe('globalSearch', params);
-      Tracker.nonreactive(() => {
-        Tracker.autorun(() => {
-          // eslint-disable-next-line no-console
-          // console.log('ready:', handle.ready());
-          if (handle.ready()) {
-            this.searching.set(false);
-            this.hasResults.set(true);
-          }
-        });
-      });
-    });
-  },
-
-  getResultsHeading() {
-    if (this.resultsCount === 0) {
-      return TAPi18n.__('no-cards-found');
-    } else if (this.resultsCount === 1) {
-      return TAPi18n.__('one-card-found');
-    } else if (this.resultsCount === this.totalHits) {
-      return TAPi18n.__('n-cards-found', this.resultsCount);
-    }
-
-    return TAPi18n.__('n-n-of-n-cards-found', {
-      start: 1,
-      end: this.resultsCount,
-      total: this.totalHits,
-    });
-  },
-
-  getSearchHref() {
-    const baseUrl = window.location.href.replace(/([?#].*$|\s*$)/, '');
-    return `${baseUrl}?q=${encodeURIComponent(this.query.get())}`;
-  },
+    this.runGlobalSearch(query.getQueryParams());
+  }

  searchInstructions() {
-    tags = {
+    const tags = {
      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'),
@@ -371,54 +123,77 @@ BlazeComponent.extendComponent({
      operator_member_abbrev: TAPi18n.__('operator-member-abbrev'),
      operator_assignee: TAPi18n.__('operator-assignee'),
      operator_assignee_abbrev: TAPi18n.__('operator-assignee-abbrev'),
+      operator_creator: TAPi18n.__('operator-creator'),
+      operator_due: TAPi18n.__('operator-due'),
+      operator_created: TAPi18n.__('operator-created'),
+      operator_modified: TAPi18n.__('operator-modified'),
+      operator_status: TAPi18n.__('operator-status'),
+      operator_has: TAPi18n.__('operator-has'),
+      operator_sort: TAPi18n.__('operator-sort'),
+      operator_limit: TAPi18n.__('operator-limit'),
+      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'),
+      predicate_attachment: TAPi18n.__('predicate-attachment'),
+      predicate_description: TAPi18n.__('predicate-description'),
+      predicate_checklist: TAPi18n.__('predicate-checklist'),
+      predicate_public: TAPi18n.__('predicate-public'),
+      predicate_private: TAPi18n.__('predicate-private'),
+      predicate_due: TAPi18n.__('predicate-due'),
+      predicate_created: TAPi18n.__('predicate-created'),
+      predicate_modified: TAPi18n.__('predicate-modified'),
+      predicate_start: TAPi18n.__('predicate-start'),
+      predicate_end: TAPi18n.__('predicate-end'),
+      predicate_assignee: TAPi18n.__('predicate-assignee'),
+      predicate_member: TAPi18n.__('predicate-member'),
    };

-    text = `# ${TAPi18n.__('globalSearch-instructions-heading')}`;
-    text += `\n${TAPi18n.__('globalSearch-instructions-description', tags)}`;
-    text += `\n${TAPi18n.__('globalSearch-instructions-operators', tags)}`;
-    text += `\n* ${TAPi18n.__(
-      'globalSearch-instructions-operator-board',
-      tags,
-    )}`;
-    text += `\n* ${TAPi18n.__(
-      'globalSearch-instructions-operator-list',
-      tags,
-    )}`;
-    text += `\n* ${TAPi18n.__(
-      'globalSearch-instructions-operator-swimlane',
-      tags,
-    )}`;
-    text += `\n* ${TAPi18n.__(
-      'globalSearch-instructions-operator-label',
-      tags,
-    )}`;
-    text += `\n* ${TAPi18n.__(
-      'globalSearch-instructions-operator-hash',
-      tags,
-    )}`;
-    text += `\n* ${TAPi18n.__(
-      'globalSearch-instructions-operator-user',
-      tags,
-    )}`;
-    text += `\n* ${TAPi18n.__('globalSearch-instructions-operator-at', tags)}`;
-    text += `\n* ${TAPi18n.__(
-      'globalSearch-instructions-operator-member',
-      tags,
-    )}`;
-    text += `\n* ${TAPi18n.__(
-      'globalSearch-instructions-operator-assignee',
-      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-4', tags)}`;
-    text += `\n* ${TAPi18n.__('globalSearch-instructions-notes-5', tags)}`;
+    let text = '';
+    [
+      ['# ', 'globalSearch-instructions-heading'],
+      ['\n', 'globalSearch-instructions-description'],
+      ['\n\n', 'globalSearch-instructions-operators'],
+      ['\n* ', 'globalSearch-instructions-operator-board'],
+      ['\n* ', 'globalSearch-instructions-operator-list'],
+      ['\n* ', 'globalSearch-instructions-operator-swimlane'],
+      ['\n* ', 'globalSearch-instructions-operator-comment'],
+      ['\n* ', 'globalSearch-instructions-operator-label'],
+      ['\n* ', 'globalSearch-instructions-operator-hash'],
+      ['\n* ', 'globalSearch-instructions-operator-user'],
+      ['\n* ', 'globalSearch-instructions-operator-at'],
+      ['\n* ', 'globalSearch-instructions-operator-member'],
+      ['\n* ', 'globalSearch-instructions-operator-assignee'],
+      ['\n* ', 'globalSearch-instructions-operator-creator'],
+      ['\n* ', 'globalSearch-instructions-operator-due'],
+      ['\n* ', 'globalSearch-instructions-operator-created'],
+      ['\n* ', 'globalSearch-instructions-operator-modified'],
+      ['\n* ', 'globalSearch-instructions-operator-status'],
+      ['\n    * ', 'globalSearch-instructions-status-archived'],
+      ['\n    * ', 'globalSearch-instructions-status-public'],
+      ['\n    * ', 'globalSearch-instructions-status-private'],
+      ['\n    * ', 'globalSearch-instructions-status-all'],
+      ['\n    * ', 'globalSearch-instructions-status-ended'],
+      ['\n* ', 'globalSearch-instructions-operator-has'],
+      ['\n* ', 'globalSearch-instructions-operator-sort'],
+      ['\n* ', 'globalSearch-instructions-operator-limit'],
+      ['\n## ', 'heading-notes'],
+      ['\n* ', 'globalSearch-instructions-notes-1'],
+      ['\n* ', 'globalSearch-instructions-notes-2'],
+      ['\n* ', 'globalSearch-instructions-notes-3'],
+      ['\n* ', 'globalSearch-instructions-notes-3-2'],
+      ['\n* ', 'globalSearch-instructions-notes-4'],
+      ['\n* ', 'globalSearch-instructions-notes-5'],
+    ].forEach(([prefix, instruction]) => {
+      text += `${prefix}${TAPi18n.__(instruction, tags)}`;
+    });

    return text;
-  },
+  }

  labelColors() {
    return Boards.simpleSchema()._schema['labels.$.color'].allowedValues.map(
@@ -426,10 +201,10 @@ BlazeComponent.extendComponent({
        return { color, name: TAPi18n.__(`color-${color}`) };
      },
    );
-  },
+  }

  events() {
-    return [
+    return super.events().concat([
      {
        'submit .js-search-query-form'(evt) {
          evt.preventDefault();
@@ -437,8 +212,9 @@ BlazeComponent.extendComponent({
        },
        'click .js-label-color'(evt) {
          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
          this.query.set(
-            `${this.query.get()} ${TAPi18n.__('operator-label')}:"${
+            `${input.value} ${TAPi18n.__('operator-label')}:"${
              evt.currentTarget.textContent
            }"`,
          );
@@ -446,8 +222,9 @@ BlazeComponent.extendComponent({
        },
        'click .js-board-title'(evt) {
          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
          this.query.set(
-            `${this.query.get()} ${TAPi18n.__('operator-board')}:"${
+            `${input.value} ${TAPi18n.__('operator-board')}:"${
              evt.currentTarget.textContent
            }"`,
          );
@@ -455,8 +232,9 @@ BlazeComponent.extendComponent({
        },
        'click .js-list-title'(evt) {
          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
          this.query.set(
-            `${this.query.get()} ${TAPi18n.__('operator-list')}:"${
+            `${input.value} ${TAPi18n.__('operator-list')}:"${
              evt.currentTarget.textContent
            }"`,
          );
@@ -464,14 +242,24 @@ BlazeComponent.extendComponent({
        },
        'click .js-label-name'(evt) {
          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
          this.query.set(
-            `${this.query.get()} ${TAPi18n.__('operator-label')}:"${
+            `${input.value} ${TAPi18n.__('operator-label')}:"${
              evt.currentTarget.textContent
            }"`,
          );
          document.getElementById('global-search-input').focus();
        },
+        'click .js-new-search'(evt) {
+          evt.preventDefault();
+          const input = document.getElementById('global-search-input');
+          input.value = '';
+          this.query.set('');
+          this.hasResults.set(false);
+        },
      },
-    ];
-  },
-}).register('globalSearch');
+    ]);
+  }
+}
+
+GlobalSearchComponent.register('globalSearch');
@@ -71,17 +71,17 @@
 .global-search-error-messages
  color: darkred

-.global-search-instructions
+.global-search-page
  width: 40%
  min-width: 400px
  margin-right: auto
  margin-left: auto
  line-height: 150%

-.global-search-instructions h1
+.global-search-page h1
  margin-top: 2rem;

-.global-search-instructions h2
+.global-search-page h2
  margin-top: 1rem;

 .global-search-query-input
@@ -100,7 +100,22 @@ code
  color: black
  background-color: lightgrey
  padding: 0.1rem !important
-  font-size: 0.7rem !important
+  font-size: 0.8rem !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;
+
+.global-search-instructions li
+  margin-bottom: 0.3rem
@@ -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.header-quick-access-list
          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
        //-
@@ -26,29 +31,27 @@ template(name="header")
        unless currentSetting.hideLogo
          if currentSetting.customTopLeftCornerLogoImageUrl
            if currentSetting.customTopLeftCornerLogoLinkUrl
-              a(href="{{currentSetting.customTopLeftCornerLogoLinkUrl}}")
+              a(href="{{currentSetting.customTopLeftCornerLogoLinkUrl}}" alt="{{currentSetting.productName}}" title="{{currentSetting.productName}}")
                img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="{{#if currentSetting.customTopLeftCornerLogoHeight}}#{currentSetting.customTopLeftCornerLogoHeight}{{else}}27{{/if}}" width="auto" margin="0" padding="0")
            unless currentSetting.customTopLeftCornerLogoLinkUrl
-              img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="{{#if currentSetting.customTopLeftCornerLogoHeight}}#{currentSetting.customTopLeftCornerLogoHeight}{{else}}27{{/if}}" width="auto" margin="0" padding="0")
+              img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="{{#if currentSetting.customTopLeftCornerLogoHeight}}#{currentSetting.customTopLeftCornerLogoHeight}{{else}}27{{/if}}" width="auto" margin="0" padding="0" alt="{{currentSetting.productName}}" title="{{currentSetting.productName}}")
          unless currentSetting.customTopLeftCornerLogoImageUrl
-            img(src="{{pathFor '/logo-header.png'}}" alt="")
-        ul
-          li
-            a(href="{{pathFor 'home'}}")
-              span.fa.fa-home
-              | {{_ 'all-boards'}}
-          li.separator -
+            img(src="{{pathFor '/logo-header.png'}}" alt="{{currentSetting.productName}}" title="{{currentSetting.productName}}")
+        span.allBoards
+          a(href="{{pathFor 'home'}}")
+            span.fa.fa-home
+            | {{_ 'all-boards'}}
+        ul.header-quick-access-list
          //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
          else
-            li.current {{_ 'quick-access-description'}}
+            li.current.empty {{_ 'quick-access-description'}}

      // Next line is used only for spacing at header,
      // there is no visible clickable icon.
@@ -100,6 +100,10 @@
  font-size: 12px
  display: flex
  z-index: 21
+  padding: 10px 0px
+
+  .allBoards
+      padding: 0 0 0 10px

  #header-user-bar,
  #header-new-board-icon,
@@ -112,21 +116,31 @@
    a:hover, a.is-active
      color: white

-  ul
+  ul.header-quick-access-list
    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%)

+      &.current.empty
+        padding: 12px 10px 12px 10px
+
      &:first-child .fa-home,&:nth-child(3) .fa-globe
        margin-right: 5px

@@ -186,37 +200,32 @@
  #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: 10px
+          margin-left: 10px

    #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
@@ -77,20 +77,47 @@ Template.userFormsLayout.helpers({
      } else if (lang.name === 'ar-EG') {
        // ar-EG = Arabic (Egypt), simply Masri (مَصرى, [ˈmɑsˤɾi], Egyptian, Masr refers to Cairo)
        name = 'مَصرى';
-      } else if (lang.name === 'es-PY') {
-        name = 'Español de Paraguayo';
+      } else if (lang.name === 'de-CH') {
+        name = 'Deutsch (Schweiz)';
+      } else if (lang.name === 'fa-IR') {
+        // fa-IR = Persian (Iran)
+        name = 'فارسی/پارسی (ایران‎)';
      } else if (lang.name === 'fr-BE') {
        name = 'Français (Belgique)';
      } else if (lang.name === 'fr-CA') {
        name = 'Français (Canada)';
-      } else if (lang.name === 'fr-CA') {
-        name = 'Français (Canada)';
      } else if (lang.name === 'ig') {
        name = 'Igbo';
      } else if (lang.name === 'lv') {
        name = 'Latviešu';
      } else if (lang.name === 'latviešu valoda') {
        name = 'Latviešu';
+      } else if (lang.name === 'Español') {
+        name = 'español';
+      } else if (lang.name === 'es_419') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'es-419') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'Español de América Latina') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'es-LA') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'Español de Argentina') {
+        name = 'español de Argentina';
+      } else if (lang.name === 'Español de Chile') {
+        name = 'español de Chile';
+      } else if (lang.name === 'Español de Colombia') {
+        name = 'español de Colombia';
+      } else if (lang.name === 'Español de México') {
+        name = 'español de México';
+      } else if (lang.name === 'es-PY') {
+        name = 'español de Paraguayo';
+      } else if (lang.name === 'Español de Paraguayo') {
+        name = 'español de Paraguayo';
+      } else if (lang.name === 'Español de Perú') {
+        name = 'español de Perú';
+      } else if (lang.name === 'Español de Puerto Rico') {
+        name = 'español de Puerto Rico';
      } else if (lang.name === 'oc') {
        name = 'Occitan';
      } else if (lang.name === 'st') {
@@ -6,16 +6,6 @@ template(name="myCardsHeaderBar")
      i.fa.fa-list
      | {{_ 'my-cards'}}

-    .board-header-btns.left
-      a.board-header-btn.js-toggle-my-cards-choose-sort(title="{{_ 'myCardsSortChange-title'}}")
-        i.fa.fa-caret-down
-        if $eq myCardsSort 'board'
-          i.fa.fa-th-large
-          | {{_ 'myCardsSortChange-choice-board'}}
-        if $eq myCardsSort 'dueAt'
-          i.fa.fa-calendar
-          | {{_ 'myCardsSortChange-choice-dueat'}}
-
 template(name="myCardsModalTitle")
  if currentUser
    h2
@@ -24,50 +14,26 @@ template(name="myCardsModalTitle")

 template(name="myCards")
  if currentUser
-    if isPageReady.get
-      .wrapper
-        if $eq myCardsSort 'board'
-          each board in myCardsList
-            .my-cards-board-wrapper
-              .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
-                    = 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 myDueCardsList
-              +resultCard(card)
-    else
+    if searching.get
      +spinner
-
-template(name="myCardsSortChangePopup")
-  if currentUser
-    ul.pop-over-list
-      li
-        with "my-cards-sort-board"
-          a.js-my-cards-sort-board
-            i.fa.fa-th-large.colorful
-            | {{_ 'myCardsSortChange-choice-board'}}
-            if $eq Utils.myCardsSort "board"
-              i.fa.fa-check
-      hr
-      li
-        with "my-cards-sort-dueat"
-          a.js-my-cards-sort-dueat
-            i.fa.fa-calendar.colorful
-            | {{_ 'myCardsSortChange-choice-dueat'}}
-            if $eq Utils.myCardsSort "dueAt"
-              i.fa.fa-check
+    else
+      .wrapper
+        each board in myCardsList
+          .my-cards-board-wrapper
+            .my-cards-board-title(class=board.colorClass, id="header")
+              a(href=board.originRelativeUrl)
+                +viewer
+                  = 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.originRelativeUrl)
+                        +minicard(card)
@@ -1,4 +1,4 @@
-const subManager = new SubsManager();
+import { CardSearchPagedComponent } from '../../lib/cardSearch';

 BlazeComponent.extendComponent({
  myCardsSort() {
@@ -24,227 +24,115 @@ 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({
+class MyCardsComponent extends CardSearchPagedComponent {
  onCreated() {
-    this.isPageReady = new ReactiveVar(false);
+    super.onCreated();

-    this.autorun(() => {
-      const handle = subManager.subscribe('myCards');
-      Tracker.nonreactive(() => {
-        Tracker.autorun(() => {
-          this.isPageReady.set(handle.ready());
-        });
-      });
-    });
+    this.runGlobalSearch(null);
    Meteor.subscribe('setting');
-  },
+  }

-  myCardsSort() {
-    // eslint-disable-next-line no-console
-    //console.log('sort:', Utils.myCardsSort());
-    return Utils.myCardsSort();
-  },
-
-  sortByBoard() {
-    return this.myCardsSort() === 'board';
-  },
+  // eslint-disable-next-line no-unused-vars
+  getSubscription(queryParams) {
+    return Meteor.subscribe(
+      'myCards',
+      this.sessionId,
+      this.subscriptionCallbacks,
+    );
+  }

  myCardsList() {
-    const userId = Meteor.userId();
    const boards = [];
    let board = null;
    let swimlane = null;
    let list = null;

-    const cursor = Cards.find(
-      {
-        $or: [{ members: userId }, { assignees: userId }],
-        archived: false,
-      },
-      {
-        sort: {
-          boardId: 1,
-          swimlaneId: 1,
-          listId: 1,
-          sort: 1,
-        },
-      },
-    );
+    const cursor = this.getResults();

-    let newBoard = false;
-    let newSwimlane = false;
-    let newList = false;
-
-    cursor.forEach(card => {
-      // eslint-disable-next-line no-console
-      // console.log('card:', card.title);
-      if (list === null || card.listId !== list._id) {
+    if (cursor) {
+      cursor.forEach(card => {
        // eslint-disable-next-line no-console
-        // console.log('new list');
-        list = card.getList();
-        if (list.archived) {
-          list = null;
-          return;
-        }
-        list.myCards = [card];
-        newList = true;
-      }
-      if (swimlane === null || card.swimlaneId !== swimlane._id) {
-        // eslint-disable-next-line no-console
-        // console.log('new swimlane');
-        swimlane = card.getSwimlane();
-        if (swimlane.archived) {
+        // console.log('card:', card.title);
+        if (board === null || card.boardId !== board._id) {
+          // eslint-disable-next-line no-console
+          // console.log('new board');
+          board = card.getBoard();
+          if (board.archived) {
+            board = null;
+            return;
+          }
+          // eslint-disable-next-line no-console
+          // console.log('board:', b, b._id, b.title);
+          boards.push(board);
+          board.mySwimlanes = [];
          swimlane = null;
-          return;
+          list = null;
+        }
+
+        if (swimlane === null || card.swimlaneId !== swimlane._id) {
+          // eslint-disable-next-line no-console
+          // console.log('new swimlane');
+          swimlane = card.getSwimlane();
+          if (swimlane.archived) {
+            swimlane = null;
+            return;
+          }
+          board.mySwimlanes.push(swimlane);
+          swimlane.myLists = [];
+          list = null;
+        }
+
+        if (list === null || card.listId !== list._id) {
+          // eslint-disable-next-line no-console
+          // console.log('new list');
+          list = card.getList();
+          if (list.archived) {
+            list = null;
+            return;
+          }
+          swimlane.myLists.push(list);
+          list.myCards = [];
        }
-        swimlane.myLists = [list];
-        newSwimlane = true;
-      }
-      if (board === null || card.boardId !== board._id) {
-        // eslint-disable-next-line no-console
-        // console.log('new board');
-        board = card.getBoard();
-        if (board.archived) {
-          board = null;
-          return;
-        }
-        // eslint-disable-next-line no-console
-        // console.log('board:', b, b._id, b.title);
-        board.mySwimlanes = [swimlane];
-        newBoard = true;
-      }

-      if (newBoard) {
-        boards.push(board);
-      } else if (newSwimlane) {
-        board.mySwimlanes.push(swimlane);
-      } else if (newList) {
-        swimlane.myLists.push(list);
-      } else {
        list.myCards.push(card);
-      }
+      });

-      newBoard = false;
-      newSwimlane = false;
-      newList = false;
-    });
-
-    // sort the data structure
-    boards.forEach(board => {
-      board.mySwimlanes.forEach(swimlane => {
-        swimlane.myLists.forEach(list => {
-          list.myCards.sort((a, b) => {
+      // 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;
          });
        });
-        swimlane.myLists.sort((a, b) => {
+        board.mySwimlanes.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;
      });
-    });

-    boards.sort((a, b) => {
-      let x = a.sort;
-      let y = b.sort;
+      // eslint-disable-next-line no-console
+      // console.log('boards:', boards);
+      return boards;
+    }

-      // 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;
-  },
-
-  myDueCardsList() {
-    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 => {
-      if (
-        !card.getBoard().archived &&
-        !card.getSwimlane().archived &&
-        !card.getList().archived
-      ) {
-        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();
-        // },
-      },
-    ];
-  },
-}).register('myCards');
+    return [];
+  }
+}
+MyCardsComponent.register('myCards');
@@ -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,16 @@
        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 +59,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
@@ -1,5 +1,5 @@
 template(name='notifications')
  #notifications.board-header-btns.right
-    a.notifications-drawer-toggle.fa.fa-bell(class="{{#if $gt unreadNotifications 0}}alert{{/if}}")
+    a.notifications-drawer-toggle.fa.fa-bell(class="{{#if $gt unreadNotifications 0}}alert{{/if}}" title="{{_ 'notifications'}}")
    if $.Session.get 'showNotificationsDrawer'
      +notificationsDrawer(unreadNotifications=unreadNotifications)
@@ -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
@@ -0,0 +1,111 @@
+template(name="adminReports")
+  .setting-content
+    unless currentUser.isAdmin
+      | {{_ 'error-notAuthorized'}}
+    else
+      .content-body
+        .side-menu
+          ul
+            li
+              a.js-report-broken(data-id="report-broken")
+                i.fa.fa-chain-broken
+                | {{_ 'broken-cards'}}
+
+            li
+              a.js-report-files(data-id="report-orphaned-files")
+                i.fa.fa-paperclip
+                | {{_ 'orphanedFilesReportTitle'}}
+
+            li
+              a.js-report-files(data-id="report-files")
+                i.fa.fa-paperclip
+                | {{_ 'filesReportTitle'}}
+
+            li
+              a.js-report-rules(data-id="report-rules")
+                i.fa.fa-magic
+                | {{_ 'rulesReportTitle'}}
+
+        .main-body
+          if loading.get
+            +spinner
+          else if showBrokenCardsReport.get
+            +brokenCardsReport
+          else if showFilesReport.get
+            +filesReport
+          else if showOrphanedFilesReport.get
+            +orphanedFilesReport
+          else if showRulesReport.get
+            +rulesReport
+
+
+template(name="brokenCardsReport")
+  .global-search-results-list-wrapper
+    h1 {{_ 'broken-cards'}}
+    if resultsCount
+      +resultsPaged(this)
+    else
+      div {{_ 'no-results' }}
+
+template(name="rulesReport")
+  h1 {{_ 'rulesReportTitle'}}
+  if resultsCount
+    table.table
+      tr
+        th Rule Title
+        th Board Title
+        th actionType
+        th activityType
+
+      each rule in rows
+        tr
+          td {{ rule.title }}
+          td {{ rule.boardTitle }}
+          td {{ rule.action.actionType }}
+          td {{ rule.trigger.activityType }}
+  else
+    div {{_ 'no-results' }}
+
+template(name="filesReport")
+  h1 {{_ 'filesReportTitle'}}
+  if resultsCount
+    table.table
+      tr
+        th Filename
+        th.right Size (kB)
+        th MIME Type
+        th.center Usage
+        th MD5 Sum
+        th ID
+
+      each att in attachmentFiles
+        tr
+          td {{ att.filename }}
+          td.right {{fileSize att.length }}
+          td {{ att.contentType }}
+          td.center {{usageCount att._id.toHexString }}
+          td {{ att.md5 }}
+          td {{ att._id.toHexString }}
+  else
+    div {{_ 'no-results' }}
+
+template(name="orphanedFilesReport")
+  h1 {{_ 'orphanedFilesReportTitle'}}
+  if resultsCount
+    table.table
+      tr
+        th Filename
+        th.right Size (kB)
+        th MIME Type
+        th MD5 Sum
+        th ID
+
+      each att in attachmentFiles
+        tr
+          td {{ att.filename }}
+          td.right {{fileSize att.length }}
+          td {{ att.contentType }}
+          td {{ att.md5 }}
+          td {{ att._id.toHexString }}
+  else
+    div {{_ 'no-results' }}
@@ -0,0 +1,156 @@
+import { AttachmentStorage } from '/models/attachments';
+import { CardSearchPagedComponent } from '/client/lib/cardSearch';
+import SessionData from '/models/usersessiondata';
+
+BlazeComponent.extendComponent({
+  subscription: null,
+  showFilesReport: new ReactiveVar(false),
+  showBrokenCardsReport: new ReactiveVar(false),
+  showOrphanedFilesReport: new ReactiveVar(false),
+  showRulesReport: new ReactiveVar(false),
+
+  onCreated() {
+    this.error = new ReactiveVar('');
+    this.loading = new ReactiveVar(false);
+  },
+
+  events() {
+    return [
+      {
+        'click a.js-report-broken': this.switchMenu,
+        'click a.js-report-files': this.switchMenu,
+        'click a.js-report-orphaned-files': this.switchMenu,
+        'click a.js-report-rules': this.switchMenu,
+      },
+    ];
+  },
+
+  switchMenu(event) {
+    const target = $(event.target);
+    if (!target.hasClass('active')) {
+      this.loading.set(true);
+      this.showFilesReport.set(false);
+      this.showBrokenCardsReport.set(false);
+      this.showOrphanedFilesReport.set(false);
+      if (this.subscription) {
+        this.subscription.stop();
+      }
+
+      $('.side-menu li.active').removeClass('active');
+      target.parent().addClass('active');
+      const targetID = target.data('id');
+
+      if ('report-broken' === targetID) {
+        this.showBrokenCardsReport.set(true);
+        this.subscription = Meteor.subscribe(
+          'brokenCards',
+          SessionData.getSessionId(),
+          () => {
+            this.loading.set(false);
+          },
+        );
+      } else if ('report-files' === targetID) {
+        this.showFilesReport.set(true);
+        this.subscription = Meteor.subscribe('attachmentsList', () => {
+          this.loading.set(false);
+        });
+      } else if ('report-orphaned-files' === targetID) {
+        this.showOrphanedFilesReport.set(true);
+        this.subscription = Meteor.subscribe('orphanedAttachments', () => {
+          this.loading.set(false);
+        });
+      } else if ('report-rules' === targetID) {
+        this.subscription = Meteor.subscribe('rulesReport', () => {
+          this.showRulesReport.set(true);
+          this.loading.set(false);
+        });
+      }
+    }
+  },
+}).register('adminReports');
+
+Template.filesReport.helpers({
+  attachmentFiles() {
+    // eslint-disable-next-line no-console
+    // console.log('attachments:', AttachmentStorage.find());
+    // console.log('attachments.count:', AttachmentStorage.find().count());
+    return AttachmentStorage.find();
+  },
+
+  rulesReport() {
+    const rules = [];
+
+    Rules.find().forEach(rule => {
+      rules.push({
+        _id: rule._id,
+        title: rule.title,
+        boardId: rule.boardId,
+        boardTitle: rule.board().title,
+        action: rule.action().fetch(),
+        trigger: rule.trigger().fetch(),
+      });
+    });
+
+    return rules;
+  },
+
+  resultsCount() {
+    return AttachmentStorage.find().count();
+  },
+
+  fileSize(size) {
+    return Math.round(size / 1024);
+  },
+
+  usageCount(key) {
+    return Attachments.find({ 'copies.attachments.key': key }).count();
+  },
+});
+
+Template.orphanedFilesReport.helpers({
+  attachmentFiles() {
+    // eslint-disable-next-line no-console
+    // console.log('attachments:', AttachmentStorage.find());
+    // console.log('attachments.count:', AttachmentStorage.find().count());
+    return AttachmentStorage.find();
+  },
+
+  resultsCount() {
+    return AttachmentStorage.find().count();
+  },
+
+  fileSize(size) {
+    return Math.round(size / 1024);
+  },
+});
+
+Template.rulesReport.helpers({
+  rows() {
+    const rules = [];
+
+    Rules.find().forEach(rule => {
+      rules.push({
+        _id: rule._id,
+        title: rule.title,
+        boardId: rule.boardId,
+        boardTitle: rule.board().title,
+        action: rule.action(),
+        trigger: rule.trigger(),
+      });
+    });
+
+    console.log('rows:', rules);
+    return rules;
+  },
+
+  resultsCount() {
+    return Rules.find().count();
+  },
+});
+
+class BrokenCardsComponent extends CardSearchPagedComponent {
+  onCreated() {
+    super.onCreated();
+  }
+}
+BrokenCardsComponent.register('brokenCardsReport');
@@ -74,7 +74,6 @@ template(name="orgGeneral")
        th {{_ 'description'}}
        th {{_ 'shortName'}}
        th {{_ 'website'}}
-        th {{_ 'teams'}}
        th {{_ 'createdAt'}}
        th {{_ 'active'}}
        th
@@ -110,6 +109,7 @@ template(name="peopleGeneral")
        th {{_ 'createdAt'}}
        th {{_ 'active'}}
        th {{_ 'authentication-method'}}
+        th {{_ 'import-usernames'}}
        th
          +newUserRow
      each user in peopleList
@@ -117,47 +117,43 @@ template(name="peopleGeneral")

 template(name="newOrgRow")
  a.new-org
-    i.fa.fa-edit
+    i.fa.fa-plus-square
    | {{_ 'new'}}

 template(name="newTeamRow")
  a.new-team
-    i.fa.fa-edit
+    i.fa.fa-plus-square
    | {{_ 'new'}}

 template(name="newUserRow")
  a.new-user
-    i.fa.fa-edit
+    i.fa.fa-plus-square
    | {{_ 'new'}}

 template(name="orgRow")
  tr
-    if orgData.loginDisabled
-      td <s>{{ orgData.displayName }}</s>
+    if orgData.orgIsActive
+      td <s>{{ orgData.orgDisplayName }}</s>
    else
-      td {{ orgData.displayName }}
-    if orgData.loginDisabled
+      td {{ orgData.orgDisplayName }}
+    if orgData.orgIsActive
      td <s>{{ orgData.orgDesc }}</s>
    else
-      td {{ orgData.desc }}
-    if orgData.loginDisabled
-      td <s>{{ orgData.name }}</s>
+      td {{ orgData.orgDesc }}
+    if orgData.orgIsActive
+      td <s>{{ orgData.orgShortName }}</s>
    else
-      td {{ orgData.name }}
-    if orgData.loginDisabled
-      td <s>{{ orgData.website }}</s>
+      td {{ orgData.orgShortName }}
+    if orgData.orgIsActive
+      td <s>{{ orgData.orgWebsite }}</s>
    else
-      td {{ orgData.website }}
-    if orgData.loginDisabled
-      td <s>{{ orgData.teams }}</s>
-    else
-      td {{ orgData.teams }}
-    if orgData.loginDisabled
+      td {{ orgData.orgWebsite }}
+    if orgData.orgIsActive
      td <s>{{ moment orgData.createdAt 'LLL' }}</s>
    else
      td {{ moment orgData.createdAt 'LLL' }}
    td
-      if orgData.loginDisabled
+      if orgData.orgIsActive
        | {{_ 'no'}}
      else
        | {{_ 'yes'}}
@@ -170,28 +166,28 @@ template(name="orgRow")

 template(name="teamRow")
  tr
-    if teamData.loginDisabled
-      td <s>{{ teamData.displayName }}</s>
+    if teamData.teamIsActive
+      td <s>{{ teamData.teamDisplayName }}</s>
    else
-      td {{ teamData.displayName }}
-    if teamData.loginDisabled
-      td <s>{{ teamData.desc }}</s>
+      td {{ teamData.teamDisplayName }}
+    if teamData.teamIsActive
+      td <s>{{ teamData.teamDesc }}</s>
    else
-      td {{ teamData.desc }}
-    if teamData.loginDisabled
-      td <s>{{ teamData.dame }}</s>
+      td {{ teamData.teamDesc }}
+    if teamData.teamIsActive
+      td <s>{{ teamData.teamShortName }}</s>
    else
-      td {{ teamData.name }}
-    if teamData.loginDisabled
-      td <s>{{ teamData.website }}</s>
+      td {{ teamData.teamShortName }}
+    if teamData.teamIsActive
+      td <s>{{ teamData.teamWebsite }}</s>
    else
-      td {{ teamData.website }}
-    if orgData.loginDisabled
+      td {{ teamData.teamWebsite }}
+    if teamData.teamIsActive
      td <s>{{ moment teamData.createdAt 'LLL' }}</s>
    else
      td {{ moment teamData.createdAt 'LLL' }}
    td
-      if teamData.loginDisabled
+      if teamData.teamIsActive
        | {{_ 'no'}}
      else
        | {{_ 'yes'}}
@@ -257,6 +253,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
@@ -268,24 +268,24 @@ template(name="editOrgPopup")
  form
    label.hide.orgId(type="text" value=org._id)
    label
-      | {{_ 'orgDisplayName'}}
-      input.js-orgDisplayName(type="text" value=org.displayName required)
+      | {{_ 'displayName'}}
+      input.js-orgDisplayName(type="text" value=org.orgDisplayName required)
      span.error.hide.orgname-taken
        | {{_ 'error-orgname-taken'}}
    label
-      | {{_ 'orgDesc'}}
-      input.js-orgDesc(type="text" value=org.desc required)
+      | {{_ 'description'}}
+      input.js-orgDesc(type="text" value=org.orgDesc required)
    label
-      | {{_ 'orgName'}}
-      input.js-orgName(type="text" value=org.name required)
+      | {{_ 'shortName'}}
+      input.js-orgShortName(type="text" value=org.orgShortName required)
    label
-      | {{_ 'orgWebsite'}}
-      input.js-orgWebsite(type="text" value=org.website required)
+      | {{_ 'website'}}
+      input.js-orgWebsite(type="text" value=org.orgWebsite required)
    label
      | {{_ 'active'}}
      select.select-active.js-org-isactive
        option(value="false") {{_ 'yes'}}
-        option(value="true" selected="{{org.loginDisabled}}") {{_ 'no'}}
+        option(value="true" selected="{{org.orgIsActive}}") {{_ 'no'}}
    hr
    div.buttonsContainer
      input.primary.wide(type="submit" value="{{_ 'save'}}")
@@ -295,23 +295,23 @@ template(name="editTeamPopup")
    label.hide.teamId(type="text" value=team._id)
    label
      | {{_ 'displayName'}}
-      input.js-teamDisplayName(type="text" value=team.displayName required)
+      input.js-teamDisplayName(type="text" value=team.teamDisplayName required)
      span.error.hide.teamname-taken
        | {{_ 'error-teamname-taken'}}
    label
      | {{_ 'description'}}
-      input.js-orgDesc(type="text" value=org.desc required)
+      input.js-teamDesc(type="text" value=team.teamDesc required)
    label
-      | {{_ 'name'}}
-      input.js-orgName(type="text" value=org.name required)
+      | {{_ 'shortName'}}
+      input.js-teamShortName(type="text" value=team.teamShortName required)
    label
      | {{_ 'website'}}
-      input.js-orgWebsite(type="text" value=org.website required)
+      input.js-teamWebsite(type="text" value=team.teamWebsite required)
    label
      | {{_ 'active'}}
      select.select-active.js-team-isactive
        option(value="false") {{_ 'yes'}}
-        option(value="true" selected="{{team.loginDisabled}}") {{_ 'no'}}
+        option(value="true" selected="{{team.teamIsActive}}") {{_ 'no'}}
    hr
    div.buttonsContainer
      input.primary.wide(type="submit" value="{{_ 'save'}}")
@@ -332,7 +332,7 @@ template(name="editUserPopup")
      input.js-profile-fullname(type="text" value=user.profile.fullname required)
    label
      | {{_ 'initials'}}
-      input.js-profile-initials(type="text" value=user.profile.initials)
+      input.js-profile-initials(type="text" value=user.profile.initials required)
    label
      | {{_ 'admin'}}
      select.select-role.js-profile-isadmin
@@ -346,6 +346,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
@@ -376,22 +379,19 @@ template(name="newOrgPopup")
    //label.hide.userId(type="text" value=user._id)
    label
      | {{_ 'displayName'}}
-      input.js-displayName(type="text" value="" required)
+      input.js-orgDisplayName(type="text" value="" required)
    label
      | {{_ 'description'}}
-      input.js-desc(type="text" value="" required)
+      input.js-orgDesc(type="text" value="" required)
    label
      | {{_ 'shortName'}}
-      input.js-name(type="text" value="")
-    label
-      | {{_ 'teams'}}
-      input.js-teams(type="text" value="")
+      input.js-orgShortName(type="text" value="" required)
    label
      | {{_ 'website'}}
-      input.js-website(type="text" value="")
+      input.js-orgWebsite(type="text" value="" required)
    label
      | {{_ 'active'}}
-      select.select-active.js-profile-isactive
+      select.select-active.js-org-isactive
        option(value="false" selected="selected") {{_ 'yes'}}
        option(value="true") {{_ 'no'}}
    hr
@@ -409,13 +409,13 @@ template(name="newTeamPopup")
      input.js-teamDesc(type="text" value="" required)
    label
      | {{_ 'shortName'}}
-      input.js-teamName(type="text" value="")
+      input.js-teamShortName(type="text" value="" required)
    label
      | {{_ 'website'}}
-      input.js-teamWebsite(type="text" value="")
+      input.js-teamWebsite(type="text" value="" required)
    label
      | {{_ 'active'}}
-      select.select-active.js-profile-isactive
+      select.select-active.js-team-isactive
        option(value="false" selected="selected") {{_ 'yes'}}
        option(value="true") {{_ 'no'}}
    hr
@@ -436,6 +436,9 @@ template(name="newUserPopup")
      //  input.js-profile-username(type="text" value=user.username readonly)
      //else
      input.js-profile-username(type="text" value="" required)
+    label
+      | {{_ 'initials'}}
+      input.js-profile-initials(type="text" value="" required)
    label
      | {{_ 'email'}}
      span.error.hide.email-taken
@@ -444,6 +447,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
@@ -472,27 +478,34 @@ template(name="newUserPopup")
 template(name="settingsOrgPopup")
  ul.pop-over-list
    li
-      a.impersonate-org
-        i.fa.fa-user
-        | {{_ 'impersonate-org'}}
-  // Delete is not enabled yet, because it does leave empty user avatars
-  // to boards: boards members, card members and assignees have
-  // empty users. See:
-  // - wekan/client/components/settings/peopleBody.jade deleteButton
-  // - wekan/client/components/settings/peopleBody.js deleteButton
-  // - wekan/client/components/sidebar/sidebar.js Popup.afterConfirm('removeMember'
-  //   that does now remove member from board, card members and assignees correctly,
-  //   but that should be used to remove user from all boards similarly
-  // - wekan/models/users.js Delete is not enabled
-  //li
-  //  br
-  //  br
-  //  hr
-  //li
-  //  form
-  //    label.hide.userId(type="text" value=user._id)
-  //    div.buttonsContainer
-  //      input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")
+      form
+        label
+          | {{_ 'delete-org-confirm-popup'}}
+        br
+        label.hide.orgId(type="text" value=org._id)
+        labeldelete-org-confirm-popup
+        div.buttonsContainer
+          input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")
+  // It's not yet possible to impersonate organization. Only impersonate user,
+  // because that changes current user ID. What would it mean in practice
+  // to impersonate organization?
+  //  li
+  //    a.impersonate-org
+  //      i.fa.fa-user
+  //      | {{_ 'impersonate-org'}}
+  //
+  //
+
+template(name="settingsTeamPopup")
+  ul.pop-over-list
+    li
+      form
+        label
+          | {{_ 'delete-team-confirm-popup'}}
+        br
+        label.hide.teamId(type="text" value=team._id)
+        div.buttonsContainer
+          input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")

 template(name="settingsUserPopup")
  ul.pop-over-list
@@ -500,6 +513,12 @@ template(name="settingsUserPopup")
      a.impersonate-user
        i.fa.fa-user
        | {{_ 'impersonate-user'}}
+    //hr
+    //li
+    //  form
+    //    label.hide.userId(type="text" value=user._id)
+    //    div.buttonsContainer
+    //      input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")
  // Delete is not enabled yet, because it does leave empty user avatars
  // to boards: boards members, card members and assignees have
  // empty users. See:
@@ -509,12 +528,3 @@ template(name="settingsUserPopup")
  //   that does now remove member from board, card members and assignees correctly,
  //   but that should be used to remove user from all boards similarly
  // - wekan/models/users.js Delete is not enabled
-  //li
-  //  br
-  //  br
-  //  hr
-  //li
-  //  form
-  //    label.hide.userId(type="text" value=user._id)
-  //    div.buttonsContainer
-  //      input#deleteButton.card-details-red.right.wide(type="button" value="{{_ 'delete'}}")
@@ -101,9 +101,7 @@ BlazeComponent.extendComponent({
    ];
  },
  filterPeople() {
-    const value = $('#searchInput')
-      .first()
-      .val();
+    const value = $('#searchInput').first().val();
    if (value === '') {
      this.findUsersOptions.set({});
    } else {
@@ -143,14 +141,14 @@ 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() {
    const teams = Team.find(this.findTeamsOptions.get(), {
      fields: { _id: true },
    });
-    this.numberTeams.set(team.count(false));
+    this.numberTeams.set(teams.count(false));
    return teams;
  },
  peopleList() {
@@ -203,7 +201,7 @@ Template.peopleRow.helpers({
  },
 });

-Template.editUserPopup.onCreated(function() {
+Template.editUserPopup.onCreated(function () {
  this.authenticationMethods = new ReactiveVar([]);
  this.errorMessage = new ReactiveVar('');

@@ -215,8 +213,8 @@ Template.editUserPopup.onCreated(function() {
        { value: 'password' },
        // Gets only the authentication methods availables
        ...Object.entries(result)
-          .filter(e => e[1])
-          .map(e => ({ value: e[0] })),
+          .filter((e) => e[1])
+          .map((e) => ({ value: e[0] })),
      ]);
    }
  });
@@ -262,15 +260,15 @@ Template.editUserPopup.helpers({
  },
 });

-Template.newOrgPopup.onCreated(function() {
+Template.newOrgPopup.onCreated(function () {
  this.errorMessage = new ReactiveVar('');
 });

-Template.newTeamPopup.onCreated(function() {
+Template.newTeamPopup.onCreated(function () {
  this.errorMessage = new ReactiveVar('');
 });

-Template.newUserPopup.onCreated(function() {
+Template.newUserPopup.onCreated(function () {
  this.authenticationMethods = new ReactiveVar([]);
  this.errorMessage = new ReactiveVar('');

@@ -282,8 +280,8 @@ Template.newUserPopup.onCreated(function() {
        { value: 'password' },
        // Gets only the authentication methods availables
        ...Object.entries(result)
-          .filter(e => e[1])
-          .map(e => ({ value: e[0] })),
+          .filter((e) => e[1])
+          .map((e) => ({ value: e[0] })),
      ]);
    }
  });
@@ -404,6 +402,92 @@ BlazeComponent.extendComponent({
  },
 }).register('newUserRow');

+Template.editOrgPopup.events({
+  submit(event, templateInstance) {
+    event.preventDefault();
+    const org = Org.findOne(this.orgId);
+
+    const orgDisplayName = templateInstance
+      .find('.js-orgDisplayName')
+      .value.trim();
+    const orgDesc = templateInstance.find('.js-orgDesc').value.trim();
+    const orgShortName = templateInstance.find('.js-orgShortName').value.trim();
+    const orgWebsite = templateInstance.find('.js-orgWebsite').value.trim();
+    const orgIsActive =
+      templateInstance.find('.js-org-isactive').value.trim() == 'true';
+
+    const isChangeOrgDisplayName = orgDisplayName !== org.orgDisplayName;
+    const isChangeOrgDesc = orgDesc !== org.orgDesc;
+    const isChangeOrgShortName = orgShortName !== org.orgShortName;
+    const isChangeOrgWebsite = orgWebsite !== org.orgWebsite;
+    const isChangeOrgIsActive = orgIsActive !== org.orgIsActive;
+
+    if (
+      isChangeOrgDisplayName ||
+      isChangeOrgDesc ||
+      isChangeOrgShortName ||
+      isChangeOrgWebsite ||
+      isChangeOrgIsActive
+    ) {
+      Meteor.call(
+        'setOrgAllFields',
+        org,
+        orgDisplayName,
+        orgDesc,
+        orgShortName,
+        orgWebsite,
+        orgIsActive,
+      );
+    }
+
+    Popup.close();
+  },
+});
+
+Template.editTeamPopup.events({
+  submit(event, templateInstance) {
+    event.preventDefault();
+    const team = Team.findOne(this.teamId);
+
+    const teamDisplayName = templateInstance
+      .find('.js-teamDisplayName')
+      .value.trim();
+    const teamDesc = templateInstance.find('.js-teamDesc').value.trim();
+    const teamShortName = templateInstance
+      .find('.js-teamShortName')
+      .value.trim();
+    const teamWebsite = templateInstance.find('.js-teamWebsite').value.trim();
+    const teamIsActive =
+      templateInstance.find('.js-team-isactive').value.trim() == 'true';
+
+    const isChangeTeamDisplayName = teamDisplayName !== team.teamDisplayName;
+    const isChangeTeamDesc = teamDesc !== team.teamDesc;
+    const isChangeTeamShortName = teamShortName !== team.teamShortName;
+    const isChangeTeamWebsite = teamWebsite !== team.teamWebsite;
+    const isChangeTeamIsActive = teamIsActive !== team.teamIsActive;
+
+    if (
+      isChangeTeamDisplayName ||
+      isChangeTeamDesc ||
+      isChangeTeamShortName ||
+      isChangeTeamWebsite ||
+      isChangeTeamIsActive
+    ) {
+      Meteor.call(
+        'setTeamAllFields',
+        team,
+        teamDisplayName,
+        teamDesc,
+        teamShortName,
+        teamWebsite,
+        teamIsActive,
+      );
+    }
+
+    Popup.close();
+  },
+});
+
 Template.editUserPopup.events({
  submit(event, templateInstance) {
    event.preventDefault();
@@ -421,6 +505,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 +528,7 @@ Template.editUserPopup.events({
        isAdmin: isAdmin === 'true',
        loginDisabled: isActive === 'true',
        authenticationMethod: authentication,
+        importUsernames: Users.parseImportUsernames(importUsernames),
      },
    });

@@ -462,7 +550,7 @@ Template.editUserPopup.events({
        username,
        email.toLowerCase(),
        this.userId,
-        function(error) {
+        function (error) {
          const usernameMessageElement = templateInstance.$('.username-taken');
          const emailMessageElement = templateInstance.$('.email-taken');
          if (error) {
@@ -482,7 +570,7 @@ Template.editUserPopup.events({
        },
      );
    } else if (isChangeUserName) {
-      Meteor.call('setUsername', username, this.userId, function(error) {
+      Meteor.call('setUsername', username, this.userId, function (error) {
        const usernameMessageElement = templateInstance.$('.username-taken');
        if (error) {
          const errorElement = error.error;
@@ -495,20 +583,23 @@ Template.editUserPopup.events({
        }
      });
    } else if (isChangeEmail) {
-      Meteor.call('setEmail', email.toLowerCase(), this.userId, function(
-        error,
-      ) {
-        const emailMessageElement = templateInstance.$('.email-taken');
-        if (error) {
-          const errorElement = error.error;
-          if (errorElement === 'email-already-taken') {
-            emailMessageElement.show();
+      Meteor.call(
+        'setEmail',
+        email.toLowerCase(),
+        this.userId,
+        function (error) {
+          const emailMessageElement = templateInstance.$('.email-taken');
+          if (error) {
+            const errorElement = error.error;
+            if (errorElement === 'email-already-taken') {
+              emailMessageElement.show();
+            }
+          } else {
+            emailMessageElement.hide();
+            Popup.close();
          }
-        } else {
-          emailMessageElement.hide();
-          Popup.close();
-        }
-      });
+        },
+      );
    } else Popup.close();
  },
 });
@@ -516,39 +607,48 @@ Template.editUserPopup.events({
 Template.newOrgPopup.events({
  submit(event, templateInstance) {
    event.preventDefault();
-    const displayName = templateInstance.find('.js-displayName').value.trim();
-    const desc = templateInstance.find('.js-desc').value.trim();
-    const name = templateInstance.find('.js-name').value.trim();
-    const teams = templateInstance.find('.js-teams').value.trim();
-    const website = templateInstance.find('.js-website').value.trim();
-    const isActive = templateInstance.find('.js-profile-isactive').value.trim();
+    const orgDisplayName = templateInstance
+      .find('.js-orgDisplayName')
+      .value.trim();
+    const orgDesc = templateInstance.find('.js-orgDesc').value.trim();
+    const orgShortName = templateInstance.find('.js-orgShortName').value.trim();
+    const orgWebsite = templateInstance.find('.js-orgWebsite').value.trim();
+    const orgIsActive =
+      templateInstance.find('.js-org-isactive').value.trim() == 'true';

    Meteor.call(
      'setCreateOrg',
-      displayName,
-      desc,
-      name,
-      teams,
-      website,
-      isActive,
-      email.toLowerCase(),
-      function(error) {
-        const nameMessageElement = templateInstance.$('.name-taken');
-        if (error) {
-          const errorElement = error.error;
-          if (errorElement === 'name-already-taken') {
-            nameMessageElement.show();
-            emailMessageElement.hide();
-          } else if (errorElement === 'email-already-taken') {
-            usernameMessageElement.hide();
-            emailMessageElement.show();
-          }
-        } else {
-          usernameMessageElement.hide();
-          emailMessageElement.hide();
-          Popup.close();
-        }
-      },
+      orgDisplayName,
+      orgDesc,
+      orgShortName,
+      orgWebsite,
+      orgIsActive,
+    );
+    Popup.close();
+  },
+});
+
+Template.newTeamPopup.events({
+  submit(event, templateInstance) {
+    event.preventDefault();
+    const teamDisplayName = templateInstance
+      .find('.js-teamDisplayName')
+      .value.trim();
+    const teamDesc = templateInstance.find('.js-teamDesc').value.trim();
+    const teamShortName = templateInstance
+      .find('.js-teamShortName')
+      .value.trim();
+    const teamWebsite = templateInstance.find('.js-teamWebsite').value.trim();
+    const teamIsActive =
+      templateInstance.find('.js-team-isactive').value.trim() == 'true';
+
+    Meteor.call(
+      'setCreateTeam',
+      teamDisplayName,
+      teamDesc,
+      teamShortName,
+      teamWebsite,
+      teamIsActive,
    );
    Popup.close();
  },
@@ -559,20 +659,26 @@ Template.newUserPopup.events({
    event.preventDefault();
    const fullname = templateInstance.find('.js-profile-fullname').value.trim();
    const username = templateInstance.find('.js-profile-username').value.trim();
+    const initials = templateInstance.find('.js-profile-initials').value.trim();
    const password = templateInstance.find('.js-profile-password').value;
    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 = Users.parseImportUsernames(
+      templateInstance.find('.js-import-usernames').value,
+    );

    Meteor.call(
      'setCreateUser',
      fullname,
      username,
+      initials,
      password,
      isAdmin,
      isActive,
      email.toLowerCase(),
-      function(error) {
+      importUsernames,
+      function (error) {
        const usernameMessageElement = templateInstance.$('.username-taken');
        const emailMessageElement = templateInstance.$('.email-taken');
        if (error) {
@@ -595,11 +701,27 @@ Template.newUserPopup.events({
  },
 });

+Template.settingsOrgPopup.events({
+  'click #deleteButton'(event) {
+    event.preventDefault();
+    Org.remove(this.orgId);
+    Popup.close();
+  }
+});
+
+Template.settingsTeamPopup.events({
+  'click #deleteButton'(event) {
+    event.preventDefault();
+    Team.remove(this.teamId);
+    Popup.close();
+  }
+});
+
 Template.settingsUserPopup.events({
  'click .impersonate-user'(event) {
    event.preventDefault();

-    Meteor.call('impersonate', this.userId, err => {
+    Meteor.call('impersonate', this.userId, (err) => {
      if (!err) {
        FlowRouter.go('/');
        Meteor.connection.setUserId(this.userId);
@@ -619,21 +741,6 @@ Template.settingsUserPopup.events({
    //   but that should be used to remove user from all boards similarly
    // - wekan/models/users.js Delete is not enabled
    //
-    //console.log('user id: ' + this.userId);
-    //Popup.afterConfirm('userDelete', function(event) {
-    //Boards.find({ members: this.userId }).forEach(board => {
-    //  console.log('board id: ' + board._id);
-      //Cards.find({ boardId: board._id, members: this.userId }).forEach(card => {
-      //  card.unassignMember(this.userId);
-      //});
-      //Cards.find({ boardId: board._id, members: this.userId }).forEach(card => {
-      //  card.unassignMember(this.userId);
-      //});
-      //Cards.find({ boardId: board._id, assignees: this.userId }).forEach(card => {
-      //  card.unassignAssignee(this.userId);
-      //});
-      //Boards.findOne({ boardId: board._id }).removeMember(this.userId);
-    //});
    //Users.remove(this.userId);
    */
    Popup.close();
@@ -13,10 +13,11 @@ template(name="setting")
              a.js-setting-menu(data-id="registration-setting")
                i.fa.fa-sign-in
                | {{_ 'registration'}}
-            li
-              a.js-setting-menu(data-id="email-setting")
-                i.fa.fa-envelope
-                | {{_ 'email'}}
+            unless isSandstorm
+              li
+                a.js-setting-menu(data-id="email-setting")
+                  i.fa.fa-envelope
+                  | {{_ 'email'}}
            li
              a.js-setting-menu(data-id="account-setting")
                i.fa.fa-users
@@ -39,7 +40,8 @@ template(name="setting")
          else if generalSetting.get
            +general
          else if emailSetting.get
-            +email
+            unless isSandstorm
+              +email
          else if accountSetting.get
            +accountSettings
          else if announcementSetting.get
@@ -80,45 +82,48 @@ template(name="general")

 template(name='email')
  ul#email-setting.setting-detail
-    li.smtp-form
-      .title {{_ 'smtp-host'}}
-      .description {{_ 'smtp-host-description'}}
-      .form-group
-        input.wekan-form-control#mail-server-host(type="text", placeholder="smtp.domain.com" value="{{currentSetting.mailServer.host}}")
-    li.smtp-form
-      .title {{_ 'smtp-port'}}
-      .description {{_ 'smtp-port-description'}}
-      .form-group
-        input.wekan-form-control#mail-server-port(type="text", placeholder="25" value="{{currentSetting.mailServer.port}}")
-    li.smtp-form
-      .title {{_ 'smtp-username'}}
-      .form-group
-        input.wekan-form-control#mail-server-username(type="text", placeholder="{{_ 'username'}}" value="{{currentSetting.mailServer.username}}")
-    li.smtp-form
-      .title {{_ 'smtp-password'}}
-      .form-group
-        input.wekan-form-control#mail-server-password(type="password", placeholder="{{_ 'password'}}" value="{{currentSetting.mailServer.password}}")
-    li.smtp-form
-      .title {{_ 'smtp-tls'}}
-      .form-group
-        a.flex.js-toggle-tls
-          .materialCheckBox#mail-server-tls(class="{{#if currentSetting.mailServer.enableTLS}}is-checked{{/if}}")
-
-          span {{_ 'smtp-tls-description'}}
-
-    li.smtp-form
-      .title {{_ 'send-from'}}
-      .form-group
-        input.wekan-form-control#mail-server-from(type="email", placeholder="no-reply@domain.com" value="{{currentSetting.mailServer.from}}")
-
-    li
-      button.js-save.primary {{_ 'save'}}
+    //if isSandstorm
+    //  li.smtp-form
+    //    .title {{_ 'smtp-host'}}
+    //    .description {{_ 'smtp-host-description'}}
+    //    .form-group
+    //      input.wekan-form-control#mail-server-host(type="text", placeholder="smtp.domain.com" value="{{currentSetting.mailServer.host}}")
+    //  li.smtp-form
+    //    .title {{_ 'smtp-port'}}
+    //    .description {{_ 'smtp-port-description'}}
+    //    .form-group
+    //      input.wekan-form-control#mail-server-port(type="text", placeholder="25" value="{{currentSetting.mailServer.port}}")
+    //  li.smtp-form
+    //    .title {{_ 'smtp-username'}}
+    //    .form-group
+    //      input.wekan-form-control#mail-server-username(type="text", placeholder="{{_ 'username'}}" value="{{currentSetting.mailServer.username}}")
+    //  li.smtp-form
+    //    .title {{_ 'smtp-password'}}
+    //    .form-group
+    //      input.wekan-form-control#mail-server-password(type="password", placeholder="{{_ 'password'}}" value="")
+    //  li.smtp-form
+    //    .title {{_ 'smtp-tls'}}
+    //    .form-group
+    //      a.flex.js-toggle-tls
+    //        .materialCheckBox#mail-server-tls(class="{{#if currentSetting.mailServer.enableTLS}}is-checked{{/if}}")
+    //
+    //        span {{_ 'smtp-tls-description'}}
+    //
+    //  li.smtp-form
+    //    .title {{_ 'send-from'}}
+    //    .form-group
+    //      input.wekan-form-control#mail-server-from(type="email", placeholder="no-reply@domain.com" value="{{currentSetting.mailServer.from}}")
+    //
+    //  li
+    //    button.js-save.primary {{_ 'save'}}

    li
      button.js-send-smtp-test-email.primary {{_ 'send-smtp-test'}}

 template(name='accountSettings')
  ul#account-setting.setting-detail
+    li
+      button.js-all-hide-system-messages.primary {{_ 'hide-system-messages-of-all-users'}}
    li.accounts-form
      .title {{_ 'accounts-allowEmailChange'}}
      .form-group.flex
@@ -126,23 +131,18 @@ template(name='accountSettings')
        span {{_ 'yes'}}
        input.wekan-form-control#accounts-allowEmailChange(type="radio" name="allowEmailChange" value="false" checked="{{#unless allowEmailChange}}checked{{/unless}}")
        span {{_ 'no'}}
-    li
-    li.accounts-form
      .title {{_ 'accounts-allowUserNameChange'}}
      .form-group.flex
        input.wekan-form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="true" checked="{{#if allowUserNameChange}}checked{{/if}}")
        span {{_ 'yes'}}
        input.wekan-form-control#accounts-allowUserNameChange(type="radio" name="allowUserNameChange" value="false" checked="{{#unless allowUserNameChange}}checked{{/unless}}")
        span {{_ 'no'}}
-    li
-    li.accounts-form
      .title {{_ 'accounts-allowUserDelete'}}
      .form-group.flex
        input.wekan-form-control#accounts-allowUserDelete(type="radio" name="allowUserDelete" value="true" checked="{{#if allowUserDelete}}checked{{/if}}")
        span {{_ 'yes'}}
        input.wekan-form-control#accounts-allowUserDelete(type="radio" name="allowUserDelete" value="false" checked="{{#unless allowUserDelete}}checked{{/unless}}")
        span {{_ 'no'}}
-    li
      button.js-accounts-save.primary {{_ 'save'}}

 template(name='announcementSettings')
@@ -208,6 +208,10 @@ template(name='layoutSettings')
      .title {{_ 'custom-top-left-corner-logo-height'}}
      .form-group
        input.wekan-form-control#custom-top-left-corner-logo-height(type="text", placeholder="" value="{{currentSetting.customTopLeftCornerLogoHeight}}")
+    li.layout-form
+      .title {{_ 'automatic-linked-url-schemes'}}
+      .form-group
+        textarea#automatic-linked-url-schemes.wekan-form-control= currentSetting.automaticLinkedUrlSchemes
    li
      button.js-save-layout.primary {{_ 'save'}}

@@ -176,6 +176,9 @@ BlazeComponent.extendComponent({
    const textBelowCustomLoginLogo = $('#text-below-custom-login-logo')
      .val()
      .trim();
+    const automaticLinkedUrlSchemes = $('#automatic-linked-url-schemes')
+      .val()
+      .trim();
    const customTopLeftCornerLogoImageUrl = $(
      '#custom-top-left-corner-logo-image-url',
    )
@@ -209,6 +212,7 @@ BlazeComponent.extendComponent({
          customTopLeftCornerLogoHeight,
          displayAuthenticationMethod,
          defaultAuthenticationMethod,
+          automaticLinkedUrlSchemes,
        },
      });
    } catch (e) {
@@ -270,7 +274,6 @@ BlazeComponent.extendComponent({
      $set: { booleanValue: allowUserDelete },
    });
  },
-
  allowEmailChange() {
    return AccountSettings.findOne('accounts-allowEmailChange').booleanValue;
  },
@@ -280,12 +283,31 @@ BlazeComponent.extendComponent({
  allowUserDelete() {
    return AccountSettings.findOne('accounts-allowUserDelete').booleanValue;
  },
+  allHideSystemMessages() {
+    Meteor.call('setAllUsersHideSystemMessages', (err, ret) => {
+      if (!err && ret) {
+        if (ret === true) {
+          const message = `${TAPi18n.__(
+            'now-system-messages-of-all-users-are-hidden',
+          )}`;
+          alert(message);
+        }
+      } else {
+        const reason = err.reason || '';
+        const message = `${TAPi18n.__(err.error)}\n${reason}`;
+        alert(message);
+      }
+    });
+  },

  events() {
    return [
      {
        'click button.js-accounts-save': this.saveAccountsChange,
      },
+      {
+        'click button.js-all-hide-system-messages': this.allHideSystemMessages,
+      },
    ];
  },
 }).register('accountSettings');
@@ -12,6 +12,10 @@ template(name="settingHeaderBar")
        i.fa(class="fa-users")
        span {{_ 'people'}}

+      a.setting-header-btn.informations(href="{{pathFor 'admin-reports'}}")
+        i.fa(class="fa-list")
+        span {{_ 'reports'}}
+
      a.setting-header-btn.informations(href="{{pathFor 'information'}}")
        i.fa(class="fa-info-circle")
        span {{_ 'info'}}
@@ -5,10 +5,6 @@ template(name="sidebar")
    //  title="{{showTongueTitle}}")
    //  i.fa.fa-navicon
    .sidebar-shadow
-      .sidebar-content.sidebar-shortcuts
-        a.board-header-btn.js-shortcuts
-          i.fa.fa-keyboard-o
-          span {{_ 'keyboard-shortcuts' }}
      .sidebar-content.js-board-sidebar-content
        //a.hide-btn.js-hide-sidebar
        //  i.fa.fa-navicon
@@ -23,7 +19,7 @@ template(name='homeSidebar')
  hr
  +labelsWidget
  ul#cards.label-text-hidden
-    a.flex.js-toggle-minicard-label-text
+    a.flex.js-toggle-minicard-label-text(title="{{_ 'hide-minicard-label-text'}}")
      span {{_ 'hide-minicard-label-text'}}
      b &nbsp;
      .materialCheckBox(class="{{#if hiddenMinicardLabelText}}is-checked{{/if}}")
@@ -39,6 +35,12 @@ template(name="membersWidget")
    h3
      i.fa.fa-users
      | {{_ 'members'}}
+
+      .sidebar-shortcuts
+        a.board-header-btn.js-shortcuts(title="{{_ 'keyboard-shortcuts' }}")
+          i.fa.fa-keyboard-o
+          span {{_ 'keyboard-shortcuts' }}
+
      unless currentUser.isCommentOnly
        unless currentUser.isWorker
          a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}").right
@@ -49,10 +51,10 @@ template(name="membersWidget")
        +userAvatar(userId=this.userId showStatus=true)
      if isSandstorm
        if currentUser.isBoardMember
-          a.member.add-member.sandstorm-powerbox-request-identity
+          a.member.add-member.sandstorm-powerbox-request-identity(title="{{_ 'add-members'}}")
            i.fa.fa-plus
      else if currentUser.isBoardAdmin
-        a.member.add-member.js-manage-board-members
+        a.member.add-member.js-manage-board-members(title="{{_ 'add-members'}}")
          i.fa.fa-plus
      .clearfix
  if isInvited
@@ -105,6 +107,14 @@ template(name="boardCardSettingsPopup")
        span
          i.fa.fa-users
          | {{_ 'members'}}
+
+    div.check-div
+      a.flex.js-field-has-creator(class="{{#if allowsCreator}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if allowsCreator}}is-checked{{/if}}")
+        span
+          i.fa.fa-user
+          | {{_ 'creator'}}
+
    div.check-div
      a.flex.js-field-has-assignee(class="{{#if allowsAssignee}}is-checked{{/if}}")
        .materialCheckBox(class="{{#if allowsAssignee}}is-checked{{/if}}")
@@ -354,7 +364,7 @@ template(name="labelsWidget")
              +viewer
                = name
      if currentUser.isBoardAdmin
-        a.card-label.add-label.js-add-label
+        a.card-label.add-label.js-add-label(title="{{_ 'label-create'}}")
          i.fa.fa-plus

 template(name="memberPopup")
@@ -730,6 +730,14 @@ BlazeComponent.extendComponent({
    return this.currentBoard.allowsSubtasks;
  },

+  allowsCreator() {
+    return (
+      this.currentBoard.allowsCreator === null ||
+      this.currentBoard.allowsCreator === undefined ||
+      this.currentBoard.allowsCreator
+    );
+  },
+
  allowsMembers() {
    return this.currentBoard.allowsMembers;
  },
@@ -889,6 +897,19 @@ BlazeComponent.extendComponent({
            this.currentBoard.allowsSubtasks,
          );
        },
+        'click .js-field-has-creator'(evt) {
+          evt.preventDefault();
+          this.currentBoard.allowsCreator = !this.currentBoard.allowsCreator;
+          this.currentBoard.setAllowsCreator(this.currentBoard.allowsCreator);
+          $(`.js-field-has-creator ${MCB}`).toggleClass(
+            CKCLS,
+            this.currentBoard.allowsCreator,
+          );
+          $('.js-field-has-creator').toggleClass(
+            CKCLS,
+            this.currentBoard.allowsCreator,
+          );
+        },
        'click .js-field-has-members'(evt) {
          evt.preventDefault();
          this.currentBoard.allowsMembers = !this.currentBoard.allowsMembers;
@@ -100,13 +100,12 @@
        margin-right: 10px

  .sidebar-shortcuts
-    margin: 0
+    position: absolute
+    margin-left: 40%
    padding: 0
-    top: auto
-    text-align: center
+    top: 7px
    font-size: 0.8em
    line-height: 1.6em
-    vertical-align: middle
    color: darken(white, 40%)

 .board-sidebar
@@ -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
                      | -
@@ -31,24 +31,39 @@ BlazeComponent.extendComponent({
  },

  archivedCards() {
-    return Cards.find({
-      archived: true,
-      boardId: Session.get('currentBoard'),
-    });
+    return Cards.find(
+      {
+        archived: true,
+        boardId: Session.get('currentBoard'),
+      },
+      {
+        sort: { archivedAt: -1, modifiedAt: -1 },
+      },
+    );
  },

  archivedLists() {
-    return Lists.find({
-      archived: true,
-      boardId: Session.get('currentBoard'),
-    });
+    return Lists.find(
+      {
+        archived: true,
+        boardId: Session.get('currentBoard'),
+      },
+      {
+        sort: { archivedAt: -1, modifiedAt: -1 },
+      },
+    );
  },

  archivedSwimlanes() {
-    return Swimlanes.find({
-      archived: true,
-      boardId: Session.get('currentBoard'),
-    });
+    return Swimlanes.find(
+      {
+        archived: true,
+        boardId: Session.get('currentBoard'),
+      },
+      {
+        sort: { archivedAt: -1, modifiedAt: -1 },
+      },
+    );
  },

  cardIsInArchivedList() {
@@ -50,6 +50,15 @@ template(name="createCustomFieldPopup")
            each dropdownItems.get
                input.js-dropdown-item(type="text" value=name placeholder="")
            input.js-dropdown-item.last(type="text" value="" placeholder="{{_ 'custom-field-dropdown-options-placeholder'}}")
+
+        div.js-field-settings.js-field-settings-stringtemplate(class="{{#if isTypeNotSelected 'stringtemplate'}}hide{{/if}}")
+            label
+                | {{_ 'custom-field-stringtemplate-format'}}
+            input.js-field-stringtemplate-format(type="text" value=getStringtemplateFormat)
+            label
+                | {{_ 'custom-field-stringtemplate-separator'}}
+            input.js-field-stringtemplate-separator(type="text" value=getStringtemplateSeparator)
+
        a.flex.js-field-show-on-card(class="{{#if showOnCard}}is-checked{{/if}}")
            .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}")

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

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

  _currencyList: [
    {
@@ -77,6 +85,18 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
        ? this.data().settings.dropdownItems
        : [],
    );
+
+    this.stringtemplateFormat = new ReactiveVar(
+      this.data().settings && this.data().settings.stringtemplateFormat
+        ? this.data().settings.stringtemplateFormat
+        : '',
+    );
+
+    this.stringtemplateSeparator = new ReactiveVar(
+      this.data().settings && this.data().settings.stringtemplateSeparator
+        ? this.data().settings.stringtemplateSeparator
+        : '',
+    );
  },

  types() {
@@ -121,6 +141,14 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
    return items;
  },

+  getStringtemplateFormat() {
+    return this.stringtemplateFormat.get();
+  },
+
+  getStringtemplateSeparator() {
+    return this.stringtemplateSeparator.get();
+  },
+
  getSettings() {
    const settings = {};
    switch (this.type.get()) {
@@ -136,6 +164,14 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
        settings.dropdownItems = dropdownItems;
        break;
      }
+      case 'stringtemplate': {
+        const stringtemplateFormat = this.stringtemplateFormat.get();
+        settings.stringtemplateFormat = stringtemplateFormat;
+
+        const stringtemplateSeparator = this.stringtemplateSeparator.get();
+        settings.stringtemplateSeparator = stringtemplateSeparator;
+        break;
+      }
    }
    return settings;
  },
@@ -158,6 +194,14 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
            evt.target.value = '';
          }
        },
+        'input .js-field-stringtemplate-format'(evt) {
+          const value = evt.target.value;
+          this.stringtemplateFormat.set(value);
+        },
+        'input .js-field-stringtemplate-separator'(evt) {
+          const value = evt.target.value;
+          this.stringtemplateSeparator.set(value);
+        },
        'click .js-field-show-on-card'(evt) {
          let $target = $(evt.target);
          if (!$target.hasClass('js-field-show-on-card')) {
@@ -72,6 +72,43 @@ template(name="filterSidebar")
              | (<span class="username">{{ username }}</span>)
            if Filter.assignees.isSelected _id
              i.fa.fa-check
+
+  hr
+  h3
+    i.fa.fa-list-alt
+    | {{_ 'filter-dates-label' }}
+  ul.sidebar-list
+    li(class="{{#if Filter.dueAt.isSelected 'noDate'}}active{{/if}}")
+      a.name.js-toggle-no-due-date-filter
+        span.sidebar-list-item-description
+          | {{_ 'filter-no-due-date' }}
+        if Filter.dueAt.isSelected 'noDate'
+          i.fa.fa-check
+    li(class="{{#if Filter.dueAt.isSelected 'past'}}active{{/if}}")
+      a.name.js-toggle-overdue-filter
+        span.sidebar-list-item-description
+          | {{_ 'filter-overdue' }}
+        if Filter.dueAt.isSelected 'past'
+          i.fa.fa-check
+    li(class="{{#if Filter.dueAt.isSelected 'today'}}active{{/if}}")
+      a.name.js-toggle-due-today-filter
+        span.sidebar-list-item-description
+          | {{_ 'filter-due-today' }}
+        if Filter.dueAt.isSelected 'today'
+          i.fa.fa-check
+    li(class="{{#if Filter.dueAt.isSelected 'tomorrow'}}active{{/if}}")
+      a.name.js-toggle-due-tomorrow-filter
+        span.sidebar-list-item-description
+          | {{_ 'filter-due-tomorrow' }}
+        if Filter.dueAt.isSelected 'tomorrow'
+          i.fa.fa-check
+    li(class="{{#if Filter.dueAt.isSelected 'week'}}active{{/if}}")
+      a.name.js-toggle-due-this-week-filter
+        span.sidebar-list-item-description
+          | {{_ 'filter-due-this-week' }}
+        if Filter.dueAt.isSelected 'week'
+          i.fa.fa-check
+
  hr
  h3
    i.fa.fa-list-alt
@@ -23,6 +23,31 @@ BlazeComponent.extendComponent({
          Filter.assignees.toggle(this.currentData()._id);
          Filter.resetExceptions();
        },
+        'click .js-toggle-no-due-date-filter'(evt) {
+          evt.preventDefault();
+          Filter.dueAt.noDate();
+          Filter.resetExceptions();
+        },
+        'click .js-toggle-overdue-filter'(evt) {
+          evt.preventDefault();
+          Filter.dueAt.past();
+          Filter.resetExceptions();
+        },
+        'click .js-toggle-due-today-filter'(evt) {
+          evt.preventDefault();
+          Filter.dueAt.today();
+          Filter.resetExceptions();
+        },
+        'click .js-toggle-due-tomorrow-filter'(evt) {
+          evt.preventDefault();
+          Filter.dueAt.tomorrow();
+          Filter.resetExceptions();
+        },
+        'click .js-toggle-due-this-week-filter'(evt) {
+          evt.preventDefault();
+          Filter.dueAt.thisWeek();
+          Filter.resetExceptions();
+        },
        'click .js-toggle-archive-filter'(evt) {
          evt.preventDefault();
          Filter.archive.toggle(this.currentData()._id);
@@ -4,9 +4,9 @@ template(name="searchSidebar")
  .list-body
    .minilists.clearfix.js-minilists
      each (lists)
-        a.minilist-wrapper.js-minilist(href=absoluteUrl)
+        a.minilist-wrapper.js-minilist(href=originRelativeUrl)
          +minilist(this)
    .minicards.clearfix.js-minicards
      each (results)
-        a.minicard-wrapper.js-minicard(href=absoluteUrl)
+        a.minicard-wrapper.js-minicard(href=originRelativeUrl)
          +minicard(this)
@@ -1,5 +1,5 @@
 template(name="swimlaneHeader")
-  .swimlane-header-wrap.js-swimlane-header(class=colorClass)
+  .swimlane-header-wrap.js-swimlane-header(class=colorClass title="{{_ 'rename'}}")
    if this.isTemplateContainer
        +swimlaneFixedHeader(this)
    else
@@ -16,8 +16,8 @@ template(name="swimlaneFixedHeader")
  .swimlane-header-menu
    unless currentUser.isCommentOnly
      if currentUser.isBoardAdmin
-        a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
-        a.fa.fa-navicon.js-open-swimlane-menu
+        a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon(title="{{_ 'add-swimlane'}}")
+        a.fa.fa-navicon.js-open-swimlane-menu(title="{{_ 'swimlaneActionPopup-title'}}")
      unless isMiniScreen
        if showDesktopDragHandles
          a.swimlane-header-handle.handle.fa.fa-arrows.js-swimlane-header-handle
@@ -39,6 +39,10 @@ template(name="swimlaneActionPopup")
      hr
      ul.pop-over-list
        li: a.js-close-swimlane {{_ 'archive-swimlane'}}
+      ul.pop-over-list
+        li: a.js-copy-swimlane {{_ 'copy-swimlane'}}
+      ul.pop-over-list
+        li: a.js-move-swimlane {{_ 'move-swimlane'}}

 template(name="swimlaneAddPopup")
  unless currentUser.isCommentOnly
@@ -54,9 +54,11 @@ Template.swimlaneActionPopup.events({
    this.archive();
    Popup.close();
  },
+  'click .js-move-swimlane': Popup.open('moveSwimlane'),
+  'click .js-copy-swimlane': Popup.open('copySwimlane'),
 });

-Template.swimlaneActionPopup.helpers({
+Template.swimlaneActionPopup.events({
  isCommentOnly() {
    return Meteor.user().isCommentOnly();
  },
@@ -58,6 +58,25 @@ template(name="addListForm")
                    | {{_ 'or'}}
                    a.js-list-template {{_ 'template'}}
          else
-            a.open-list-composer.js-open-inlined-form
+            a.open-list-composer.js-open-inlined-form(title="{{_ 'add-list'}}")
              i.fa.fa-plus
-              | {{_ 'add-list'}}
+
+template(name="moveSwimlanePopup")
+  unless currentUser.isWorker
+    label {{_ 'boards'}}:
+    select.js-select-boards(autofocus)
+      each toBoard in toBoards
+        option(value="{{toBoard._id}}") {{toBoard.title}}
+
+  .edit-controls.clearfix
+    button.primary.confirm.js-done {{_ 'done'}}
+
+template(name="copySwimlanePopup")
+  unless currentUser.isWorker
+    label {{_ 'boards'}}:
+    select.js-select-boards(autofocus)
+      each toBoard in toBoards
+        option(value="{{toBoard._id}}" selected="{{#if $eq toBoard.title board.title}}1{{/if}}") {{toBoard.title}}
+
+  .edit-controls.clearfix
+    button.primary.confirm.js-done {{_ 'done'}}
@@ -323,3 +323,55 @@ BlazeComponent.extendComponent({
    initSortable(boardComponent, $listsDom);
  },
 }).register('listsGroup');
+
+class MoveSwimlaneComponent extends BlazeComponent {
+  serverMethod = 'moveSwimlane';
+
+  onCreated() {
+    this.currentSwimlane = this.currentData();
+  }
+
+  board() {
+    return Boards.findOne(Session.get('currentBoard'));
+  }
+
+  toBoardsSelector() {
+    return {
+      archived: false,
+      'members.userId': Meteor.userId(),
+      type: 'board',
+      _id: { $ne: this.board()._id },
+    };
+  }
+
+  toBoards() {
+    return Boards.find(this.toBoardsSelector(), { sort: { title: 1 } });
+  }
+
+  events() {
+    return [
+      {
+        'click .js-done'() {
+          // const swimlane = Swimlanes.findOne(this.currentSwimlane._id);
+          const bSelect = $('.js-select-boards')[0];
+          let boardId;
+          if (bSelect) {
+            boardId = bSelect.options[bSelect.selectedIndex].value;
+            Meteor.call(this.serverMethod, this.currentSwimlane._id, boardId);
+          }
+          Popup.close();
+        },
+      },
+    ];
+  }
+}
+MoveSwimlaneComponent.register('moveSwimlanePopup');
+
+(class extends MoveSwimlaneComponent {
+  serverMethod = 'copySwimlane';
+  toBoardsSelector() {
+    const selector = super.toBoardsSelector();
+    delete selector._id;
+    return selector;
+  }
+}.register('copySwimlanePopup'));
@@ -1,5 +1,5 @@
 template(name="userAvatar")
-  a.member.js-member(title="{{userData.profile.fullname}} ({{userData.username}}) {{_ memberType}}")
+  a.member(class="js-{{#if assignee}}assignee{{else}}member{{/if}}" title="{{userData.profile.fullname}} ({{userData.username}}) {{_ memberType}}")
    if userData.profile.avatarUrl
      img.avatar.avatar-image(src="{{userData.profile.avatarUrl}}")
    else
@@ -72,9 +72,10 @@ template(name="cardMemberPopup")
        h3= user.profile.fullname
        p.quiet @{{ user.username }}
    ul.pop-over-list
-      if currentUser.isNotCommentOnly
-        if currentUser.isNotWorker
-          li: a.js-remove-member {{_ 'remove-member-from-card'}}
+      unless noRemove
+        if currentUser.isNotCommentOnly
+          if currentUser.isNotWorker
+            li: a.js-remove-member {{_ 'remove-member-from-card'}}

      if $eq currentUser._id user._id
        with currentUser
@@ -1,3 +1,7 @@
+import Cards from '/models/cards';
+import Avatars from '/models/avatars';
+import Users from '/models/users';
+
 Template.userAvatar.helpers({
  userData() {
    // We need to handle a special case for the search results provided by the
@@ -30,10 +34,6 @@ Template.userAvatar.helpers({
  },
 });

-Template.userAvatar.events({
-  'click .js-change-avatar': Popup.open('changeAvatar'),
-});
-
 Template.userAvatarInitials.helpers({
  initials() {
    const user = Users.findOne(this.userId);
@@ -9,7 +9,6 @@ avatar-radius = 50%
  float: left
  height: 30px
  width: @height
-  margin: 0 4px 4px 0
  cursor: pointer
  user-select: none
  z-index: 1
@@ -1,6 +1,6 @@
 template(name="headerUserBar")
  #header-user-bar
-    a.header-user-bar-name.js-open-header-member-menu
+    a.header-user-bar-name.js-open-header-member-menu(title="{{_ 'memberMenuPopup-title'}}")
      .header-user-bar-avatar
        +userAvatar(userId=currentUser._id)
      unless isMiniScreen
@@ -25,10 +25,6 @@ template(name="memberMenuPopup")
        a.js-global-search(href="{{pathFor 'global-search'}}")
          i.fa.fa-search
          | {{_ 'globalSearch-title'}}
-      li
-        a.js-broken-cards(href="{{pathFor 'broken-cards'}}")
-          i.fa.fa-chain-broken
-          | {{_ 'broken-cards'}}
      li
        a(href="{{pathFor 'home'}}")
          span.fa.fa-home
@@ -143,7 +139,7 @@ template(name="changeSettingsPopup")
        label.bold.clear
          i.fa.fa-sort-numeric-asc
          | {{_ 'show-cards-minimum-count'}}
-        input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="0" max="99" onkeydown="return false")
+        input#show-cards-count-at.inline-input.left(type="number" value="#{showCardsCountAt}" min="-1")
        label.bold.clear
          i.fa.fa-calendar
          | {{_ 'start-day-of-week'}}
@@ -168,10 +168,34 @@ Template.changeLanguagePopup.helpers({
      let name = lang.name;
      if (lang.name === 'br') {
        name = 'Brezhoneg';
+      } else if (lang.name === 'ar-EG') {
+        // ar-EG = Arabic (Egypt), simply Masri (مَصرى, [ˈmɑsˤɾi], Egyptian, Masr refers to Cairo)
+        name = 'مَصرى';
+      } else if (lang.name === 'fa-IR') {
+        // fa-IR = Persian (Iran)
+        name = 'فارسی/پارسی (ایران‎)';
+      } else if (lang.name === 'de-CH') {
+        name = 'Deutsch (Schweiz)';
+      } else if (lang.name === 'fr-BE') {
+        name = 'Français (Belgique)';
+      } else if (lang.name === 'fr-CA') {
+        name = 'Français (Canada)';
      } else if (lang.name === 'ig') {
        name = 'Igbo';
+      } else if (lang.name === 'lv') {
+        name = 'Latviešu';
+      } else if (lang.name === 'latviešu valoda') {
+        name = 'Latviešu';
      } else if (lang.name === 'Español') {
        name = 'español';
+      } else if (lang.name === 'es_419') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'es-419') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'Español de América Latina') {
+        name = 'español de América Latina';
+      } else if (lang.name === 'es-LA') {
+        name = 'español de América Latina';
      } else if (lang.name === 'Español de Argentina') {
        name = 'español de Argentina';
      } else if (lang.name === 'Español de Chile') {
@@ -182,12 +206,16 @@ Template.changeLanguagePopup.helpers({
        name = 'español de México';
      } else if (lang.name === 'es-PY') {
        name = 'español de Paraguayo';
+      } else if (lang.name === 'Español de Paraguayo') {
+        name = 'español de Paraguayo';
      } else if (lang.name === 'Español de Perú') {
        name = 'español de Perú';
      } else if (lang.name === 'Español de Puerto Rico') {
        name = 'español de Puerto Rico';
      } else if (lang.name === 'oc') {
        name = 'Occitan';
+      } else if (lang.name === 'st') {
+        name = 'Sãotomense';
      } else if (lang.name === '繁体中文（台湾）') {
        name = '繁體中文（台灣）';
      }
@@ -213,6 +241,7 @@ Template.changeLanguagePopup.events({
        'profile.language': this.tag,
      },
    });
+    TAPi18n.setLanguage(this.tag);
    event.preventDefault();
  },
 });
@@ -270,6 +299,13 @@ Template.changeSettingsPopup.helpers({
 });

 Template.changeSettingsPopup.events({
+  'keypress/paste #show-cards-count-at'() {
+    let keyCode = event.keyCode;
+    let charCode = String.fromCharCode(keyCode);
+    let regex = new RegExp('[-0-9]');
+    let ret = regex.test(charCode);
+    return ret;
+  },
  'click .js-toggle-desktop-drag-handles'() {
    currentUser = Meteor.user();
    if (currentUser) {
@@ -292,7 +328,7 @@ Template.changeSettingsPopup.events({
  },
  'click .js-apply-user-settings'(event, templateInstance) {
    event.preventDefault();
-    const minLimit = parseInt(
+    let minLimit = parseInt(
      templateInstance.$('#show-cards-count-at').val(),
      10,
    );
@@ -301,6 +337,9 @@ Template.changeSettingsPopup.events({
      10,
    );
    const currentUser = Meteor.user();
+    if (isNaN(minLimit) || minLimit < -1) {
+      minLimit = -1;
+    }
    if (!isNaN(minLimit)) {
      if (currentUser) {
        Meteor.call('changeLimitToShowCardsCount', minLimit);
@@ -0,0 +1,189 @@
+import Cards from '../../models/cards';
+import SessionData from '../../models/usersessiondata';
+
+export class CardSearchPagedComponent extends BlazeComponent {
+  onCreated() {
+    this.searching = new ReactiveVar(false);
+    this.hasResults = new ReactiveVar(false);
+    this.hasQueryErrors = new ReactiveVar(false);
+    this.query = new ReactiveVar('');
+    this.resultsHeading = new ReactiveVar('');
+    this.searchLink = new ReactiveVar(null);
+    this.results = new ReactiveVar([]);
+    this.hasNextPage = new ReactiveVar(false);
+    this.hasPreviousPage = new ReactiveVar(false);
+    this.resultsCount = 0;
+    this.totalHits = 0;
+    this.queryErrors = null;
+    this.resultsPerPage = 25;
+    this.sessionId = SessionData.getSessionId();
+    this.subscriptionHandle = null;
+    this.serverError = new ReactiveVar(false);
+
+    const that = this;
+    this.subscriptionCallbacks = {
+      onReady() {
+        that.getResults();
+        that.searching.set(false);
+        that.hasResults.set(true);
+        that.serverError.set(false);
+      },
+      onError(error) {
+        that.searching.set(false);
+        that.hasResults.set(false);
+        that.serverError.set(true);
+        // eslint-disable-next-line no-console
+        console.log('Error.reason:', error.reason);
+        // eslint-disable-next-line no-console
+        console.log('Error.message:', error.message);
+        // eslint-disable-next-line no-console
+        console.log('Error.stack:', error.stack);
+      },
+    };
+  }
+
+  resetSearch() {
+    this.searching.set(false);
+    this.results.set([]);
+    this.hasResults.set(false);
+    this.hasQueryErrors.set(false);
+    this.resultsHeading.set('');
+    this.serverError.set(false);
+    this.resultsCount = 0;
+    this.totalHits = 0;
+    this.queryErrors = null;
+  }
+
+  getSessionData(sessionId) {
+    return SessionData.findOne({
+      sessionId: sessionId ? sessionId : SessionData.getSessionId(),
+    });
+  }
+
+  getResults() {
+    // eslint-disable-next-line no-console
+    // console.log('getting results');
+    const sessionData = this.getSessionData();
+    // eslint-disable-next-line no-console
+    console.log('session data:', sessionData);
+    const cards = [];
+    sessionData.cards.forEach(cardId => {
+      cards.push(Cards.findOne({ _id: cardId }));
+    });
+    this.queryErrors = sessionData.errors;
+    if (this.queryErrors.length) {
+      // console.log('queryErrors:', this.queryErrorMessages());
+      this.hasQueryErrors.set(true);
+      // return null;
+    }
+
+    if (cards) {
+      this.totalHits = sessionData.totalHits;
+      this.resultsCount = cards.length;
+      this.resultsStart = sessionData.lastHit - this.resultsCount + 1;
+      this.resultsEnd = sessionData.lastHit;
+      this.resultsHeading.set(this.getResultsHeading());
+      this.results.set(cards);
+      this.hasNextPage.set(sessionData.lastHit < sessionData.totalHits);
+      this.hasPreviousPage.set(
+        sessionData.lastHit - sessionData.resultsCount > 0,
+      );
+      return cards;
+    }
+
+    this.resultsCount = 0;
+    return null;
+  }
+
+  stopSubscription() {
+    if (this.subscriptionHandle) {
+      this.subscriptionHandle.stop();
+    }
+  }
+
+  getSubscription(queryParams) {
+    return Meteor.subscribe(
+      'globalSearch',
+      this.sessionId,
+      queryParams.params,
+      queryParams.text,
+      this.subscriptionCallbacks,
+    );
+  }
+
+  runGlobalSearch(queryParams) {
+    this.searching.set(true);
+    this.stopSubscription();
+    this.subscriptionHandle = this.getSubscription(queryParams);
+  }
+
+  queryErrorMessages() {
+    const 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;
+  }
+
+  nextPage() {
+    this.searching.set(true);
+    this.stopSubscription();
+    this.subscriptionHandle = Meteor.subscribe(
+      'nextPage',
+      this.sessionId,
+      this.subscriptionCallbacks,
+    );
+  }
+
+  previousPage() {
+    this.searching.set(true);
+    this.stopSubscription();
+    this.subscriptionHandle = Meteor.subscribe(
+      'previousPage',
+      this.sessionId,
+      this.subscriptionCallbacks,
+    );
+  }
+
+  getResultsHeading() {
+    if (this.resultsCount === 0) {
+      return TAPi18n.__('no-cards-found');
+    } else if (this.resultsCount === 1) {
+      return TAPi18n.__('one-card-found');
+    } else if (this.resultsCount === this.totalHits) {
+      return TAPi18n.__('n-cards-found', this.resultsCount);
+    }
+
+    return TAPi18n.__('n-n-of-n-cards-found', {
+      start: this.resultsStart,
+      end: this.resultsEnd,
+      total: this.totalHits,
+    });
+  }
+
+  getSearchHref() {
+    const baseUrl = window.location.href.replace(/([?#].*$|\s*$)/, '');
+    return `${baseUrl}?q=${encodeURIComponent(this.query.get())}`;
+  }
+
+  events() {
+    return [
+      {
+        'click .js-next-page'(evt) {
+          evt.preventDefault();
+          this.nextPage();
+        },
+        'click .js-previous-page'(evt) {
+          evt.preventDefault();
+          this.previousPage();
+        },
+      },
+    ];
+  }
+}
@@ -1,14 +1,22 @@
-DatePicker = BlazeComponent.extendComponent({
+// Helper function to replace HH with H for 24 hours format, because H allows also single-digit hours
+function adjustedTimeFormat() {
+  return moment
+    .localeData()
+    .longDateFormat('LT')
+    .replace(/HH/i, 'H');
+}
+
+export class DatePicker extends BlazeComponent {
  template() {
    return 'datepicker';
-  },
+  }

  onCreated(defaultTime = '1970-01-01 08:00:00') {
    this.error = new ReactiveVar('');
    this.card = this.data();
    this.date = new ReactiveVar(moment.invalid());
    this.defaultTime = defaultTime;
-  },
+  }

  startDayOfWeek() {
    const currentUser = Meteor.user();
@@ -17,7 +25,7 @@ DatePicker = BlazeComponent.extendComponent({
    } else {
      return 1;
    }
-  },
+  }

  onRendered() {
    const $picker = this.$('.js-datepicker')
@@ -34,7 +42,7 @@ DatePicker = BlazeComponent.extendComponent({
          this.error.set('');
          const timeInput = this.find('#time');
          timeInput.focus();
-          if (!timeInput.value) {
+          if (!timeInput.value && this.defaultTime) {
            const currentHour = evt.date.getHours();
            const defaultMoment = moment(
              currentHour > 0 ? evt.date : this.defaultTime,
@@ -47,22 +55,22 @@ DatePicker = BlazeComponent.extendComponent({
    if (this.date.get().isValid()) {
      $picker.datepicker('update', this.date.get().toDate());
    }
-  },
+  }

  showDate() {
    if (this.date.get().isValid()) return this.date.get().format('L');
    return '';
-  },
+  }
  showTime() {
    if (this.date.get().isValid()) return this.date.get().format('LT');
    return '';
-  },
+  }
  dateFormat() {
    return moment.localeData().longDateFormat('L');
-  },
+  }
  timeFormat() {
    return moment.localeData().longDateFormat('LT');
-  },
+  }

  events() {
    return [
@@ -77,7 +85,11 @@ DatePicker = BlazeComponent.extendComponent({
        },
        'keyup .js-time-field'() {
          // parse for localized time format in strict mode
-          const dateMoment = moment(this.find('#time').value, 'LT', true);
+          const dateMoment = moment(
+            this.find('#time').value,
+            adjustedTimeFormat(),
+            true,
+          );
          if (dateMoment.isValid()) {
            this.error.set('');
          }
@@ -89,16 +101,28 @@ DatePicker = BlazeComponent.extendComponent({
          const time =
            evt.target.time.value ||
            moment(new Date().setHours(12, 0, 0)).format('LT');
-
+          const newTime = moment(time, adjustedTimeFormat(), true);
+          const newDate = moment(evt.target.date.value, 'L', true);
          const dateString = `${evt.target.date.value} ${time}`;
-          const newDate = moment(dateString, 'L LT', true);
-          if (newDate.isValid()) {
-            this._storeDate(newDate.toDate());
-            Popup.close();
-          } else {
+          const newCompleteDate = moment(
+            dateString,
+            `L ${adjustedTimeFormat()}`,
+            true,
+          );
+          if (!newTime.isValid()) {
+            this.error.set('invalid-time');
+            evt.target.time.focus();
+          }
+          if (!newDate.isValid()) {
            this.error.set('invalid-date');
            evt.target.date.focus();
          }
+          if (newCompleteDate.isValid()) {
+            this._storeDate(newCompleteDate.toDate());
+            Popup.close();
+          } else if (!this.error) {
+            this.error.set('invalid');
+          }
        },
        'click .js-delete-date'(evt) {
          evt.preventDefault();
@@ -107,5 +131,5 @@ DatePicker = BlazeComponent.extendComponent({
        },
      },
    ];
-  },
-});
+  }
+}