v4.78

Updated translations.
Limit visibility of Global Search, My Cards and Due Cards to logged in users, because they do not work without logging in.
2021-01-16 05:08:10 +02:00 · 2021-01-16 05:03:07 +02:00 · 2021-01-16 04:59:17 +02:00 · 2021-01-16 04:54:54 +02:00 · 2021-01-16 03:13:00 +02:00 · 2021-01-16 03:10:20 +02:00
213 changed files with 57891 additions and 43076 deletions
@@ -1,12 +1,16 @@
-FROM ubuntu:rolling
+FROM quay.io/wekan/ubuntu:groovy-20201125.2
 LABEL maintainer="sgr"

+# 2020-12-03:
+# - Above Ubuntu base image copied from Docker Hub ubuntu:groovy-20201125.2
+#   to Quay to avoid Docker Hub rate limits.
+
 ENV BUILD_DEPS="gnupg gosu bsdtar wget curl bzip2 g++ build-essential python git ca-certificates iproute2"
 ENV DEBIAN_FRONTEND=noninteractive

 ENV \
    DEBUG=false \
-    NODE_VERSION=v12.18.3 \
+    NODE_VERSION=v12.20.1 \
    METEOR_RELEASE=1.10.2 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
@@ -39,6 +43,7 @@ ENV \
    TRUSTED_URL="" \
    WEBHOOKS_ATTRIBUTES="" \
    OAUTH2_ENABLED=false \
+    OAUTH2_CA_CERT="" \
    OAUTH2_ADFS_ENABLED=false \
    OAUTH2_LOGIN_STYLE=redirect \
    OAUTH2_CLIENT_ID="" \
@@ -81,7 +81,7 @@ parts:
    wekan:
        source: .
        plugin: nodejs
-        node-engine: 12.18.3
+        node-engine: 12.20.1
        node-packages:
            - node-gyp
            - node-pre-gyp
@@ -83,7 +83,7 @@ parts:
    wekan:
        source: .
        plugin: nodejs
-        node-engine: 12.18.3
+        node-engine: 12.20.1
        node-packages:
            - node-gyp
            - node-pre-gyp
@@ -5,6 +5,7 @@
 tmp/
 node_modules/
 npm-debug.log
+.gitmodules
 .vscode/
 .idea/
 .build/*
@@ -6,8 +6,8 @@
 meteor-base@1.4.0

 # Build system
-ecmascript@0.14.3
-standard-minifier-css@1.6.0
+ecmascript@0.14.4
+standard-minifier-css@1.7.1
 standard-minifier-js@2.6.0
 mquandalle:jade
 coffeescript@2.4.1!
@@ -23,7 +23,7 @@ dburles:collection-helpers
 idmontie:migrations
 matb33:collection-hooks
 matteodem:easy-search
-mongo@1.10.0
+mongo@1.10.1
 mquandalle:collection-mutations

 # Account system
@@ -72,17 +72,15 @@ simple:rest-accounts-password
 useraccounts:core
 email@2.0.0
 horka:swipebox
-dynamic-import@0.5.2
-staringatlights:fast-render
+dynamic-import@0.5.5

-accounts-password@1.6.2
+accounts-password@1.6.3
 cfs:gridfs
 rzymek:fullcalendar
 momentjs:moment@2.22.2
 browser-policy-framing@1.1.0
 mquandalle:moment
 msavin:usercache
-mdg:meteor-apm-agent@3.2.0-rc.0!
 # Keep stylus in 1.1.0, because building v2 takes extra 52 minutes.
 coagmano:stylus@1.1.0!
 lucasantoniassi:accounts-lockout
@@ -95,6 +93,55 @@ konecty:mongo-counter
 percolate:synced-cron
 easylogic:summernote
 cfs:filesystem
-ostrio:cookies
 tmeasday:check-npm-versions
-wekan-meteor-accounts-saml
+steffo:meteor-accounts-saml
+rajit:bootstrap3-datepicker-fi
+rajit:bootstrap3-datepicker-ar
+rajit:bootstrap3-datepicker-bg
+rajit:bootstrap3-datepicker-br
+rajit:bootstrap3-datepicker-ca
+rajit:bootstrap3-datepicker-cs
+rajit:bootstrap3-datepicker-da
+rajit:bootstrap3-datepicker-de
+rajit:bootstrap3-datepicker-el
+rajit:bootstrap3-datepicker-en-gb
+rajit:bootstrap3-datepicker-eo
+rajit:bootstrap3-datepicker-es
+rajit:bootstrap3-datepicker-eu
+rajit:bootstrap3-datepicker-fa
+rajit:bootstrap3-datepicker-fr
+rajit:bootstrap3-datepicker-gl
+rajit:bootstrap3-datepicker-he
+rajit:bootstrap3-datepicker-hi
+rajit:bootstrap3-datepicker-hu
+rajit:bootstrap3-datepicker-hy
+rajit:bootstrap3-datepicker-id
+rajit:bootstrap3-datepicker-it
+rajit:bootstrap3-datepicker-ja
+rajit:bootstrap3-datepicker-ka
+rajit:bootstrap3-datepicker-km
+rajit:bootstrap3-datepicker-ko
+rajit:bootstrap3-datepicker-lv
+rajit:bootstrap3-datepicker-mk
+rajit:bootstrap3-datepicker-mn
+rajit:bootstrap3-datepicker-nb
+rajit:bootstrap3-datepicker-nl
+rajit:bootstrap3-datepicker-oc
+rajit:bootstrap3-datepicker-pl
+rajit:bootstrap3-datepicker-pt-br
+rajit:bootstrap3-datepicker-pt
+rajit:bootstrap3-datepicker-ro
+rajit:bootstrap3-datepicker-ru
+rajit:bootstrap3-datepicker-sl
+rajit:bootstrap3-datepicker-sr
+rajit:bootstrap3-datepicker-sv
+rajit:bootstrap3-datepicker-sw
+rajit:bootstrap3-datepicker-ta
+rajit:bootstrap3-datepicker-th
+rajit:bootstrap3-datepicker-tr
+rajit:bootstrap3-datepicker-uk
+rajit:bootstrap3-datepicker-vi
+rajit:bootstrap3-datepicker-zh-cn
+rajit:bootstrap3-datepicker-zh-tw
+staringatlights:fast-render
+spacebars
@@ -1 +1 @@
-METEOR@1.11
+METEOR@1.12.1
@@ -1,7 +1,7 @@
 3stack:presence@1.1.2
-accounts-base@1.7.0
+accounts-base@1.7.1
 accounts-oauth@1.2.0
-accounts-password@1.6.2
+accounts-password@1.6.3
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
@@ -11,7 +11,7 @@ allow-deny@1.1.0
 arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
 autoupdate@1.6.0
-babel-compiler@7.5.3
+babel-compiler@7.5.5
 babel-runtime@1.5.0
 base64@1.0.12
 binary-heap@1.0.11
@@ -55,9 +55,9 @@ ddp-rate-limiter@1.0.9
 ddp-server@2.3.2
 deps@1.0.12
 diff-sequence@1.1.1
-dynamic-import@0.5.2
+dynamic-import@0.5.5
 easylogic:summernote@0.8.8
-ecmascript@0.14.3
+ecmascript@0.14.4
 ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.11.0
 ecmascript-runtime-server@0.10.0
@@ -91,7 +91,6 @@ logging@1.1.20
 lucasantoniassi:accounts-lockout@1.0.0
 matb33:collection-hooks@0.9.1
 matteodem:easy-search@1.6.4
-mdg:meteor-apm-agent@3.3.0
 mdg:validation-error@0.5.1
 meteor@1.9.3
 meteor-base@1.4.0
@@ -104,14 +103,14 @@ meteorspark:util@0.2.0
 minifier-css@1.5.3
 minifier-js@2.6.0
 minifiers@1.1.8-faster-rebuild.0
-minimongo@1.6.0
+minimongo@1.6.1
 mobile-status-bar@1.1.0
 modern-browsers@0.1.5
 modules@0.15.0
 modules-runtime@0.12.0
-momentjs:moment@2.28.0
-mongo@1.10.0
-mongo-decimal@0.1.1
+momentjs:moment@2.29.1
+mongo@1.10.1
+mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
 mongo-id@1.0.7
 mongo-livedata@1.0.12
@@ -127,12 +126,11 @@ mquandalle:mousetrap-bindglobal@0.0.1
 msavin:usercache@1.8.0
 npm-bcrypt@0.9.3
 npm-mongo@3.8.1
-oauth@1.3.0
+oauth@1.3.2
 oauth2@1.3.0
 observe-sequence@1.0.16
 ongoworks:speakingurl@1.1.0
 ordered-dict@1.1.0
-ostrio:cookies@2.6.0
 peerlibrary:assert@0.3.0
 peerlibrary:base-component@0.16.0
 peerlibrary:blaze-components@0.15.1
@@ -143,11 +141,59 @@ promise@0.11.2
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
 rajit:bootstrap3-datepicker@1.7.1_1
+rajit:bootstrap3-datepicker-ar@1.7.1
+rajit:bootstrap3-datepicker-bg@1.7.1
+rajit:bootstrap3-datepicker-br@1.7.1
+rajit:bootstrap3-datepicker-ca@1.7.1
+rajit:bootstrap3-datepicker-cs@1.7.1
+rajit:bootstrap3-datepicker-da@1.7.1
+rajit:bootstrap3-datepicker-de@1.7.1
+rajit:bootstrap3-datepicker-el@1.7.1
+rajit:bootstrap3-datepicker-en-gb@1.7.1
+rajit:bootstrap3-datepicker-eo@1.7.1
+rajit:bootstrap3-datepicker-es@1.7.1
+rajit:bootstrap3-datepicker-eu@1.7.1
+rajit:bootstrap3-datepicker-fa@1.7.1
+rajit:bootstrap3-datepicker-fi@1.7.1
+rajit:bootstrap3-datepicker-fr@1.7.1
+rajit:bootstrap3-datepicker-gl@1.7.1
+rajit:bootstrap3-datepicker-he@1.7.1
+rajit:bootstrap3-datepicker-hi@1.7.1
+rajit:bootstrap3-datepicker-hu@1.7.1
+rajit:bootstrap3-datepicker-hy@1.7.1
+rajit:bootstrap3-datepicker-id@1.7.1
+rajit:bootstrap3-datepicker-it@1.7.1
+rajit:bootstrap3-datepicker-ja@1.7.1
+rajit:bootstrap3-datepicker-ka@1.7.1
+rajit:bootstrap3-datepicker-km@1.7.1
+rajit:bootstrap3-datepicker-ko@1.7.1
+rajit:bootstrap3-datepicker-lv@1.7.1
+rajit:bootstrap3-datepicker-mk@1.7.1
+rajit:bootstrap3-datepicker-mn@1.7.1
+rajit:bootstrap3-datepicker-nb@1.7.1
+rajit:bootstrap3-datepicker-nl@1.7.1
+rajit:bootstrap3-datepicker-oc@1.7.1
+rajit:bootstrap3-datepicker-pl@1.7.1
+rajit:bootstrap3-datepicker-pt@1.7.1
+rajit:bootstrap3-datepicker-pt-br@1.7.1
+rajit:bootstrap3-datepicker-ro@1.7.1
+rajit:bootstrap3-datepicker-ru@1.7.1
+rajit:bootstrap3-datepicker-sl@1.7.1
+rajit:bootstrap3-datepicker-sr@1.7.1
+rajit:bootstrap3-datepicker-sv@1.7.1
+rajit:bootstrap3-datepicker-sw@1.7.1
+rajit:bootstrap3-datepicker-ta@1.7.1
+rajit:bootstrap3-datepicker-th@1.7.1
+rajit:bootstrap3-datepicker-tr@1.7.1
+rajit:bootstrap3-datepicker-uk@1.7.1
+rajit:bootstrap3-datepicker-vi@1.7.1
+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
 reactive-dict@1.3.0
 reactive-var@1.0.11
-reload@1.3.0
+reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.0
 rzymek:fullcalendar@3.8.0
@@ -166,10 +212,11 @@ softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.1.0
-standard-minifier-css@1.6.1
+standard-minifier-css@1.7.1
 standard-minifier-js@2.6.0
 staringatlights:fast-render@3.3.0
 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
@@ -192,7 +239,6 @@ wekan-accounts-cas@0.1.0
 wekan-accounts-oidc@1.0.10
 wekan-ldap@0.0.2
 wekan-markdown@1.0.9
-wekan-meteor-accounts-saml@0.0.18
 wekan-oidc@1.0.12
 yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2
@@ -3,7 +3,7 @@ sudo: required

 env:
  TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
-  TRAVIS_NODE_VERSION: 12.18.3
+  TRAVIS_NODE_VERSION: 12.20.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 = bg_BG:bg, en_GB:en-GB, es_AR:es-AR, es_CL:es-CL, es_PE:es-PE, 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 = 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

 [wekan.application]
 file_filter = i18n/<lang>.i18n.json
@@ -1,3 +1,718 @@
+# v4.78 2021-01-16 Wekan release
+
+This release adds the following new features:
+
+- [Search All Boards](https://github.com/wekan/wekan/pull/3433). Currently limited to 50 results. Will be improved later.
+  Thanks to jrsuplee and xet7.
+
+and fixes the following bugs:
+
+- [HTML is not needed in Rules translations, so disabled it](https://github.com/wekan/wekan/commit/a2894bf0cb11161f2f9382e900ffbae2a1570d38).
+  Thanks to jrsuplee and xet7.
+- [Limit amount of data in publications where possible](https://github.com/wekan/wekan/commit/4115d62bac882ceaaec531b1f9df2666097be51a).
+  Thanks to xet7.
+- [Fixed Display issues with assignee on minicard](https://github.com/wekan/wekan/commit/aa34da61fe80a2ab2a87b6413b3b9c25fb8ea96f).
+  Thanks to bronger and xet7.
+- [Limit visibility of Global Search, My Cards and Due Cards to logged in users, because they do not work without
+  logging in](https://github.com/wekan/wekan/commit/4180224fd9841a3e6cab9eacb1447978482e1e91).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.77 2021-01-13 Wekan release
+
+This release adds the following new features:
+
+- [Show membertype (admin, normal etc) in avatar/initials tooltip for board members](https://github.com/wekan/wekan/commit/afd5d1d0c0a14702a2ea6960a58b78153975dc0d).
+  Thanks to bronger and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.76 2021-01-13 Wekan release
+
+This release adds the following new features:
+
+- [Try to allow links to onenote, mailspring and file](https://github.com/wekan/wekan/commit/3977f2187aa4dc0bd9ddfcd02065437df0f1a5c0).
+  Thanks to lime918, rgalonso, ocdtrekkie, gkarachuk and xet7.
+
+and adds the following improvements:
+
+- [Removed wekan- from export filenames for whitelabeling](https://github.com/wekan/wekan/commit/de27be0911053195838d6d0d4f1b6eae8a1d773a).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.75 2021-01-11 Wekan release
+
+This release adds the following CRITICAL SECURITY FIXES:
+
+- [Due Cards and Broken Cards: In All Users view, fixed to show cards only from other users Public Boards. Not anymore from private
+  boards](https://github.com/wekan/wekan/commit/801d0aacf00eace05ec70d6f0229f2a752f119cd).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Upgrade to Meteor 1.12.1](https://github.com/wekan/wekan/commit/3105548c98091773e86e4556c2980d5f533e98f1).
+  Thanks to Meteor developers.
+    
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.74 2021-01-10 Wekan release
+
+This release adds the following improvements:
+
+- [My Cards and Due Cards: Added popup title and horizontal line between menu
+  options](https://github.com/wekan/wekan/commit/9293de541b3fcccee52751808f0e95b04986c1bb).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.73 2021-01-10 Wekan release
+
+This release adds the following new features:
+
+- [Broken Cards](https://github.com/wekan/wekan/pull/3426) for debugging.
+  Thanks to jrsupplee.
+- ["Broken Cards" to be translatable](https://github.com/wekan/wekan/commit/d09e448fbd37ae84419aa3909b9a4594cd7ddb92).
+  Thanks to xet7.
+- [Added Broken Cards to User Settings menu](https://github.com/wekan/wekan/commit/b98df8ef87fc0c501d4f06e3e5af292605bd21cf).
+  Thanks to xet7.
+
+and adds the following improvements:
+
+- [My Cards: Make code forgiving of possible null values for a card's board, swimlane, or list.
+  Added a new Due Cards page that displays cards with a Due date for either just the user or all
+  users](https://github.com/wekan/wekan/pull/3425).
+  Thanks to jrsupplee.
+
+and fixes the following bugs:
+
+- [Fixed Spanish language names to lowercase español](https://github.com/wekan/wekan/commit/9ec1904119e6bec4c00600cb8ea81c28e631ae2e).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.72 2021-01-09 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed badges at readme](https://github.com/wekan/wekan/pull/3421).
+  Thanks to kuchengrab.
+- [Changed Sandstorm menus to be more similar like other Wekan versions, make Export visible, etc](https://github.com/wekan/wekan/commit/103d03d4c86df445b9d28d506f7d3098ab56368b).
+  Thanks to PizzaProgram and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.71 2021-01-08 Wekan release
+
+This release adds the following new features:
+
+- [My Cards add Due Date sort](https://github.com/wekan/wekan/pull/3419).
+  Thanks to jrsupplee.
+
+and adds the following improvements:
+
+- [Update to My Cards](https://github.com/wekan/wekan/pulls/3416).
+  Thanks to jrsupplee.
+- [Cards, custom fields are displayed in alphabetic order](https://github.com/wekan/wekan/pulls/3417).
+  Thanks to mfilser.
+
+and fixes the following bugs:
+
+- [Fixed Color picker of lists is empty. Fixed error about existing file at Wekan Docker version](https://github.com/wekan/wekan/issues/3418).
+  Thanks to bronger and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.70 2021-01-04 Wekan release
+
+This release adds the following CRITICAL SECURITY FIXES:
+
+- [Upgrade to Node.js 12.20.1](https://github.com/wekan/wekan/commit/4bfe017b08f573991fd1f9229ae53573798f475e).
+  Thanks to Node developers.
+
+and adds the following new features:
+
+- [Added many new translations to Wekan, now there is total 60 translations in Wekan. Updated translations. Organized pull-translations.sh alphabetically by
+  language name](https://github.com/wekan/wekan/commit/d171f4088f40512d321969df3f0c280a620c0c5f).
+  Thanks to translators and xet7.
+- [Added markdown and emoji to My Cards board, swimlane and list names](https://github.com/wekan/wekan/commit/763dc9c8e0122990c5f496392f2cce980c535dce).
+  Thanks to xet7.
+- [Show Admin Panel / People and Version also on mobile MiniScreen](https://github.com/wekan/wekan/commit/754a91dbdc3d7111c367cb5dd0a02250a837e42a).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.69 2021-01-02 Wekan release
+
+This release adds the following new features:
+
+- Teams/Organizations to Admin Panel. In Progress.
+  [Part 2](https://github.com/wekan/wekan/commit/ad482d5cfb72591f1b5c749c3c0156000dbf660a).
+  [Part 3](https://github.com/wekan/wekan/commit/b64cd358ed0af4395357423ad172b8dac9dc3178).
+  Thanks to xet7.
+- [My Cards](https://github.com/wekan/wekan/pull/3413).
+  Thanks to jrsupplee.
+
+and adds the following UI changes:
+
+- [Moved Public/Archive/Templates/etc options to click right top username Member Settings menu, where My Cards also
+  is](https://github.com/wekan/wekan/commit/0592b0c56ac372c87dea17f0a090e7d7569430d1).
+  Thanks to xet7.
+- [Reorder My Cards to be first at menu](https://github.com/wekan/wekan/commit/bfc16fc5442e8cc8c3cc03df992d5b1d1724338b).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [New Checklistitems are now autoresized too](https://github.com/wekan/wekan/pull/3411).
+  Thanks to mfilser.
+- [Swimlane + and = Icons resized for better handling at mobile view](https://github.com/wekan/wekan/pull/3412).
+  Thanks to mfilser.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.68 2020-12-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Checklist-Items, Drag-Drop Handle now at the left side](https://github.com/wekan/wekan/pull/3407).
+  Thanks to mfilser.
+- [Checklist-Items, Autoresize the textarea vertically to fit the user-input](https://github.com/wekan/wekan/pull/3408).
+  Thanks to mfilser.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.67 2020-12-29 Wekan release
+
+This release adds the following new features:
+
+- Teams/Organizations to Admin Panel. In Progress.
+  [Part 1](https://github.com/wekan/wekan/commit/9e2093d6aed38e66fc4d63823315c9382e013a32).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Checklist Mini-Screen, appendTo: 'parent' not necessary anymore](https://github.com/wekan/wekan/pull/3405).
+  Thanks to mfilser.
+- [Allow to edit email verified and initials at Admin Panel/People/People](https://github.com/wekan/wekan/commit/d03e2170dd10741bd78722cc35b52cffa220a2e7).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.66 2020-12-27 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Mobile miniscreen: Drag handle not visible in long checklist item
+  text](https://github.com/wekan/wekan/commit/a8453657c95a4bde2ae86b4c77e55bb2174adf26).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.65 2020-12-26 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed Drag and drop between checklists closes the card sometimes on
+  Firefox](https://github.com/wekan/wekan/commit/c7808c5c03f98eae709e5ef89e8e17af4689cb2e).
+  xet7 thanks mfilser about [similar fix of appendTo parent](https://github.com/wekan/wekan/pull/3342)
+  that did work here too to fix this.
+  Thanks to mfilser and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.64 2020-12-24 Wekan release
+
+This release fixes the following bugs:
+
+- [Dark theme button background fix](https://github.com/wekan/wekan/pull/3401).
+  Thanks to jasontamez.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.63 2020-12-21 Wekan release
+
+This release fixes the following bugs:
+
+- [Fixed Remove Cover button gives JS error](https://github.com/wekan/wekan/commit/28850e5510f2aaefcae404efac1973c12f1cca65).
+  Thanks to tsukasa1989 and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.62 2020-12-18 Wekan release
+
+This release fixes the following bugs:
+
+- [Treat unknown attachment types as binary on board
+  import/clone](https://github.com/wekan/wekan/pull/3395).
+  Thanks to daniel-eder.
+- [Fix Move card from a board to another does not work anymore](https://github.com/wekan/wekan/commit/9dd0fb88d6cb3378a8fc96aaf60214020efeaed1).
+  Thanks to lezioul and xet7.
+- [Add some permission code, to see does it fix something](https://github.com/wekan/wekan/commit/7f3c4acf62deefa2f7b36b986e06336fd3b2754f).
+  Thanks to xet7.
+- [Fix delete board button not visible](https://github.com/wekan/wekan/commit/53a925cf7ff95167cbf2f65f7c7e169e18b14b44).
+  Thanks to airtraxx and xet7.
+- [Board: When removing member from board, remove also from assignees.
+  Admin Panel/People: 1) Allow edit user that does not have email address.
+  2) When creating new user, require username and email address, and save also fullname.
+  3) Some in progress code for deleting user, that does not work correctly yet, so deleting user is not enabled
+  yet](https://github.com/wekan/wekan/commit/61ae62a83aaddb2c6f679ce9d05b675c845ba8bf).
+  Thanks to airtraxx and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.61 2020-12-16 Wekan release
+
+This release fixes the following bugs:
+
+- [Removed cookie code that is not in use](https://github.com/wekan/wekan/commit/3c406d955ec602d4b86c164acb9e94e715086f8e).
+  Thanks to xet7.
+- [Allow normal user to delete checklist item](https://github.com/wekan/wekan/commit/f9ba17177e8f1146be1e571f47d26c13a9337034).
+  Thanks to Samunosuke and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.60 2020-12-15 Wekan release
+
+This release adds the following updates:
+
+- Update dependencies.
+  [Part 1](https://github.com/wekan/wekan/commit/2e1e703e3591258462b3167f72e2b2319bf57bec),
+  [Part 2](https://github.com/wekan/wekan/commit/a75c162483795775db1631686f8e7017b42c87ca).
+  Thanks to developers of dependencies.
+
+and fixes the following bugs:
+
+- Prevent normal user deleting or modifying too much. Allow normal user to export board.
+  [Part1](https://github.com/wekan/wekan/commit/4a205fcfcb40438faead3bf8973b10b8e42974f0),
+  [Part2](https://github.com/wekan/wekan/commit/6cb4b9fe4a086202d642de54464088e0a1122ec0).
+  Thanks to Samunosuke, pgh2357 and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.59 2020-12-10 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix not all checklist items being imported/cloned](https://github.com/wekan/wekan/pull/3389).
+  Thanks to daniel-eder.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.58 2020-12-09 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix issues when duplicating board](https://github.com/wekan/wekan/pull/3387).
+  Thanks to daniel-eder.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.57 2020-12-08 Wekan release
+
+This release adds the following new features:
+
+- [Helm: Introduce secretEnv for secret value provisioning](https://github.com/wekan/wekan/pull/3382).
+  Thanks to ThoreKr.
+- REST API: List attachments of a board, with download URLs of attachments. In Progress.
+  [Part 1](https://github.com/wekan/wekan/commit/bf94161f30adf9dec6aa41af6946ba54c1573a44),
+  [Part 2](https://github.com/wekan/wekan/commit/2ec53b27d14049bc9622861492cac301512a1e33),
+  [Part 3](https://github.com/wekan/wekan/commit/36e29a405ee943d15e6e1bd9ac02ecefb7a7a06f).
+  For using this, Python code example:
+  https://github.com/wekan/wekan/wiki/New-card-with-Python3-and-REST-API .
+  Thanks to xet7.
+- REST API: Added Wekan REST API Python CLI, for adding card, etc. In Progress,
+  downloading attachments does not work yet.
+  [Part1](https://github.com/wekan/wekan/commit/051f7b2769c51404063e7f0ddf85fbd0f9508a88),
+  [Part2](https://github.com/wekan/wekan/commit/387f0600ce1389aab955cc125d331dcd5eeeafdd).
+  Thanks to xet7.
+- [Drag handles at checklist items on mobile view](https://github.com/wekan/wekan/pull/3342).
+  Thanks to mfilser.
+
+and adds the following updates:
+
+- [Upgrade to Meteor 1.12](https://github.com/wekan/wekan/commit/7a6abaac44b1235021dc7cc25e3224515c64a068).
+  Thanks to Meteor developers.
+- [Upgrade to Node 12.20.0](https://github.com/wekan/wekan/commit/015f4d671d136a4a344fe82e2a6bcbe0c2be6cfd).
+  Thanks to Node developers.
+
+and fixes the following bugs:
+
+- [Fixed Quay Docker builds that failed](https://github.com/wekan/wekan/issues/3380)
+  because of Docker Hub rate limits by copying base images from Docker Hub to Quay.
+  [Part1](https://github.com/wekan/wekan/commit/4537971300c6ffcc85b7dd930867eb942bd22f86),
+  [Part2](https://github.com/wekan/wekan/commit/2b2884d996b8fc6101eff50db058639631eb5945),
+  [Part3](https://github.com/wekan/wekan/commit/c09758fb913d73e9229f43d17663b3c4715a62b9).
+  Thanks to xet7.
+- [Hide duplicate create board button, because it did not show board templates
+  correctly](https://github.com/wekan/wekan/commit/a7977a8fc7f171d046a228f81fb0cd481b0ccc41).
+  Thanks to xet7.
+- [Minicard, reduce space after assignees label](https://github.com/wekan/wekan/pull/3385).
+  Thanks to mfilser.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.56 2020-11-30 Wekan release
+
+This release adds the following new features:
+
+- [Added date notification icons](https://github.com/wekan/wekan/pull/3366).
+  This partially resolves [#3363](https://github.com/wekan/wekan/issues/3363).
+  Thanks to helioguardabaxo.
+- Attempt to implement date activities notification [Part1](https://github.com/wekan/wekan/pull/3372)
+  and [Part2](https://github.com/wekan/wekan/pull/3373).
+  Thanks to helioguardabaxo.
+- [Sticky swimlane](https://github.com/wekan/wekan/pull/3370).
+  Thanks to progressify and xet7.
+- [1) New default: sudo snap set wekan mongo-log-destination='devnull'.
+  Other options: syslog/snapcommon.
+  This should lower amount of disk usage and logs.
+  2) Tried to fix command:
+  `sudo snap set wekan mongo-url='...'`](https://github.com/wekan/wekan/commit/5510c2a37dc6bcfa0ec588eceb8dc9f32cec9851).
+  Thanks to xet7.
+
+and adds the following improvements:
+
+- [Improvements in activities design](https://github.com/wekan/wekan/pull/3374).
+  Thanks to helioguardabaxo.
+
+and fixes the following bugs:
+
+- [Fix typo on MONGO_URL on Snap](https://github.com/wekan/wekan/commit/05a72f7c627e05ac4ce38cb9588f2aac45273ce8).
+  Thanks to xet7.
+- [Fix: Update helm mongodb dependency](https://github.com/wekan/wekan/pull/3369).
+  Thanks to jiangytcn.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.55 2020-11-21 Wekan release
+
+This release adds the following improvements:
+
+- [Set minimum height to icons at All Boards page](https://github.com/wekan/wekan/commit/6193a0b64e85df2f2353192e7efb16680b436622).
+  Thanks to xet7.
+- [Increase avatar size](https://github.com/wekan/wekan/pull/3360).
+  Thanks to centralhardware.
+- [Modern Dark theme: card details as lightbox](https://github.com/wekan/wekan/pull/3359).
+  Thanks to jghaanstra.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.54 2020-11-17 Wekan release
+
+This release adds the following new features:
+
+- [Add keyboard shortcut / for search](https://github.com/wekan/wekan/pull/3354).
+  Thanks to helioguardabaxo.
+- [Added back variable auto height of icons at All Boards page](https://github.com/wekan/wekan/commit/9dbb10c59b4bb1b16b7942cc0b60741a1fbe9110).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Upgrade to Node.js 12.19.1](https://github.com/wekan/wekan/commit/f786afc4b9d0e5e4a057b5f3d7995377873022cf).
+  Thanks to Node.js developers.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.53 2020-11-15 Wekan release
+
+This release adds the following updates:
+
+- [Use Quay for Docker builds, because Docker Hub builds show ENOMEM error](https://github.com/wekan/wekan/commit/22501749da708a51b89ef9ff0aee4ac6ba529ed9).
+  Thanks to xet7.
+- [Update Docker upgrade info](https://github.com/wekan/wekan/commit/d0040754ea75a26926a187ce47dbe529a15e0926).
+  Thanks to xet7.
+- [Use latest MongoDB on Docker](https://github.com/wekan/wekan/commit/8250cbcf6e417d21ffdc4f14495792768b0bc9ef).
+  Thanks to xet7.
+- [In rebuild-wekan.sh install dependencies, Install npm](https://github.com/wekan/wekan/commit/345e2357c8fd030e943f9729f790db980d3a727c).
+  Thanks to xet7.
+- [In rebuild-wekan.sh install dependencies, uncomment chown](https://github.com/wekan/wekan/commit/21aebe845f3f4911d9bb824f0f33bdb19a3a9af6).
+  Thanks to xet7.
+- [Update markdown-it and markdown-it-emoji dependencies](https://github.com/wekan/wekan/commit/222fca3ad7aa2b67329dca64e84eb72899fd8137).
+  Thanks to developers of markdown-it and markdown-it-emoji.
+
+and adds the following improvements:
+
+- [Minor improvements to Modern Dark theme](https://github.com/wekan/wekan/pull/3348).
+  Thanks to jghaanstra.
+- [Added missing bottom padding to lists](https://github.com/wekan/wekan/pull/3351).
+  Thanks to danger89.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.52 2020-11-12 Wekan release
+
+This release adds the following improvements:
+
+- [Some more small improvements to Modern Dark theme](https://github.com/wekan/wekan/pull/3346).
+  Thanks to jghaanstra.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.51 2020-11-11 Wekan release
+
+This release adds the following new features:
+
+- [Board admin can edit and delete comments as well](https://github.com/wekan/wekan/pull/3340).
+  Thanks to mfilser.
+- [Drag handles for checklist](https://github.com/wekan/wekan/pull/3341).
+  Thanks to mfilser.
+- [Custom URL Schemes autolinked](https://github.com/wekan/wekan/pull/3339).
+  Thanks to brian-j.
+
+and adds the following improvements:
+
+- [Improvements to Modern Dark Theme](https://github.com/wekan/wekan/pull/3344).
+  Thanks to jghaanstra.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.50 2020-11-10 Wekan release
+
+This release adds the following new features:
+
+- Add 'Modern Dark' theme [Part1](https://github.com/wekan/wekan/pulls/3335)
+  and [Part2](https://github.com/wekan/wekan/commit/6801c960b115be4265bf18ba05c444ac79aef887).
+  Thanks to jghaanstra, helioguardabaxo and xet7.
+
+and fixes the following bugs:
+
+- [Fix edit description to require only one click](https://github.com/wekan/wekan/commit/0ef248574c2751be1245c5748a9cbbe5ba2969b5).
+  Thanks to uusijani and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.49 2020-11-04 Wekan release
+
+This release adds the following new features:
+
+- [LDAP: Sync email address](https://github.com/wekan/wekan/pull/3329).
+  Thanks to gramakri.
+
+and adds the following changes:
+
+- [Changed board icons bigger at All Boards page](https://github.com/wekan/wekan/commit/76273300e749ebe3b1d711dee84336d03b31ed49).
+  Thanks to xet7.
+
+and adds the following translations:
+
+- [Translate some part of Gantt chart of Wekan Gantt GPL version](https://github.com/wekan/wekan/commit/fd363c69cc6e1cf3a283e3dbcc323edb1eae896e).
+  This only adds translations to all Wekan versions, not any GPL code to MIT version.
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix Trello import](https://github.com/wekan/wekan/commit/faad739f974a0392ca73e4db03e5267edcc5dec7).
+  Thanks to elct9620 and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.48 2020-11-02 Wekan release
+
+This release adds the following new features:
+
+- [Smaller board icons to All Boards Page, and use full page width, so more board icons fit visible at once.
+  Removed variable height, because different heights made it look a little unbalanced](https://github.com/wekan/wekan/commit/0a5f9307d27a4b77aa7ff005701fea8ce0d50ec8).
+  Thanks to xet7.
+- [Admin Panel / Settings / Layout / Custom Top Left Corner Logo Height](https://github.com/wekan/wekan/commit/4cfddf1d8d37bdbbb58c050333ee6ea2afc3e6f9).
+  Thanks to xet7.
+- [When RICHER_CARD_COMMENT_EDITOR=true, use richer editor also when editing card description](https://github.com/wekan/wekan/commit/4e2d337620ac490b8e99ee968e6f92477e09b900).
+  Thanks to xet7.
+
+and removes the following dependencies:
+
+- [Removed hot-module-replacement and mdg:meteor-apm-agent](https://github.com/wekan/wekan/commit/aa454a5542e5ab1d581eef50cdb5c96ac2ada940).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix Clone Board](https://github.com/wekan/wekan/commit/f4fdb94a3fcd63432ef7ded4df970b3491700020).
+  Thanks to e-gaulue and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.47 2020-11-01 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix: OAuth2 fails with self-signed server certificate](https://github.com/wekan/wekan/pull/3325) and
+  [Added related settings for OAUTH2_CA_CERT that is optional OAuth2 CA Cert](https://github.com/wekan/wekan/commit/55252300c601ea40dc8adad1887397b31ceb0bb2).
+  Thanks to faust64 and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.46 2020-10-30 Wekan release
+
+This release adds the following updates:
+
+- [Upgrade to Meteor 2.0-beta.4](https://github.com/wekan/wekan/commit/af583145ed2b36af8e6c72765fd35d70a292fad6).
+  Thanks to Meteor developers.
+
+and fixes the following bugs:
+
+- [Fix: Use current boardId when a worker moves a card](https://github.com/wekan/wekan/pull/3323).
+  Thanks to jtbairdsr.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.45 2020-10-30 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix can not upload and download files, by changing back to Node.js 12.19.0 and adding
+  fast-render](https://github.com/wekan/wekan/commit/d2f434879caa20d69651f23fa2124074f55c9893).
+  Current file storing to MongoDB code was not yet compatible with newer Node.js.
+  Thanks to eskogito and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.44 2020-10-28 Wekan release
+
+This release adds the following new features:
+
+- For development, [add Meteor 2.0 Hot Module Replacement](https://github.com/wekan/wekan/commit/e6162472548d9dff497dd76e82d23044f779f757).
+  More info at https://forums.meteor.com/t/meteor-2-0-beta-with-hot-module-replacement-hmr/54313/8 .
+  Thanks to zodern.
+
+and adds the following updates:
+
+- [Upgrade to Node.js 14.15.0](https://github.com/wekan/wekan/commit/045e9db7b8f0de852ef4486cb1ad200d6ca7296d).
+  Thanks to Node.js and Meteor.js developers.
+- [Upgrade to Meteor 2.0-beta.3. Removed fast-render and ostrio:cookies](https://github.com/wekan/wekan/commit/a463f2a855498935db5b66e5fad446ce465adab1).
+  Thanks to Meteor.js developers and xet7.
+
+and fixes the following bugs:
+
+- [Fixed: With ORACLE_OIM_ENABLED, allow setting OAUTH2_REQUEST_PERMISSIONS with environment variable](https://github.com/wekan/wekan/commit/1b429b3f99c32840ebb0ff9a29015aa8c28ec644).
+  Thanks to xet7.
+- [Changed public board changing Swimlanes/Lists/Calendar view and changing Hide minicard label text
+  from using cookies to using browser localStorage](https://github.com/wekan/wekan/commit/460b1d3a664b648bc03c40422b9d175401e229c1),
+  to remove some errors from browser inspect console.
+  Thanks to xet7.
+- [Fix Modern theme board canvas background](https://github.com/wekan/wekan/pull/3312).
+  Thanks to helioguardabaxo.
+- [Fix: 1) Expose moving cards on mobile to workers. 2) Hide the move to another board functionality
+  in the submenu (only from the worker) so that the worker is still constrained to a single
+  board](https://github.com/wekan/wekan/pull/3315).
+  Thanks to jtbairdsr.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.43 2020-10-20 Wekan release
+
+This release adds the following new features:
+
+- [Allow more than one assignee](https://github.com/wekan/wekan/commit/acf9e7caeaf59e1030ae1014c0cb2fb7dae27147).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fixed CSV/TSV export](https://github.com/wekan/wekan/commit/d7333dec84328ca191f430d96aaf9e550840631a).
+  Please test and report any problems [at issue #3173](https://github.com/wekan/wekan/issues/3173).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.42 2020-10-14 Wekan release
+
+This release adds the following updates:
+
+- [Upgrade to Node.js 12.19.0](https://github.com/wekan/wekan/commit/b8a209249e968b90917af319adf24fedf2157396).
+  Thanks to Node.js developers.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.41 2020-10-03 Wekan release
+
+This release adds the following new features:
+
+- [Login with OIDC OAuth2 Oracle on premise identity manager OIM, with setting ORACLE_OIM_ENABLED=true](https://github.com/wekan/wekan/commit/ec8a78537f1dc40e967de36a02ea09cf7398318a).
+  More info [at wiki](https://github.com/wekan/wekan/wiki/Oracle-OIM).
+  Thanks to xet7.
+- [At Admin Panel / Layout: Text below Custom Login Logo. Can have markdown formatting](https://github.com/wekan/wekan/commit/7223d6e75057d1412862a97b8a43c34ec23b16e9).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Update dependencies](https://github.com/wekan/wekan/commit/b796a6cbf4911c14ff036a51db0252e08d3a5ef8).
+  Thanks to developers of dependencies.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.40 2020-09-18 Wekan release
+
+This release adds the following new features:
+
+- Custom Logo for Login and Top Left Corner. Optional link when clicking logo.
+  Settings at Admin Panel / Layout.
+  [Part 1](https://github.com/wekan/wekan/commit/a7c3317ed696fad8e211b22afbb3012f3a4f2ddb),
+  [Part 2](https://github.com/wekan/wekan/commit/05e3fc31b4633978a6b002a0325aad8e74d57ec4),
+  [Part 3](https://github.com/wekan/wekan/commit/3fc80e1145b23f8e6c7492ef4e3313b02f3d8772).
+  Thanks to xet7.
+
+and adds the following updates:
+
+- [Upgrade to Meteor v1.11.1](https://github.com/wekan/wekan/commit/185cf163b23280af5a7910381209984e2362a452).
+  Thanks to Meteor developers.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.39 2020-09-17 Wekan release
+
+This release adds the following new features:
+
+- [Impersonate one user](https://github.com/wekan/wekan/pull/3280) and
+  [related translatable strings](https://github.com/wekan/wekan/commit/81ac0fdba9b52477dbbe7b6ed01b6d299288bcca).
+  Thanks to Akuket and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.38 2020-09-16 Wekan release
+
+This release fixes the following CRITICAL VULNERABILITIES:
+
+- [Upgrade to Node.js v12.18.4](https://github.com/wekan/wekan/commit/5cd9f89b21e6f800c2b78da49a1c0cf7f6fba955).
+  Thanks to Node.js developers.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.37 2020-09-15 Wekan release
+
+This release adds the following UI improvements:
+
+- [UI improvements in filter, multi-selection and rules](https://github.com/wekan/wekan/pull/3279).
+  Thanks to helioguardabaxo and xet7.
+
+and adds the following updates:
+
+- [Update release scripts](https://github.com/wekan/wekan/commit/e79b7fad0a35f29020c48a4a4eedb435573c9bf1).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix parse error in docker-compose.yml](https://github.com/wekan/wekan/pull/3278).
+  Thanks to devilmengcry.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.36 2020-09-15 Wekan release
+
+This release adds the following new features:
+
+- [Added translations for date selection popups](https://github.com/wekan/wekan/commit/f9b0da65f1de48a2af11aa7afbd767559ba95b79).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v4.35 2020-09-14 Wekan release
+
+This release tries to fix the following bugs:
+
+- [Try to fix Snap](https://github.com/wekan/wekan/commit/7173e293ef6b0d3c1fe82b5320340589c72c9326).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v4.34 2020-09-14 Wekan release

 This release tries to fix the following bugs:
@@ -1,6 +1,10 @@
-FROM ubuntu:rolling
+FROM quay.io/wekan/ubuntu:groovy-20201125.2
 LABEL maintainer="wekan"

+# 2020-12-03:
+# - Above Ubuntu base image copied from Docker Hub ubuntu:groovy-20201125.2
+#   to Quay to avoid Docker Hub rate limits.
+
 # Set the environment variables (defaults where required)
 # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
 # ENV BUILD_DEPS="paxctl"
@@ -8,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.18.3 \
+    NODE_VERSION=v12.20.1 \
    METEOR_RELEASE=1.10.2 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
@@ -41,6 +45,7 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
    TRUSTED_URL="" \
    WEBHOOKS_ATTRIBUTES="" \
    OAUTH2_ENABLED=false \
+    OAUTH2_CA_CERT="" \
    OAUTH2_ADFS_ENABLED=false \
    OAUTH2_LOGIN_STYLE=redirect \
    OAUTH2_CLIENT_ID="" \
@@ -130,7 +135,8 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
    SAML_PUBLIC_CERTFILE="" \
    SAML_IDENTIFIER_FORMAT="" \
    SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE="" \
-    SAML_ATTRIBUTES=""
+    SAML_ATTRIBUTES="" \
+    ORACLE_OIM_ENABLED=false

 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app
@@ -4,7 +4,7 @@ FROM amd64/alpine:3.7 AS builder
 ENV QEMU_VERSION=v4.2.0-6 \
    QEMU_ARCHITECTURE=aarch64 \
    NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.18.3 \
+    NODE_VERSION=v12.20.1 \
    WEKAN_VERSION=3.96  \
    WEKAN_ARCHITECTURE=arm64

@@ -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.18.3 \
+    NODE_VERSION=v12.20.1 \
    NODE_ENV=production \
    NPM_VERSION=latest \
    WITH_API=true \
@@ -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 50 languages.
+- Wekan has been [translated](https://transifex.com/wekan/wekan) to about 60 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.
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v4.34.0"
+appVersion: "v4.78.0"
 files:
  userUploads:
    - README.md
@@ -0,0 +1,251 @@
+#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
+# vi:ts=4:et
+
+# Wekan API Python CLI, originally from here, where is more details:
+# https://github.com/wekan/wekan/wiki/New-card-with-Python3-and-REST-API
+
+try:
+    # python 3
+    from urllib.parse import urlencode
+except ImportError:
+    # python 2
+    from urllib import urlencode
+
+import json
+import requests
+import sys
+
+arguments = len(sys.argv) - 1
+
+if arguments == 0:
+    print("=== Wekan API Python CLI: Shows IDs for addcard ===")
+    print("AUTHORID is USERID that writes card.")
+    print("If *nix:  chmod +x api.py => ./api.py users")
+    print("Syntax:")
+    print("  python3 api.py users              # All users")
+    print("  python3 api.py boards USERID      # Boards of USERID")
+    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 createlist BOARDID LISTTITLE # Create list")
+    print("  python3 api.py addcard AUTHORID BOARDID SWIMLANEID LISTID CARDTITLE CARDDESCRIPTION")
+    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")
+    exit
+
+# ------- SETTINGS START -------------
+
+# Username is your Wekan username or email address.
+# OIDC/OAuth2 etc uses email address as username.
+
+username = 'testtest'
+
+password = 'testtest'
+
+wekanurl = 'http://localhost:4000/'
+
+# ------- SETTINGS END -------------
+
+"""
+EXAMPLE:
+
+python3 api.py
+
+OR:
+chmod +x api.py
+./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 createlist BOARDID LISTTITLE # Create list
+  python3 api.py addcard AUTHORID BOARDID SWIMLANEID LISTID CARDTITLE CARDDESCRIPTION
+  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
+
+=== USERS ===
+
+python3 api.py users
+
+=> abcd1234
+
+=== BOARDS ===
+
+python3 api.py boards abcd1234
+
+
+=== SWIMLANES ===
+
+python3 api.py swimlanes dYZ
+
+[{"_id":"Jiv","title":"Default"}
+]
+
+=== LISTS ===
+
+python3 api.py lists dYZ
+
+[]
+
+There is no lists, so create a list:
+
+=== CREATE LIST ===
+
+python3 api.py createlist dYZ 'Test'
+
+{"_id":"7Kp"}
+
+#  python3 api.py addcard AUTHORID BOARDID SWIMLANEID LISTID CARDTITLE CARDDESCRIPTION
+
+python3 api.py addcard ppg dYZ Jiv 7Kp 'Test card' 'Test description'
+
+=== LIST ATTACHMENTS WITH DOWNLOAD URLs ====
+
+python3 api.py listattachments BOARDID
+
+"""
+
+# ------- API URL GENERATION START -----------
+
+loginurl = 'users/login'
+wekanloginurl = wekanurl + loginurl
+apiboards = 'api/boards/'
+apiattachments = 'api/attachments/'
+apiusers = 'api/users'
+e = 'export'
+s = '/'
+l = 'lists'
+sw = 'swimlane'
+sws = 'swimlanes'
+cs = 'cards'
+bs = 'boards'
+atl = 'attachmentslist'
+at = 'attachment'
+ats = 'attachments'
+users = wekanurl + apiusers
+
+# ------- API URL GENERATION END -----------
+
+# ------- LOGIN TOKEN START -----------
+
+data = {"username": username, "password": password}
+body = requests.post(wekanloginurl, data=data)
+d = body.json()
+apikey = d['token']
+
+# ------- LOGIN TOKEN END -----------
+
+if arguments == 7:
+
+    if sys.argv[1] == 'addcard':
+        # ------- WRITE TO CARD START -----------
+        authorid = sys.argv[2]
+        boardid = sys.argv[3]
+        swimlaneid = sys.argv[4]
+        listid = sys.argv[5]
+        cardtitle = sys.argv[6]
+        carddescription = sys.argv[7]
+        cardtolist = wekanurl + apiboards + boardid + s + l + s + listid + s + cs
+        # Write to card
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        post_data = {'authorId': '{}'.format(authorid), 'title': '{}'.format(cardtitle), 'description': '{}'.format(carddescription), 'swimlaneId': '{}'.format(swimlaneid)}
+        body = requests.post(cardtolist, data=post_data, headers=headers)
+        print(body.text)
+        # ------- WRITE TO CARD END -----------
+
+if arguments == 3:
+
+    if sys.argv[1] == 'createlist':
+
+        # ------- CREATE LIST START -----------
+        boardid = sys.argv[2]
+        listtitle = sys.argv[3]
+        list = wekanurl + apiboards + boardid + s + l
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        post_data = {'title': '{}'.format(listtitle)}
+        body = requests.post(list, data=post_data, headers=headers)
+        print("=== CREATE LIST ===\n")
+        print(body.text)
+        # ------- CREATE LIST END -----------
+
+if arguments == 2:
+
+    # ------- BOARDS LIST START -----------
+    userid = sys.argv[2]
+    boards = users + s + userid + s + bs
+    if sys.argv[1] == 'boards':
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        #post_data = {'userId': '{}'.format(userid)}
+        body = requests.get(boards, headers=headers)
+        print("=== BOARDS ===\n")
+        data2 = body.text.replace('}',"}\n")
+        print(data2)
+    # ------- BOARDS LIST END -----------
+    if sys.argv[1] == 'board':
+
+        # ------- BOARD INFO START -----------
+        boardid = sys.argv[2]
+        board = wekanurl + apiboards + boardid
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        body = requests.get(board, headers=headers)
+        print("=== BOARD ===\n")
+        data2 = body.text.replace('}',"}\n")
+        print(data2)
+        # ------- BOARD INFO END -----------
+
+    if sys.argv[1] == 'swimlanes':
+        boardid = sys.argv[2]
+        swimlanes = wekanurl + apiboards + boardid + s + sws
+        # ------- SWIMLANES OF BOARD START -----------
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        print("=== SWIMLANES ===\n")
+        body = requests.get(swimlanes, headers=headers)
+        data2 = body.text.replace('}',"}\n")
+        print(data2)
+        # ------- SWIMLANES OF BOARD END -----------
+
+    if sys.argv[1] == 'lists':
+
+        # ------- LISTS OF BOARD START -----------
+        boardid = sys.argv[2]
+        attachments = wekanurl + apiboards + boardid
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        print("=== LISTS ===\n")
+        body = requests.get(lists, headers=headers)
+        data2 = body.text.replace('}',"}\n")
+        print(data2)
+        # ------- LISTS OF BOARD END -----------
+
+    if sys.argv[1] == 'listattachments':
+
+        # ------- LISTS OF ATTACHMENTS START -----------
+        boardid = sys.argv[2]
+        listattachments = wekanurl + apiboards + boardid + s + ats
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        print("=== LIST OF ATTACHMENTS ===\n")
+        body = requests.get(listattachments, headers=headers)
+        data2 = body.text.replace('}',"}\n")
+        print(data2)
+        # ------- LISTS OF ATTACHMENTS END -----------
+
+if arguments == 1:
+
+    if sys.argv[1] == 'users':
+
+        # ------- LIST OF USERS START -----------
+        headers = {'Accept': 'application/json', 'Authorization': 'Bearer {}'.format(apikey)}
+        print(users)
+        print("=== USERS ===\n")
+        body = requests.get(users, headers=headers)
+        data2 = body.text.replace('}',"}\n")
+        print(data2)
+        # ------- LIST OF USERS END -----------
@@ -15,11 +15,18 @@ template(name="cardActivities")
  each activityData in currentCard.activities
    +activity(activity=activityData card=card mode=mode)

+template(name="editOrDeleteComment")
+  = ' - '
+  a.js-open-inlined-form {{_ "edit"}}
+  = ' - '
+  a.js-delete-comment {{_ "delete"}}
+
 template(name="activity")
  .activity
    +userAvatar(userId=activity.user._id)
    p.activity-desc
-      +memberName(user=activity.user)
+      span.activity-member
+        +memberName(user=activity.user)

      //- attachment activity -------------------------------------------------
      if($eq activity.activityType 'deleteAttachment')
@@ -118,11 +125,10 @@ template(name="activity")
              +viewer
                = activity.comment.text
            span(title=activity.createdAt).activity-meta {{ moment activity.createdAt }}
-              if ($eq currentUser._id activity.comment.userId)
-                = ' - '
-                a.js-open-inlined-form {{_ "edit"}}
-                = ' - '
-                a.js-delete-comment {{_ "delete"}}
+              if($eq currentUser._id activity.comment.userId)
+                +editOrDeleteComment
+              else if currentUser.isBoardAdmin
+                +editOrDeleteComment

        if($eq activity.activityType 'deleteComment')
          | {{{_ 'activity-deleteComment' currentData.commentId}}}.
@@ -137,6 +143,33 @@ template(name="activity")
            +viewer
              = activity.comment.text

+      //- date activity ------------------------------------------------
+      if($eq mode 'card')
+        if($eq activity.activityType 'a-receivedAt')
+          | {{{_ 'activity-receivedDate' (sanitize receivedDate) cardLink}}}.
+
+        if($eq activity.activityType 'a-startAt')
+          | {{{_ 'activity-startDate' (sanitize startDate) cardLink}}}.
+        
+        if($eq activity.activityType 'a-dueAt')
+          | {{{_ 'activity-dueDate' (sanitize dueDate) cardLink}}}.
+
+        if($eq activity.activityType 'a-endAt')
+          | {{{_ 'activity-endDate' (sanitize endDate) cardLink}}}.
+      
+      if($eq mode 'board')
+        if($eq activity.activityType 'a-receivedAt')
+          | {{{_ 'activity-receivedDate' (sanitize receivedDate) cardLink}}}.
+
+        if($eq activity.activityType 'a-startAt')
+          | {{{_ 'activity-startDate' (sanitize startDate) cardLink}}}.
+        
+        if($eq activity.activityType 'a-dueAt')
+          | {{{_ 'activity-dueDate' (sanitize dueDate) cardLink}}}.
+
+        if($eq activity.activityType 'a-endAt')
+          | {{{_ 'activity-endDate' (sanitize endDate) cardLink}}}.
+
      //- customField activity ------------------------------------------------
      if($eq mode 'board')
        if($eq activity.activityType 'createCustomField')
@@ -81,6 +81,30 @@ BlazeComponent.extendComponent({
    return createCardLink(this.currentData().activity.card());
  },

+  receivedDate() {
+    const receivedDate = this.currentData().activity.card();
+    if (!receivedDate) return null;
+    return receivedDate.receivedAt;
+  },
+
+  startDate() {
+    const startDate = this.currentData().activity.card();
+    if (!startDate) return null;
+    return startDate.startAt;
+  },
+
+  dueDate() {
+    const dueDate = this.currentData().activity.card();
+    if (!dueDate) return null;
+    return dueDate.dueAt;
+  },
+
+  endDate() {
+    const endDate = this.currentData().activity.card();
+    if (!endDate) return null;
+    return endDate.endAt;
+  },
+
  lastLabel() {
    const lastLabelId = this.currentData().activity.labelId;
    if (!lastLabelId) return null;
@@ -10,12 +10,16 @@

  .activity
    margin: 0.5px 0
+    padding: 6px 0;
    display: flex

    .member
-      width: 24px
+      width: 32px
      height: @width

+    .activity-member
+      font-weight: 700      
+
    .activity-desc
      word-wrap: break-word
      overflow: hidden
@@ -3,6 +3,10 @@ BlazeComponent.extendComponent({
    this.subscribe('archivedBoards');
  },

+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+
  archivedBoards() {
    return Boards.find(
      { archived: true },
@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 const subManager = new SubsManager();
 const { calculateIndex } = Utils;
 const swimlaneWhileSortingHeight = 150;
@@ -197,7 +195,7 @@ BlazeComponent.extendComponent({
      if (currentUser) {
        showDesktopDragHandles = (currentUser.profile || {})
          .showDesktopDragHandles;
-      } else if (cookies.has('showDesktopDragHandles')) {
+      } else if (window.localStorage.getItem('showDesktopDragHandles')) {
        showDesktopDragHandles = true;
      } else {
        showDesktopDragHandles = false;
@@ -213,7 +211,12 @@ BlazeComponent.extendComponent({
      }

      // Disable drag-dropping if the current user is not a board member
-      $swimlanesDom.sortable('option', 'disabled', !userIsMember());
+      //$swimlanesDom.sortable('option', 'disabled', !userIsMember());
+      $swimlanesDom.sortable(
+        'option',
+        'disabled',
+        !Meteor.user().isBoardAdmin(),
+      );
    });

    function userIsMember() {
@@ -237,7 +240,9 @@ BlazeComponent.extendComponent({
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-swimlanes';
    } else {
-      return cookies.get('boardView') === 'board-view-swimlanes';
+      return (
+        window.localStorage.getItem('boardView') === 'board-view-swimlanes'
+      );
    }
  },

@@ -246,7 +251,7 @@ BlazeComponent.extendComponent({
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-lists';
    } else {
-      return cookies.get('boardView') === 'board-view-lists';
+      return window.localStorage.getItem('boardView') === 'board-view-lists';
    }
  },

@@ -255,7 +260,7 @@ BlazeComponent.extendComponent({
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-cal';
    } else {
-      return cookies.get('boardView') === 'board-view-cal';
+      return window.localStorage.getItem('boardView') === 'board-view-cal';
    }
  },

@@ -417,7 +422,7 @@ BlazeComponent.extendComponent({
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-cal';
    } else {
-      return cookies.get('boardView') === 'board-view-cal';
+      return window.localStorage.getItem('boardView') === 'board-view-cal';
    }
  },
 }).register('calendarView');
@@ -15,7 +15,8 @@ setBoardColor(color)
  .is-selected .minicard
    border-left: 3px solid color

-  button[type=submit].primary, input[type=submit].primary
+  button[type=submit].primary, input[type=submit].primary,
+  .sidebar .sidebar-content .sidebar-btn
    background-color: darken(color, 20%)

  &.pop-over .pop-over-list li a:not(.disabled):hover,
@@ -589,22 +590,25 @@ setBoardClear(color1,color2)
    position relative

  &#header-quick-access #header-user-bar .header-user-bar-name
-    margin: 5px 3px 0 0;
+    margin: 5px 3px 0 0

  section#notifications-drawer
-    top: 46px;
+    top: 46px
    box-shadow: 0 4px 20px rgba(0,0,0,.1)
    max-width: 100%

  section#notifications-drawer .header
-    top: 46px;
+    top: 46px
    border-radius: 0 3px
    height: 21px
    background: #f7f7f7

+  .board-canvas
+    background: #f5f5f5
+
  /* Swimlane */
  .swimlane
-    background: #f5f5f5
+    background: none

  .swimlane .swimlane-header-wrap .swimlane-header
    font-family: Poppins
@@ -739,3 +743,283 @@ setBoardClear(color1,color2)

  section#notifications-drawer .header .toggle-read
    top: 18px
+
+/*
+  Alternate "Modern Dark" Styling
+*/
+.board-color-moderndark
+  setBoardColor(#2a2a2a)
+
+  /* General */
+  body
+    background: #2a2a2a
+
+  .board-wrapper .board-canvas .board-overlay
+    opacity: .6
+
+  /* Forms */
+  button[type=submit].primary, .board-color-modern input[type=submit].primary
+    background-color: #819C5D
+
+  .toggle-switch:checked~.toggle-label
+    background-color: #D2E9B4
+
+  .toggle-label:after, .board-color-modern .toggle-switch:checked~.toggle-label:after
+    background-color: #819C5D !important
+
+  /* Headers */
+  &#header-quick-access, .background-box, #header
+    background-color: #333333
+
+  &#header-quick-access
+    padding: 4px
+    font-size: 14px
+
+  &#header #header-main-bar
+    height: 30px
+    padding-top: 3px
+    padding-bottom: 3px
+
+  &#header
+    box-shadow: 0 6px 6px -6px rgba(0,0,0,0.8)
+
+  &#header-quick-access ul
+    overflow: visible
+
+  &#header-quick-access ul li.current
+    border: 0 !important
+    font-weight: bold
+
+  &#header-quick-access ul li.separator
+    display: none
+
+  &#header-quick-access ul li:nth-child(3)
+    margin-right: 10px
+
+  &#header-quick-access ul li a
+    padding: 5px 10px
+    border-radius: 2px
+
+  &#header-quick-access ul li.current a
+    border-radius: 2px
+    background: rgba(255,255,255,.2)
+
+  &#header #header-main-bar h1
+    font-family: Poppins
+    font-weight: bold
+    line-height: 0.8em
+    padding-top: 10px
+
+  /* Content */
+  .board-canvas
+    background: #2a2a2a
+    padding: 10px 10px 0
+
+  /* Swimlanes */
+  .swimlane .swimlane-header-wrap
+    background-color: #666666
+    color: #cccccc
+    padding: 4px 0
+    margin-bottom: 10px
+
+  .swimlane .swimlane-header-wrap .swimlane-header
+    font-family: Poppins
+
+  .swimlane
+    background: #2a2a2a
+    line-height: 15px
+    max-height: 100%
+
+  /* Lists */
+  .swimlane .list
+    background: #666666
+    border-radius: 0
+    border: 0px solid #666666
+    flex: 0 0 265px;
+
+  .swimlane .list:nth-child(even)
+    background: #5f5f5f
+
+  .list-header
+    background: #333333
+    padding-top: 10px
+    border-bottom: 6px solid #333333
+
+  .list-header .viewer
+    padding-left: 10px
+
+  .list-header .list-header-name
+    line-height: 14px
+    color: #eeeeee
+
+  .list-header .list-header-menu
+    padding-top: 17px
+
+  .list-body
+    scrollbar-width: thin
+    scrollbar-color: #343434 #999999
+
+  .list-body::-webkit-scrollbar
+    width: 10px
+
+  .list-body::-webkit-scrollbar-track
+    background: #343434
+    border-radius: 3px
+    margin: 4px 0
+
+  .list-body::-webkit-scrollbar-thumb
+    background-color: #999999
+    border-radius: 6px
+    border: 3px solid #343434
+
+  .list-body .open-minicard-composer:hover
+    background: none
+    box-shadow: none
+    border-bottom: 0
+
+  .list-body a.open-minicard-composer, .list-body a.open-minicard-composer i, .list .list-composer .open-list-composer i
+    color: #bbbbbb
+
+  .list-body a.open-minicard-composer:hover, .list-body a.open-minicard-composer:hover i, .list .list-composer .open-list-composer:hover i
+    color: #ffffff
+
+  /* Mini Card */
+  .minicard
+    background-color: #444444
+    color: #cccccc
+    border-radius: 2px
+    font-size: 0.9em
+    padding: 10px
+    box-shadow: 0 4px 3px -3px rgba(0,0,0,0.8)
+    border-bottom: 1px solid #666666
+
+  .minicard:hover
+    background-color: #555555 !important
+
+  .minicard .card-label
+    font-size: 11px
+    font-weight: 400
+    padding: 2px 6px 0
+
+  .minicard .badges
+    color: #bbbbbb
+
+  .minicard .date
+    margin-top: 7px
+    font-size: 11px
+
+  .card-date
+    color: #555555
+
+  .card-date.almost-due
+    color: #666666
+
+  .minicard.minicard-composer textarea.minicard-composer-textarea:focus
+    background-color: #eeeeee
+    color: #333333
+    padding: 6px
+
+  .is-selected .minicard
+    background-color: #666666
+
+  /* Card Details */
+  .card-details
+    position: absolute
+    top: 30px
+    left: calc(50% - 384px)
+    width: 768px
+    max-height: calc(100% - 60px)
+    background-color: #454545
+    color: #cccccc
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)
+    border: 1px solid #111111
+    z-index: 100 !important
+
+  .card-details
+    scrollbar-width: thin
+    scrollbar-color: #343434 #999999
+
+  .card-details::-webkit-scrollbar
+    width: 16px
+
+  .card-details::-webkit-scrollbar-track
+    background: #343434
+
+  .card-details::-webkit-scrollbar-thumb
+    background-color: #999999
+    border-radius: 6px
+    border: 4px solid #343434
+
+  .card-details .card-details-header
+    background: #333333
+    color: #cccccc
+    border-bottom: 2px solid #2d2d2d
+
+  .card-details hr
+    background: #2d2d2d
+
+  .card-details .card-details-item-title
+    color: #ffffff
+
+  .card-details .new-description textarea, .card-details .new-comment textarea
+    background-color: #dddddd
+    color: #111111
+
+  .card-details .checklist
+    background-color: transparent
+    margin-bottom: 10px
+
+  .card-details .checklist-item
+    background-color: rgba(255,255,255,0.1)
+    padding: 2px 8px
+    border-radius: 3px
+    font-size: 13px
+    margin-top: 5px
+
+  .card-details .check-box.materialCheckBox
+    border-color: #ffffff
+
+  .card-details .check-box.materialCheckBox.is-checked
+    border-bottom: 2px solid #819C5D
+    border-right: 2px solid #819C5D
+    border-top: 0
+    border-left: 0
+
+  .card-details .js-add-checklist-item
+    margin-top: 4px
+
+  .checklist-items .add-checklist-item
+    margin-top: .7em
+
+  .card-details .activities .activity .activity-desc .activity-comment
+    background-color: #cccccc
+    color: #222222
+
+  /* Sidebar */
+  .sidebar .sidebar-shadow
+    background-color: #222222
+    box-shadow: -10px 0 5px -10px #444444
+    border-left: 1px solid #333333
+    color: #cccccc
+
+  .activities .activity .activity-desc .activity-comment
+    background-color: #cccccc
+    color: #222222
+
+  /* Pop-Ups for "Modern Dark" */
+.pop-over.board-color-moderndark
+  background-color: #454545
+  color: #cccccc
+  border: 1px solid #111111
+  box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)
+
+.pop-over.board-color-moderndark .header
+  background-color: #333333
+
+.pop-over.board-color-moderndark .header-title
+  font-family: Poppins
+  font-size: 16px
+  color: #cccccc
+
+.pop-over.board-color-moderndark .pop-over-list li:hover > a
+  background-color: #819C5D !important
@@ -60,10 +60,10 @@ template(name="boardList")

 template(name="boardListHeaderBar")
  h1 {{_ title }}
-  .board-header-btns.right
-    a.board-header-btn.js-open-archived-board
-      i.fa.fa-archive
-      span {{_ 'archives'}}
-    a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
-      i.fa.fa-clone
-      span {{_ 'templates'}}
+  //.board-header-btns.right
+  //  a.board-header-btn.js-open-archived-board
+  //    i.fa.fa-archive
+  //    span {{_ 'archives'}}
+  //  a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
+  //    i.fa.fa-clone
+  //    span {{_ 'templates'}}
@@ -7,7 +7,7 @@ $spaceBetweenTiles = 16px

  li
    float: left
-    width: 25%
+    width: 20%
    box-sizing: border-box
    position: relative

@@ -33,13 +33,12 @@ $spaceBetweenTiles = 16px
    overflow: hidden;
    background-color: #999
    color: #f6f6f6
-    height: auto
+    min-height: 100px
    font-size: 16px
    line-height: 22px
    border-radius: 3px
    display: block
    font-weight: 700
-    min-height: 18px
    padding: 8px
    margin: ($spaceBetweenTiles/2)
    position: relative
@@ -46,9 +46,10 @@ template(name="attachmentsGalery")
                        | {{_ 'remove-cover'}}
                      else
                        | {{_ 'add-cover'}}
-                  a.js-confirm-delete
-                    i.fa.fa-close
-                    | {{_ 'delete'}}
+                  if currentUser.isBoardAdmin
+                    a.js-confirm-delete
+                      i.fa.fa-close
+                      | {{_ 'delete'}}

    if currentUser.isBoardMember
      unless currentUser.isCommentOnly
@@ -45,6 +45,12 @@ Template.attachmentsGalery.events({
  },
 });

+Template.attachmentsGalery.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+});
+
 Template.previewAttachedImagePopup.events({
  'click .js-large-image-clicked'() {
    Popup.close();
@@ -0,0 +1,7 @@
+
+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")
+        | {{getUnsavedValue 'cardDescription' _id getDescription}}
@@ -0,0 +1,33 @@
+const descriptionFormIsOpen = new ReactiveVar(false);
+
+BlazeComponent.extendComponent({
+  onDestroyed() {
+    descriptionFormIsOpen.set(false);
+  },
+
+  descriptionFormIsOpen() {
+    return descriptionFormIsOpen.get();
+  },
+
+  getInput() {
+    return this.$('.js-new-description-input');
+  },
+
+  events() {
+    return [
+      {
+        'submit .js-card-description'(event) {
+          event.preventDefault();
+          const description = this.currentComponent().getValue();
+          this.data().setDescription(description);
+        },
+        // Pressing Ctrl+Enter should submit the form
+        'keydown form textarea'(evt) {
+          if (evt.keyCode === 13 && (evt.metaKey || evt.ctrlKey)) {
+            this.find('button[type=submit]').click();
+          }
+        },
+      },
+    ];
+  },
+}).register('descriptionForm');
@@ -0,0 +1,60 @@
+@import 'nib'
+
+.new-description
+  position: relative
+  margin: 0 0 20px 0
+
+
+  &.is-open
+    .helper
+      display: inline-block
+
+    textarea
+      min-height: 100px
+      color: #4d4d4d
+      cursor: auto
+      overflow: hidden
+      word-wrap: break-word
+
+  .too-long
+    margin-top: 8px
+
+  textarea
+    background-color: #fff
+    border: 0
+    box-shadow: 0 1px 2px rgba(0, 0, 0, .23)
+    color: #8c8c8c
+    height: 36px
+    margin: 4px 4px 6px 0
+    padding: 9px 11px
+    width: 100%
+
+    &:hover,
+    &:is-open
+      background-color: #fff
+      box-shadow: 0 1px 3px rgba(0, 0, 0, .33)
+      border: 0
+      cursor: pointer
+
+    &:is-open
+      cursor: auto
+
+.description-item
+  background-color: #fff
+  border: 0
+  box-shadow: 0 1px 2px rgba(0, 0, 0, .23)
+  color: #8c8c8c
+  height: 36px
+  margin: 4px 4px 6px 0
+  width: 92%
+
+  &:hover
+    background: darken(white, 12%)
+
+  &.add-description
+    display: flex
+    margin: 5px
+
+    a
+      display: block
+      margin: auto
@@ -42,12 +42,12 @@ template(name="cardDetails")
      else
        p.warning {{_ 'card-archived'}}

-    .card-details-items 
+    .card-details-items
      if currentBoard.allowsLabels
        .card-details-item.card-details-item-labels
          h3.card-details-item-title
            i.fa.fa-tags
-            | {{_ 'labels'}}        
+            | {{_ 'labels'}}
          a(class="{{#if canModifyCard}}js-add-labels{{else}}is-disabled{{/if}}" title="{{_ 'card-labels-title'}}")
            each labels
              span.card-label(class="card-label-{{color}}" title=name)
@@ -57,7 +57,7 @@ template(name="cardDetails")
            unless currentUser.isWorker
              a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
                i.fa.fa-plus
-      
+
      if currentBoard.allowsReceivedDate
        hr
        .card-details-item.card-details-item-received
@@ -245,8 +245,7 @@ template(name="cardDetails")
            | {{_ 'description'}}
        if currentBoard.allowsDescriptionText
          +inlinedCardDescription(classNames="card-description js-card-description")
-            +editor(autofocus=true)
-              | {{getUnsavedValue 'cardDescription' _id getDescription}}
+            +descriptionForm
            .edit-controls.clearfix
              button.primary(type="submit") {{_ 'save'}}
              a.fa.fa-times-thin.js-close-inlined-form
@@ -355,10 +354,11 @@ template(name="cardDetailsActionsPopup")
          a.js-start-voting
            i.fa.fa-thumbs-up
            | {{_ 'card-edit-voting'}}
-        li
-          a.js-custom-fields
-            i.fa.fa-list-alt
-            | {{_ 'card-edit-custom-fields'}}
+        if currentUser.isBoardAdmin
+          li
+            a.js-custom-fields
+              i.fa.fa-list-alt
+              | {{_ 'card-edit-custom-fields'}}
        //li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
        //li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
        //li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
@@ -381,17 +381,19 @@ template(name="cardDetailsActionsPopup")
        a.js-move-card-to-bottom
          i.fa.fa-arrow-down
          | {{_ 'moveCardToBottom-title'}}
-    unless currentUser.isWorker
      hr
-      ul.pop-over-list
+    ul.pop-over-list
+      if currentUser.isBoardAdmin
        li
          a.js-move-card
            i.fa.fa-arrow-right
            | {{_ 'moveCardPopup-title'}}
+      unless currentUser.isWorker
        li
          a.js-copy-card
            i.fa.fa-copy
            | {{_ 'copyCardPopup-title'}}
+    unless currentUser.isWorker
      hr
      ul.pop-over-list
        li
@@ -430,13 +432,14 @@ template(name="copyChecklistToManyCardsPopup")
  +boardsAndLists

 template(name="boardsAndLists")
-  label {{_ 'boards'}}:
-  select.js-select-boards(autofocus)
-    each boards
-      if $eq _id currentBoard._id
-        option(value="{{_id}}" selected) {{_ 'current'}}
-      else
-        option(value="{{_id}}") {{title}}
+  unless currentUser.isWorker
+    label {{_ 'boards'}}:
+    select.js-select-boards(autofocus)
+      each boards
+        if $eq _id currentBoard._id
+          option(value="{{_id}}" selected) {{_ 'current'}}
+        else
+          option(value="{{_id}}") {{title}}

  label {{_ 'swimlanes'}}:
  select.js-select-swimlanes
@@ -561,7 +564,8 @@ template(name="cardMorePopup")
    br
    | {{_ 'added'}}
    span.date(title=card.createdAt) {{ moment createdAt 'LLL' }}
-    a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}}
+    if currentUser.isBoardAdmin
+      a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}}

 template(name="setCardColorPopup")
  form.edit-label
@@ -608,7 +612,8 @@ template(name="cardStartVotingPopup")

    button.primary.js-submit {{_ 'save'}}
    if getVoteQuestion
-      button.js-remove-vote.negate.wide.right {{_ 'delete'}}
+      if currentUser.isBoardAdmin
+        button.js-remove-vote.negate.wide.right {{_ 'delete'}}

 template(name="positiveVoteMembersPopup")
  ul.pop-over-list.js-card-member-list
@@ -57,7 +57,7 @@ BlazeComponent.extendComponent({
  },

  scrollParentContainer() {
-    const cardPanelWidth = 510;
+    const cardPanelWidth = 600;
    const parentComponent = this.parentComponent();
    // TODO sometimes parentComponent is not available, maybe because it's not
    // yet created?!
@@ -250,12 +250,15 @@ BlazeComponent.extendComponent({

    // Disable sorting if the current user is not a board member
    this.autorun(() => {
-      const disabled = !userIsMember() || Utils.isMiniScreen();
+      const disabled = !userIsMember();
      if (
        $checklistsDom.data('uiSortable') ||
        $checklistsDom.data('sortable')
      ) {
        $checklistsDom.sortable('option', 'disabled', disabled);
+        if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+          $checklistsDom.sortable({ handle: '.checklist-handle' });
+        }
      }
      if ($subtasksDom.data('uiSortable') || $subtasksDom.data('sortable')) {
        $subtasksDom.sortable('option', 'disabled', disabled);
@@ -564,6 +567,10 @@ Template.cardDetailsActionsPopup.helpers({
    return this.findWatcher(Meteor.userId());
  },

+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+
  canModifyCard() {
    return (
      Meteor.user() &&
@@ -668,7 +675,11 @@ Template.moveCardPopup.events({
    // instead from a “component” state.
    const card = Cards.findOne(Session.get('currentCard'));
    const bSelect = $('.js-select-boards')[0];
-    const boardId = bSelect.options[bSelect.selectedIndex].value;
+    let boardId;
+    // if we are a worker, we won't have a board select so we just use the
+    // current boardId of the card.
+    if (bSelect) boardId = bSelect.options[bSelect.selectedIndex].value;
+    else boardId = card.boardId;
    const lSelect = $('.js-select-lists')[0];
    const listId = lSelect.options[lSelect.selectedIndex].value;
    const slSelect = $('.js-select-swimlanes')[0];
@@ -41,6 +41,8 @@ template(name="checklistDetail")

        if canModifyCard
          h2.title.js-open-inlined-form.is-editable
+            if isMiniScreenOrShowDesktopDragHandles
+              span.fa.checklist-handle(class="fa-arrows" title="{{_ 'dragChecklist'}}")
            +viewer
              = checklist.title
        else
@@ -100,6 +102,8 @@ template(name='checklistItemDetail')
    if canModifyCard
      .check-box-container
        .check-box.materialCheckBox(class="{{#if item.isFinished }}is-checked{{/if}}")
+      if isMiniScreenOrShowDesktopDragHandles
+        span.fa.checklistitem-handle(class="fa-arrows" title="{{_ 'dragChecklistItem'}}")
      .item-title.js-open-inlined-form.is-editable(class="{{#if item.isFinished }}is-checked{{/if}}")
        +viewer
          = item.title
@@ -6,7 +6,7 @@ function initSorting(items) {
    helper: 'clone',
    items: '.js-checklist-item:not(.placeholder)',
    connectWith: '.js-checklist-items',
-    appendTo: '.board-canvas',
+    appendTo: 'parent',
    distance: 7,
    placeholder: 'checklist-item placeholder',
    scroll: false,
@@ -55,11 +55,12 @@ BlazeComponent.extendComponent({
    self.autorun(() => {
      const $itemsDom = $(self.itemsDom);
      if ($itemsDom.data('uiSortable') || $itemsDom.data('sortable')) {
-        $(self.itemsDom).sortable(
-          'option',
-          'disabled',
-          !userIsMember() || Utils.isMiniScreen(),
-        );
+        $(self.itemsDom).sortable('option', 'disabled', !userIsMember());
+        if (Utils.isMiniScreenOrShowDesktopDragHandles()) {
+          $(self.itemsDom).sortable({
+            handle: 'span.fa.checklistitem-handle',
+          });
+        }
      }
    });
  },
@@ -222,6 +223,14 @@ Template.checklists.helpers({
  },
 });

+Template.addChecklistItemForm.onRendered(() => {
+  autosize($('textarea.js-add-checklist-item'));
+});
+
+Template.editChecklistItemForm.onRendered(() => {
+  autosize($('textarea.js-edit-checklist-item'));
+});
+
 Template.checklistDeleteDialog.onCreated(() => {
  const $cardDetails = this.$('.card-details');
  this.scrollState = {
@@ -42,6 +42,11 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
  .js-delete-checklist
    @extends .delete-text

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

 .js-confirm-checklist-delete
  background-color: darken(white, 3%)
@@ -129,7 +134,7 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
    background-color: darken(white, 8%)

  .check-box-container
-    padding-right: 1px;
+    padding-right: 10px;

  .check-box
    margin: 0.1em 0 0 0;
@@ -139,7 +144,6 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item

  .item-title
    flex: 1
-    margin-left: 10px;
    &.is-checked
      color: #8c8c8c
      font-style: italic
@@ -151,6 +155,10 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item
        word-wrap: break-word
        max-width: 420px

+  span.fa.checklistitem-handle
+    padding-top: 2px
+    padding-right: 10px;
+
 .js-delete-checklist-item
  margin: 0 0 0.5em 1.33em
  @extends .delete-text
@@ -85,7 +85,7 @@ template(name="minicard")
      .minicard-assignees.js-minicard-assignees
        each getAssignees
          +userAvatar(userId=this)
-        hr
+        hr(class="assigneehr" title="{{_ 'assignee'}}")

    if getMembers
      .minicard-members.js-minicard-members
@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 // Template.cards.events({
 //   'click .member': Popup.open('cardMember')
 // });
@@ -34,10 +32,10 @@ BlazeComponent.extendComponent({
      },
      {
        'click .js-toggle-minicard-label-text'() {
-          if (cookies.has('hiddenMinicardLabelText')) {
-            cookies.remove('hiddenMinicardLabelText'); //true
+          if (window.localStorage.getItem('hiddenMinicardLabelText')) {
+            window.localStorage.removeItem('hiddenMinicardLabelText'); //true
          } else {
-            cookies.set('hiddenMinicardLabelText', 'true'); //true
+            window.localStorage.setItem('hiddenMinicardLabelText', 'true'); //true
          }
        },
      },
@@ -50,7 +48,7 @@ Template.minicard.helpers({
    currentUser = Meteor.user();
    if (currentUser) {
      return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
      return true;
    } else {
      return false;
@@ -60,7 +58,7 @@ Template.minicard.helpers({
    currentUser = Meteor.user();
    if (currentUser) {
      return (currentUser.profile || {}).hiddenMinicardLabelText;
-    } else if (cookies.has('hiddenMinicardLabelText')) {
+    } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {
      return true;
    } else {
      return false;
@@ -165,7 +165,11 @@
  .minicard-members,
  .minicard-assignees
    float: right
-    margin: 2px -8px 12px 0
+    margin-left: 5px
+
+    .assigneehr
+      border-top: 1px solid red
+      margin-bottom: 4px

    .member
      float: right
@@ -180,7 +184,7 @@
      width: @height

    + .badges
-      margin-top: 10px
+      margin-top: 5px

  .minicard-members:empty,
  .minicard-assignees:empty
@@ -0,0 +1,23 @@
+template(name="resultCard")
+  .result-card-wrapper
+    a.minicard-wrapper.card-title(href=card.absoluteUrl)
+      +minicard(this)
+      //= card.title
+    ul.result-card-context-list
+      li.result-card-context(title="{{_ 'board'}}")
+        +viewer
+          = getBoard.title
+      li.result-card-context.result-card-context-separator
+        = ' '
+        | {{_ 'context-separator'}}
+        = ' '
+      li.result-card-context(title="{{_ 'swimlane'}}")
+        +viewer
+          = getSwimlane.title
+      li.result-card-context.result-card-context-separator
+        = ' '
+        | {{_ 'context-separator'}}
+        = ' '
+      li.result-card-context(title="{{_ 'list'}}")
+        +viewer
+          = getList.title
@@ -0,0 +1,11 @@
+Template.resultCard.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+BlazeComponent.extendComponent({
+  events() {
+    return [{}];
+  },
+}).register('resultCard');
@@ -0,0 +1,21 @@
+.result-card-list-wrapper
+  margin: 1rem
+  border-radius: 5px
+  padding: 1.5rem
+  padding-top: 0.75rem
+  display: inline-block
+  min-width: 250px
+  max-width: 350px
+
+.result-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+
+.result-card-context
+  display: inline-block
+
+.result-card-context-separator
+  font-weight: bold
+
+.result-card-context-list
+  margin-bottom: 0.7rem
@@ -2,10 +2,10 @@ template(name="subtasks")
  h3.card-details-item-title
    i.fa.fa-sitemap
    | {{_ 'subtasks'}}
-  if toggleDeleteDialog.get
-    .board-overlay#card-details-overlay
-    +subtaskDeleteDialog(subtask = subtaskToDelete)
-
+  if currentUser.isBoardAdmin
+    if toggleDeleteDialog.get
+      .board-overlay#card-details-overlay
+      +subtaskDeleteDialog(subtask = subtaskToDelete)

  .card-subtasks-items
    each subtask in currentCard.subtasks
@@ -28,7 +28,8 @@ template(name="subtaskDetail")
        span
        a.js-view-subtask(title="{{ subtask.title }}") {{_ "view-it"}}
        if canModifyCard
-          a.js-delete-subtask.toggle-delete-subtask-dialog {{_ "delete"}}...
+          if currentUser.isBoardAdmin
+            a.js-delete-subtask.toggle-delete-subtask-dialog {{_ "delete"}}...

        if canModifyCard
          h2.title.js-open-inlined-form.is-editable
@@ -68,7 +69,8 @@ template(name="editSubtaskItemForm")
    a.fa.fa-times-thin.js-close-inlined-form
    span(title=createdAt) {{ moment createdAt }}
    if canModifyCard
-      a.js-delete-subtask-item {{_ "delete"}}...
+      if currentUser.isBoardAdmin
+        a.js-delete-subtask-item {{_ "delete"}}...

 template(name="subtasksItems")
  .subtasks-items.js-subtasks-items
@@ -1,4 +1,4 @@
-export function getMembersToMap(data) {
+export function csvGetMembersToMap(data) {
  // we will work on the list itself (an ordered array of objects) when a
  // mapping is done, we add a 'wekan' field to the object representing the
  // imported member
@@ -1,6 +1,6 @@
-import trelloMembersMapper from './trelloMembersMapper';
-import wekanMembersMapper from './wekanMembersMapper';
-import csvMembersMapper from './csvMembersMapper';
+import { trelloGetMembersToMap } from './trelloMembersMapper';
+import { wekanGetMembersToMap } from './wekanMembersMapper';
+import { csvGetMembersToMap } from './csvMembersMapper';

 const Papa = require('papaparse');

@@ -99,13 +99,13 @@ BlazeComponent.extendComponent({
    let membersToMap;
    switch (importSource) {
      case 'trello':
-        membersToMap = trelloMembersMapper.getMembersToMap(dataObject);
+        membersToMap = trelloGetMembersToMap(dataObject);
        break;
      case 'wekan':
-        membersToMap = wekanMembersMapper.getMembersToMap(dataObject);
+        membersToMap = wekanGetMembersToMap(dataObject);
        break;
      case 'csv':
-        membersToMap = csvMembersMapper.getMembersToMap(dataObject);
+        membersToMap = csvGetMembersToMap(dataObject);
        break;
    }
    return membersToMap;
@@ -1,4 +1,4 @@
-export function getMembersToMap(data) {
+export function trelloGetMembersToMap(data) {
  // we will work on the list itself (an ordered array of objects) when a
  // mapping is done, we add a 'wekan' field to the object representing the
  // imported member
@@ -1,4 +1,4 @@
-export function getMembersToMap(data) {
+export function wekanGetMembersToMap(data) {
  // we will work on the list itself (an ordered array of objects) when a
  // mapping is done, we add a 'wekan' field to the object representing the
  // imported member
@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 const { calculateIndex } = Utils;

 BlazeComponent.extendComponent({
@@ -124,7 +122,7 @@ BlazeComponent.extendComponent({
      if (currentUser) {
        showDesktopDragHandles = (currentUser.profile || {})
          .showDesktopDragHandles;
-      } else if (cookies.has('showDesktopDragHandles')) {
+      } else if (window.localStorage.getItem('showDesktopDragHandles')) {
        showDesktopDragHandles = true;
      } else {
        showDesktopDragHandles = false;
@@ -185,7 +183,7 @@ Template.list.helpers({
    currentUser = Meteor.user();
    if (currentUser) {
      return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
      return true;
    } else {
      return false;
@@ -1,7 +1,7 @@
 template(name="listHeader")
  .list-header.js-list-header(
    class="{{#if limitToShowCardsCount}}list-header-card-count{{/if}}"
-    class="{{#if colorClass}}list-header-{{colorClass}}{{/if}}")
+    class=colorClass)
    +inlinedForm
      +editListTitleForm
    else
@@ -43,8 +43,9 @@ template(name="listHeader")
            if canSeeAddCard
              a.js-add-card.fa.fa-plus.list-header-plus-icon
            a.fa.fa-navicon.js-open-list-menu
-          if showDesktopDragHandles
-            a.list-header-handle.handle.fa.fa-arrows.js-list-handle
+          if currentUser.isBoardAdmin
+            if showDesktopDragHandles
+              a.list-header-handle.handle.fa.fa-arrows.js-list-handle

 template(name="editListTitleForm")
  .list-composer
@@ -115,8 +116,9 @@ template(name="listMorePopup")
      input.inline-input(type="text" readonly value="{{ rootUrl }}")
    | {{_ 'added'}}
    span.date(title=list.createdAt) {{ moment createdAt 'LLL' }}
-    unless currentUser.isWorker
-      a.js-delete {{_ 'delete'}}
+    //unless currentUser.isWorker
+    //  if currentUser.isBoardAdmin
+    //    a.js-delete {{_ 'delete'}}

 template(name="listDeletePopup")
  p {{_ "list-delete-pop"}}
@@ -151,7 +153,7 @@ template(name="setListColorPopup")
  form.edit-label
    .palette-colors: each colors
      // note: we use the swimlane palette to have more than just the border
-      span.card-label.palette-color.js-palette-color(class="swimlane-{{color}}")
+      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
        if(isSelected color)
          i.fa.fa-check
    button.primary.confirm.js-submit {{_ 'save'}}
@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 let listsColors;
 Meteor.startup(() => {
  listsColors = Lists.simpleSchema()._schema.color.allowedValues;
@@ -106,11 +104,15 @@ BlazeComponent.extendComponent({
 }).register('listHeader');

 Template.listHeader.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+
  showDesktopDragHandles() {
    currentUser = Meteor.user();
    if (currentUser) {
      return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
      return true;
    } else {
      return false;
@@ -119,6 +121,10 @@ Template.listHeader.helpers({
 });

 Template.listActionPopup.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+
  isWipLimitEnabled() {
    return Template.currentData().getWipLimit('enabled');
  },
@@ -256,6 +262,12 @@ Template.listMorePopup.events({
  }),
 });

+Template.listHeader.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+});
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.currentList = this.currentData();
@@ -267,7 +279,11 @@ BlazeComponent.extendComponent({
  },

  isSelected(color) {
-    return this.currentColor.get() === color;
+    if (this.currentColor.get() === null) {
+      return color === 'white';
+    } else {
+      return this.currentColor.get() === color;
+    }
  },

  events() {
@@ -0,0 +1,41 @@
+template(name="brokenCardsHeaderBar")
+  h1
+    | {{_ '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
@@ -0,0 +1,28 @@
+BlazeComponent.extendComponent({}).register('brokenCardsHeaderBar');
+
+Template.brokenCards.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    Meteor.subscribe('setting');
+    Meteor.subscribe('brokenCards');
+  },
+
+  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');
@@ -0,0 +1,31 @@
+.broken-cards-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+  border-width: 3px !important
+  border-color: grey !important
+  border-style: solid
+  border-radius: 5px
+  padding: 1.5rem
+  background-color: white
+
+.broken-cards-wrapper
+  max-width: 500px
+  margin-right: auto
+  margin-left: auto
+
+.broken-cards-card-title
+  font-weight: bold
+  //padding: 10px
+
+.broken-cards-context
+  display: inline-block
+
+.broken-cards-context-separator
+  font-weight: bold
+
+.broken-cards-context-list
+  //margin-bottom: 0.7rem
+
+.broken-cards-null
+  color: darkred
+  font-style: italic
@@ -0,0 +1,73 @@
+template(name="dueCardsHeaderBar")
+  if currentUser
+    h1
+      i.fa.fa-calendar
+      | {{_ 'dueCards-title'}}
+
+    .board-header-btns.left
+      a.board-header-btn.js-due-cards-view-change(title="{{_ 'dueCardsViewChange-title'}}")
+        i.fa.fa-caret-down
+        if $eq dueCardsView 'me'
+          i.fa.fa-user
+          | {{_ 'dueCardsViewChange-choice-me'}}
+        if $eq dueCardsView 'all'
+          i.fa.fa-users
+          | {{_ 'dueCardsViewChange-choice-all'}}
+
+template(name="dueCardsModalTitle")
+  if currentUser
+    h2
+      i.fa.fa-keyboard-o
+      | {{_ 'dueCards-title'}}
+
+template(name="dueCards")
+  if currentUser
+    if isPageReady.get
+      .wrapper
+        .due-cards-dueat-list-wrapper
+          each card in dueCardsList
+            .due-cards-card-wrapper
+              a.minicard-wrapper.card-title(href=card.absoluteUrl)
+                +minicard(card)
+              ul.due-cards-context-list
+                li.due-cards-context(title="{{_ 'board'}}")
+                  +viewer
+                    = card.getBoard.title
+                li.due-cards-context.due-cards-context-separator
+                  = ' '
+                  | {{_ 'context-separator'}}
+                  = ' '
+                li.due-cards-context(title="{{_ 'swimlane'}}")
+                  +viewer
+                    = card.getSwimlane.title
+                li.due-cards-context
+                  = ' '
+                  | {{_ 'context-separator'}}
+                  = ' '
+                li.due-cards-context(title="{{_ 'list'}}")
+                  +viewer
+                    = card.getList.title
+    else
+      +spinner
+
+template(name="dueCardsViewChangePopup")
+  if currentUser
+    ul.pop-over-list
+      li
+        with "dueCardsViewChange-choice-me"
+          a.js-due-cards-view-me
+            i.fa.fa-user.colorful
+            | {{_ 'dueCardsViewChange-choice-me'}}
+            if $eq Utils.dueCardsView "me"
+              i.fa.fa-check
+      hr
+      li
+        with "dueCardsViewChange-choice-all"
+          a.js-due-cards-view-all
+            i.fa.fa-users.colorful
+            | {{_ 'dueCardsViewChange-choice-all'}}
+            span.sub-name
+              +viewer
+                | {{_ 'dueCardsViewChange-choice-all-description' }}
+            if $eq Utils.dueCardsView "all"
+              i.fa.fa-check
@@ -0,0 +1,154 @@
+const subManager = new SubsManager();
+
+BlazeComponent.extendComponent({
+  dueCardsView() {
+    // eslint-disable-next-line no-console
+    // console.log('sort:', Utils.dueCardsView());
+    return Utils.dueCardsView();
+  },
+
+  events() {
+    return [
+      {
+        'click .js-due-cards-view-change': Popup.open('dueCardsViewChange'),
+      },
+    ];
+  },
+}).register('dueCardsHeaderBar');
+
+Template.dueCards.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+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('dueCardsViewChangePopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.isPageReady = new ReactiveVar(false);
+
+    this.autorun(() => {
+      const handle = subManager.subscribe(
+        'dueCards',
+        Utils.dueCardsView() === 'all',
+      );
+      Tracker.nonreactive(() => {
+        Tracker.autorun(() => {
+          this.isPageReady.set(handle.ready());
+        });
+      });
+    });
+    Meteor.subscribe('setting');
+  },
+
+  dueCardsView() {
+    // eslint-disable-next-line no-console
+    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 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;
+
+      if (x > y) return 1;
+      else if (x < y) return -1;
+
+      return 0;
+    });
+
+    // eslint-disable-next-line no-console
+    // console.log('cards:', cards);
+    return cards;
+  },
+}).register('dueCards');
@@ -0,0 +1,69 @@
+.due-cards-board-wrapper
+  border-radius: 8px
+  //padding: 0.5rem
+  min-width: 400px
+  border-width: 8px
+  border-color: grey
+  border-style: solid
+  margin-bottom: 2rem
+  margin-right: auto
+  margin-left: auto
+
+.due-cards-board-title
+  font-size: 1.4rem
+  font-weight: bold
+  padding: 0.5rem
+  background-color: grey
+  color: white
+
+.due-cards-swimlane-title
+  font-size: 1.1rem
+  font-weight: bold
+  padding: 0.5rem
+  padding-bottom: 0.4rem
+  margin-top: 0
+  margin-bottom: 0.5rem
+  //border-top: black 1px solid
+  //border-bottom: black 1px solid
+  text-align: center
+
+.swimlane-default-color
+  background-color: lightgrey
+
+.due-cards-list-title
+  font-weight: bold
+  font-size: 1.1rem
+  //padding-bottom: 0
+  //margin-bottom: 0
+  text-align: center
+  margin-bottom: 0.7rem
+
+.due-cards-list-wrapper
+  margin: 1rem
+  border-radius: 5px
+  padding: 1.5rem
+  padding-top: 0.75rem
+  display: inline-block
+  min-width: 250px
+  max-width: 350px
+
+.due-cards-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+
+.due-cards-dueat-list-wrapper
+  max-width: 500px
+  margin-right: auto
+  margin-left: auto
+
+.due-cards-field-name
+  font-weight: bold
+
+.due-cards-context
+  display: inline-block
+
+.due-cards-context-separator
+  font-weight: bold
+
+.due-cards-context-list
+  margin-bottom: 0.7rem
@@ -91,6 +91,7 @@ Template.editor.onRendered(() => {
    };
    const editor = '.editor';
    const selectors = [
+      `.js-new-description-form ${editor}`,
      `.js-new-comment-form ${editor}`,
      `.js-edit-comment ${editor}`,
    ].join(','); // only new comment and edit comment
@@ -264,6 +265,32 @@ Template.editor.onRendered(() => {

 import sanitizeXss from 'xss';

+// 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
+  if (tag === 'a' && name === 'href') {
+    // only filter the value if starts with 'cbthunderlink:' or 'aodroplink'
+    if (
+      /^thunderlink:/gi.test(value) ||
+      /^cbthunderlink:/gi.test(value) ||
+      /^aodroplink:/gi.test(value) ||
+      /^onenote:/gi.test(value) ||
+      /^file:/gi.test(value) ||
+      /^mailspring:/gi.test(value)
+    ) {
+      return value;
+    } else {
+      // use the default safeAttrValue function to process all non cbthunderlinks
+      return sanitizeXss.safeAttrValue(tag, name, value, cssFilter);
+    }
+  } else {
+    // use the default safeAttrValue function to process it
+    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
 // fields, one source, and one compiled version (in HTML) and send only the
@@ -277,7 +304,8 @@ Blaze.Template.registerHelper(
    const view = this;
    let content = Blaze.toHTML(view.templateContentBlock);
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    if (!currentBoard) return HTML.Raw(sanitizeXss(content));
+    if (!currentBoard)
+      return HTML.Raw(sanitizeXss(content, { safeAttrValue: mySafeAttrValue }));
    const knowedUsers = currentBoard.members.map(member => {
      const u = Users.findOne(member.userId);
      if (u) {
@@ -321,7 +349,7 @@ Blaze.Template.registerHelper(
      content = content.replace(fullMention, Blaze.toHTML(link));
    }

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

@@ -0,0 +1,82 @@
+template(name="globalSearchHeaderBar")
+  if currentUser
+    h1
+      i.fa.fa-search
+      | {{_ 'globalSearch-title'}}
+
+template(name="globalSearchModalTitle")
+  if currentUser
+    h2
+      i.fa.fa-keyboard-o
+      | {{_ 'globalSearch-title'}}
+
+template(name="globalSearch")
+  if currentUser
+    .wrapper
+      form.global-search-instructions.js-search-query-form
+        input.global-search-query-input(type="text" name="searchQuery" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
+      if searching.get
+        +spinner
+      else if hasResults.get
+        .global-search-dueat-list-wrapper
+          h1
+            if $eq resultsCount.get 0
+              | {{_ 'no-cards-found' }}
+            else if $eq resultsCount.get 1
+              | {{_ 'one-card-found' }}
+            else if $eq resultsCount.get totalHits.get
+              | {{_ 'n-cards-found' resultsCount.get }}
+            else
+              | {{_ 'n-n-of-n-cards-found' 1 resultsCount.get totalHits.get }}
+          if queryErrors.get
+            div
+              each msg in errorMessages
+                span.global-search-error-messages
+                  | {{_ msg.tag msg.value }}
+          each card in results
+            +resultCard(card)
+      else
+        .global-search-instructions
+          h1 Search Operators
+          +viewer
+            = 'Searches can include operators to refine the search.  Operators are specified by writing the operator'
+            = 'name and value separated by a colon.  For example, an operator specification of `list:Blocked` would limit the search'
+            = 'to cards that are contained in a list named *Blocked*.  If the value contains spaces or special characters'
+            = 'it must be enclosed in quotation marks (e.g. `list:"To Review"`).\n'
+            = 'Available operators are:\n'
+            = '* `board:title` - cards in boards matching the specified title\n'
+            = '* `list:title` - cards in lists matching the specified title\n'
+            = '* `swimlane:title` - cards in swimlanes matching the specified title\n'
+            = '* `label:color` - cards that have a label matching the given color\n'
+            = '* `label:name` - cards that have a label matching the given name\n'
+            = '* `user:username` - cards where the specified user is a member or assignee\n'
+            = '* `@username` - shorthand for `user:username`\n'
+            = '* `#label` - shorthand for `label:color-or-name`\n'
+            = '## Notes\n'
+            = '*  Multiple operators may be specified.\n'
+            = '*  Similar operators are *OR*ed together.  Cards that match any of the conditions will be returned.\n'
+            = '    `list:Available list:Blocked` would return cards contained in any list named *Blocked* or *Available*.\n'
+            = '*  Differing operators are *AND*ed together.  Only cards that match all of the differing operators are returned.\n'
+            = '`list:Available label:red` returns only cards in the list *Available* with a *red* label.\n'
+            = '* Text searches are case insensitive.\n'
+
+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
@@ -0,0 +1,201 @@
+const subManager = new SubsManager();
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click .js-due-cards-view-change': Popup.open('globalSearchViewChange'),
+      },
+    ];
+  },
+}).register('globalSearchHeaderBar');
+
+Template.globalSearch.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+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({
+  onCreated() {
+    this.isPageReady = new ReactiveVar(true);
+    this.searching = new ReactiveVar(false);
+    this.hasResults = new ReactiveVar(false);
+    this.query = new ReactiveVar('');
+    this.queryParams = null;
+    this.resultsCount = new ReactiveVar(0);
+    this.totalHits = new ReactiveVar(0);
+    this.queryErrors = new ReactiveVar(null);
+    Meteor.subscribe('setting');
+  },
+
+  results() {
+    if (this.queryParams) {
+      const results = Cards.globalSearch(this.queryParams);
+      // eslint-disable-next-line no-console
+      // console.log('user:', Meteor.user());
+      // eslint-disable-next-line no-console
+      // console.log('user:', Meteor.user().sessionData);
+      // console.log('errors:', results.errors);
+      this.totalHits.set(Meteor.user().sessionData.totalHits);
+      this.resultsCount.set(results.cards.count());
+      this.queryErrors.set(results.errors);
+      return results.cards;
+    }
+    this.resultsCount.set(0);
+    return [];
+  },
+
+  errorMessages() {
+    const errors = this.queryErrors.get();
+    const messages = [];
+
+    errors.notFound.boards.forEach(board => {
+      messages.push({ tag: 'board-title-not-found', value: board });
+    });
+    errors.notFound.swimlanes.forEach(swim => {
+      messages.push({ tag: 'swimlane-title-not-found', value: swim });
+    });
+    errors.notFound.lists.forEach(list => {
+      messages.push({ tag: 'list-title-not-found', value: list });
+    });
+    errors.notFound.users.forEach(user => {
+      messages.push({ tag: 'user-username-not-found', value: user });
+    });
+
+    return messages;
+  },
+
+  events() {
+    return [
+      {
+        'submit .js-search-query-form'(evt) {
+          evt.preventDefault();
+          this.query.set(evt.target.searchQuery.value);
+          this.queryErrors.set(null);
+
+          if (!this.query.get()) {
+            this.searching.set(false);
+            this.hasResults.set(false);
+            return;
+          }
+
+          this.searching.set(true);
+          this.hasResults.set(false);
+
+          let query = this.query.get();
+          // eslint-disable-next-line no-console
+          // console.log('query:', query);
+
+          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 operatorMap = {};
+          operatorMap[TAPi18n.__('operator-board')] = 'boards';
+          operatorMap[TAPi18n.__('operator-board-abbrev')] = 'boards';
+          operatorMap[TAPi18n.__('operator-swimlane')] = 'swimlanes';
+          operatorMap[TAPi18n.__('operator-swimlane-abbrev')] = 'swimlanes';
+          operatorMap[TAPi18n.__('operator-list')] = 'lists';
+          operatorMap[TAPi18n.__('operator-list-abbrev')] = 'lists';
+          operatorMap[TAPi18n.__('operator-label')] = 'labels';
+          operatorMap[TAPi18n.__('operator-label-abbrev')] = 'labels';
+          operatorMap[TAPi18n.__('operator-user')] = 'users';
+          operatorMap[TAPi18n.__('operator-user-abbrev')] = 'users';
+          operatorMap[TAPi18n.__('operator-is')] = 'is';
+
+          // eslint-disable-next-line no-console
+          // console.log('operatorMap:', operatorMap);
+          const params = {
+            boards: [],
+            swimlanes: [],
+            lists: [],
+            users: [],
+            labels: [],
+            is: [],
+          };
+
+          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 in operatorMap) {
+                params[operatorMap[op]].push(m.groups.value);
+              }
+              continue;
+            }
+
+            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;
+            }
+          }
+
+          // 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);
+                }
+              });
+            });
+          });
+        },
+      },
+    ];
+  },
+}).register('globalSearch');
@@ -0,0 +1,97 @@
+.global-search-board-wrapper
+  border-radius: 8px
+  //padding: 0.5rem
+  min-width: 400px
+  border-width: 8px
+  border-color: grey
+  border-style: solid
+  margin-bottom: 2rem
+  margin-right: auto
+  margin-left: auto
+
+.global-search-board-title
+  font-size: 1.4rem
+  font-weight: bold
+  padding: 0.5rem
+  background-color: grey
+  color: white
+
+.global-search-swimlane-title
+  font-size: 1.1rem
+  font-weight: bold
+  padding: 0.5rem
+  padding-bottom: 0.4rem
+  margin-top: 0
+  margin-bottom: 0.5rem
+  //border-top: black 1px solid
+  //border-bottom: black 1px solid
+  text-align: center
+
+.swimlane-default-color
+  background-color: lightgrey
+
+.global-search-list-title
+  font-weight: bold
+  font-size: 1.1rem
+  //padding-bottom: 0
+  //margin-bottom: 0
+  text-align: center
+  margin-bottom: 0.7rem
+
+.global-search-list-wrapper
+  margin: 1rem
+  border-radius: 5px
+  padding: 1.5rem
+  padding-top: 0.75rem
+  display: inline-block
+  min-width: 250px
+  max-width: 350px
+
+.global-search-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+
+.global-search-dueat-list-wrapper
+  max-width: 500px
+  margin-right: auto
+  margin-left: auto
+
+.global-search-field-name
+  font-weight: bold
+
+.global-search-context
+  display: inline-block
+
+.global-search-context-separator
+  font-weight: bold
+
+.global-search-context-list
+  margin-bottom: 0.7rem
+
+.global-search-error-messages
+  color: darkred
+
+.global-search-instructions
+  width: 40%
+  min-width: 400px
+  margin-right: auto
+  margin-left: auto
+  line-height: 150%
+
+.global-search-query-input
+  width: 90% !important
+  margin-right: auto
+  margin-left: auto
+
+.global-search-operator
+  font-family: Courier
+
+.global-search-value
+  font-family: Courier
+  font-style: italic
+
+code
+  color: white
+  background-color: grey
+  padding: 0.1rem !important
+  font-size: 0.7rem !important
@@ -19,16 +19,29 @@ template(name="header")
                  = title
        #header-new-board-icon
      else
+        //-
+          On sandstorm, the logo shouldn't be clickable, because we only have one
+          page/document on it, and we don't want to see the home page containing
+          the list of all boards.
+        unless currentSetting.hideLogo
+          if currentSetting.customTopLeftCornerLogoImageUrl
+            if currentSetting.customTopLeftCornerLogoLinkUrl
+              a(href="{{currentSetting.customTopLeftCornerLogoLinkUrl}}")
+                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")
+          unless currentSetting.customTopLeftCornerLogoImageUrl
+            img(src="{{pathFor '/logo-header.png'}}" alt="")
        ul
          li
            a(href="{{pathFor 'home'}}")
              span.fa.fa-home
              | {{_ 'all-boards'}}
          li.separator -
-          li
-            a(href="{{pathFor 'public'}}")
-              span.fa.fa-globe
-              | {{_ 'public'}}
+          //li
+          //  a(href="{{pathFor 'public'}}")
+          //    span.fa.fa-globe
+          //    | {{_ 'public'}}
          each currentUser.starredBoards
            li.separator -
            li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
@@ -37,8 +50,13 @@ template(name="header")
          else
            li.current {{_ 'quick-access-description'}}

-      a#header-new-board-icon.js-create-board
-        i.fa.fa-plus(title="Create a new board")
+      // Next line is used only for spacing at header,
+      // there is no visible clickable icon.
+      #header-new-board-icon
+      //  Hide duplicate create board button,
+      //  because it did not show board templates correctly.
+      //a#header-new-board-icon.js-create-board
+      //  i.fa.fa-plus(title="Create a new board")

      +notifications

@@ -52,17 +70,6 @@ template(name="header")
    #header-main-bar(class="{{#if wrappedHeader}}wrapper{{/if}}")
      +Template.dynamic(template=headerBar)

-      //unless hideLogo
-
-        //-
-          On sandstorm, the logo shouldn't be clickable, because we only have one
-          page/document on it, and we don't want to see the home page containing
-          the list of all boards.
-
-      //  unless currentSetting.hideLogo
-      //    a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
-      //    img(src="{{pathFor '/logo-header.png'}}" alt="")
-
  if appIsOffline
    +offlineWarning

@@ -19,6 +19,27 @@ head

 template(name="userFormsLayout")
  section.auth-layout
+    if currentSetting.hideLogo
+      h1.at-form-landing-logo
+        br
+        br
+    unless currentSetting.hideLogo
+      h1.at-form-landing-logo
+      if currentSetting.customLoginLogoImageUrl
+        if currentSetting.customLoginLogoLinkUrl
+          a(href="{{currentSetting.customLoginLogoLinkUrl}}")
+            img(src="{{currentSetting.customLoginLogoImageUrl}}" width="300" height="auto")
+          br
+        unless currentSetting.customLoginLogoLinkUrl
+          img(src="{{currentSetting.customLoginLogoImageUrl}}" width="300" height="auto")
+          br
+      unless currentSetting.customLoginLogoImageUrl
+        img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
+        br
+      if currentSetting.textBelowCustomLoginLogo
+        +viewer
+          | {{currentSetting.textBelowCustomLoginLogo}}
+        br
    section.auth-dialog
      if isLoading
        +loader
@@ -74,18 +74,8 @@ Template.userFormsLayout.helpers({
      let name = lang.name;
      if (lang.name === 'br') {
        name = 'Brezhoneg';
-      } else if (lang.name === 'Español') {
-        name = 'español';
-      } 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 === 'Español de Puerto Rico') {
-        name = 'español de Puerto Rico';
+      } else if (lang.name === 'es-PY') {
+        name = 'Español de Paraguayo';
      } else if (lang.name === 'fr-BE') {
        name = 'Français (Belgique)';
      } else if (lang.name === 'fr-CA') {
@@ -276,7 +276,7 @@ kbd
  padding-bottom: 0

 .wrapper
-  max-width: 1200px
+  width: calc(100% - 20px)
  margin: 0 auto

 .relative
@@ -388,10 +388,12 @@ a
  ol
    list-style-type: decimal
    padding-left: 20px
+    padding-bottom: 10px

  ul
    list-style-type: initial
    padding-left: 20px
+    padding-bottom: 10px

  em
    font-style : italic
@@ -447,7 +449,6 @@ a
  flex-direction: column
  align-items: center
  justify-content: center
-  height: 100%

  .auth-dialog
    margin: 0 !important
@@ -0,0 +1,92 @@
+template(name="myCardsHeaderBar")
+  if currentUser
+    h1
+      //a.back-btn(href="{{pathFor 'home'}}")
+      //  i.fa.fa-chevron-left
+      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
+      i.fa.fa-keyboard-o
+      | {{_ 'my-cards'}}
+
+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
+                +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
+              .my-cards-card-wrapper
+                a.minicard-wrapper.card-title(href=card.absoluteUrl)
+                  +minicard(card)
+                ul.my-cards-context-list
+                  li.my-cards-context(title="{{_ 'board'}}")
+                    +viewer
+                      = card.getBoard.title
+                  li.my-cards-context.my-cards-context-separator
+                    = ' '
+                    | {{_ 'context-separator'}}
+                    = ' '
+                  li.my-cards-context(title="{{_ 'swimlane'}}")
+                    +viewer
+                      = card.getSwimlane.title
+                  li.my-cards-context
+                    = ' '
+                    | {{_ 'context-separator'}}
+                    = ' '
+                  li.my-cards-context(title="{{_ 'list'}}")
+                    +viewer
+                      = card.getList.title
+    else
+      +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
@@ -0,0 +1,250 @@
+const subManager = new SubsManager();
+
+BlazeComponent.extendComponent({
+  myCardsSort() {
+    // eslint-disable-next-line no-console
+    // console.log('sort:', Utils.myCardsSort());
+    return Utils.myCardsSort();
+  },
+
+  events() {
+    return [
+      {
+        'click .js-toggle-my-cards-choose-sort': Popup.open(
+          'myCardsSortChange',
+        ),
+      },
+    ];
+  },
+}).register('myCardsHeaderBar');
+
+Template.myCards.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click .js-my-cards-sort-board'() {
+          Utils.setMyCardsSort('board');
+          Popup.close();
+        },
+
+        'click .js-my-cards-sort-dueat'() {
+          Utils.setMyCardsSort('dueAt');
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('myCardsSortChangePopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.isPageReady = new ReactiveVar(false);
+
+    this.autorun(() => {
+      const handle = subManager.subscribe('myCards');
+      Tracker.nonreactive(() => {
+        Tracker.autorun(() => {
+          this.isPageReady.set(handle.ready());
+        });
+      });
+    });
+    Meteor.subscribe('setting');
+  },
+
+  myCardsSort() {
+    // eslint-disable-next-line no-console
+    //console.log('sort:', Utils.myCardsSort());
+    return Utils.myCardsSort();
+  },
+
+  sortByBoard() {
+    return this.myCardsSort() === 'board';
+  },
+
+  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,
+        },
+      },
+    );
+
+    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) {
+        // 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) {
+          swimlane = null;
+          return;
+        }
+        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) => {
+            return a.sort - b.sort;
+          });
+        });
+        swimlane.myLists.sort((a, b) => {
+          return a.sort - b.sort;
+        });
+      });
+      board.mySwimlanes.sort((a, b) => {
+        return a.sort - b.sort;
+      });
+    });
+
+    boards.sort((a, b) => {
+      let x = a.sort;
+      let y = b.sort;
+
+      // show the template board last
+      if (a.type === 'template-container') {
+        x = 99999999;
+      } else if (b.type === 'template-container') {
+        y = 99999999;
+      }
+      return x - y;
+    });
+
+    // eslint-disable-next-line no-console
+    // console.log('boards:', boards);
+    return boards;
+  },
+
+  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');
@@ -0,0 +1,69 @@
+.my-cards-board-wrapper
+  border-radius: 8px
+  //padding: 0.5rem
+  min-width: 400px
+  border-width: 8px
+  border-color: grey
+  border-style: solid
+  margin-bottom: 2rem
+  margin-right: auto
+  margin-left: auto
+
+.my-cards-board-title
+  font-size: 1.4rem
+  font-weight: bold
+  padding: 0.5rem
+  background-color: grey
+  color: white
+
+.my-cards-swimlane-title
+  font-size: 1.1rem
+  font-weight: bold
+  padding: 0.5rem
+  padding-bottom: 0.4rem
+  margin-top: 0
+  margin-bottom: 0.5rem
+  //border-top: black 1px solid
+  //border-bottom: black 1px solid
+  text-align: center
+
+.swimlane-default-color
+  background-color: lightgrey
+
+.my-cards-list-title
+  font-weight: bold
+  font-size: 1.1rem
+  //padding-bottom: 0
+  //margin-bottom: 0
+  text-align: center
+  margin-bottom: 0.7rem
+
+.my-cards-list-wrapper
+  margin: 1rem
+  border-radius: 5px
+  padding: 1.5rem
+  padding-top: 0.75rem
+  display: inline-block
+  min-width: 250px
+  max-width: 350px
+
+.my-cards-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+
+.my-cards-dueat-list-wrapper
+  max-width: 500px
+  margin-right: auto
+  margin-left: auto
+
+.my-cards-field-name
+  font-weight: bold
+
+.my-cards-context
+  display: inline-block
+
+.my-cards-context-separator
+  font-weight: bold
+
+.my-cards-context-list
+  margin-bottom: 0.7rem
@@ -26,6 +26,10 @@ template(name='notificationIcon')
    i.fa.fa-code.activity-type(title="custom field")
  else if($in activityType 'addedLabel' 'removedLabel')
    i.fa.fa-tag.activity-type(title="label")
+  else if($in activityType 'a-startAt' 'a-receivedAt')
+    i.fa.fa-clock-o.activity-type(title="date")
+  else if($in activityType 'a-dueAt' 'a-endAt')
+    i.fa.fa-clock-o.activity-type(title="date")

  else if($in activityType 'createList' 'removeList' 'archivedList')
    +listNotificationIcon
@@ -3,32 +3,32 @@ template(name="cardActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="setdate-action")
-          option(value="setDate") {{{_'r-set'}}}
-          option(value="updateDate") {{{_'r-update'}}}
+          option(value="setDate") {{_'r-set'}}
+          option(value="updateDate") {{_'r-update'}}
      div.trigger-text
-        | {{{_'r-datefield'}}}
+        | {{_'r-datefield'}}
      div.trigger-dropdown
        select(id="setdate-datefield")
-          option(value="startAt") {{{_'r-df-start-at'}}}
-          option(value="dueAt") {{{_'r-df-due-at'}}}
-          option(value="endAt") {{{_'r-df-end-at'}}}
-          option(value="receivedAt") {{{_'r-df-received-at'}}}
+          option(value="startAt") {{_'r-df-start-at'}}
+          option(value="dueAt") {{_'r-df-due-at'}}
+          option(value="endAt") {{_'r-df-end-at'}}
+          option(value="receivedAt") {{_'r-df-received-at'}}
      div.trigger-text
-        | {{{_'r-to-current-datetime'}}}
+        | {{_'r-to-current-datetime'}}
    div.trigger-button.js-set-date-action.js-goto-rules
      i.fa.fa-plus

  div.trigger-item
    div.trigger-content
      div.trigger-text
-        | {{{_'r-remove-value-from'}}}
-        | {{{_'r-datefield'}}}
+        | {{_'r-remove-value-from'}}
+        | {{_'r-datefield'}}
      div.trigger-dropdown
        select(id="setdate-removedatefieldvalue")
-          option(value="startAt") {{{_'r-df-start-at'}}}
-          option(value="dueAt") {{{_'r-df-due-at'}}}
-          option(value="endAt") {{{_'r-df-end-at'}}}
-          option(value="receivedAt") {{{_'r-df-received-at'}}}
+          option(value="startAt") {{_'r-df-start-at'}}
+          option(value="dueAt") {{_'r-df-due-at'}}
+          option(value="endAt") {{_'r-df-end-at'}}
+          option(value="receivedAt") {{_'r-df-received-at'}}
    div.trigger-button.js-remove-datevalue-action.js-goto-rules
      i.fa.fa-plus

@@ -36,10 +36,10 @@ template(name="cardActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="label-action")
-          option(value="add") {{{_'r-add'}}}
-          option(value="remove") {{{_'r-remove'}}}
+          option(value="add") {{_'r-add'}}
+          option(value="remove") {{_'r-remove'}}
      div.trigger-text
-        | {{{_'r-label'}}}
+        | {{_'r-label'}}
      div.trigger-dropdown
        select(id="label-id")
          each labels
@@ -52,26 +52,26 @@ template(name="cardActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="member-action")
-          option(value="add") {{{_'r-add'}}}
-          option(value="remove") {{{_'r-remove'}}}
+          option(value="add") {{_'r-add'}}
+          option(value="remove") {{_'r-remove'}}
      div.trigger-text
-        | {{{_'r-member'}}}
+        | {{_'r-member'}}
      div.trigger-dropdown
-        input(id="member-name",type=text,placeholder="{{{_'r-name'}}}")
+        input(id="member-name",type=text,placeholder="{{_'r-name'}}")
    div.trigger-button.js-add-member-action.js-goto-rules
      i.fa.fa-plus

  div.trigger-item
    div.trigger-content
      div.trigger-text
-        | {{{_'r-remove-all'}}}
+        | {{_'r-remove-all'}}
    div.trigger-button.js-add-removeall-action.js-goto-rules
      i.fa.fa-plus

  div.trigger-item
    div.trigger-content
      div.trigger-text
-        | {{{_'r-set-color'}}}
+        | {{_'r-set-color'}}
        button.trigger-button.trigger-button-color.js-show-color-palette(
          id="color-action"
          class="card-details-{{cardColorButton}}")
@@ -3,12 +3,12 @@ template(name="checklistActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="check-action")
-          option(value="add") {{{_'r-add'}}}
-          option(value="remove") {{{_'r-remove'}}}
+          option(value="add") {{_'r-add'}}
+          option(value="remove") {{_'r-remove'}}
      div.trigger-text 
-        | {{{_'r-checklist'}}}
+        | {{_'r-checklist'}}
      div.trigger-dropdown
-        input(id="checklist-name",type=text,placeholder="{{{_'r-name'}}}")  
+        input(id="checklist-name",type=text,placeholder="{{_'r-name'}}")  
    div.trigger-button.js-add-checklist-action.js-goto-rules
      i.fa.fa-plus  

@@ -16,12 +16,12 @@ template(name="checklistActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="checkall-action")
-          option(value="check") {{{_'r-check-all'}}}
-          option(value="uncheck") {{{_'r-uncheck-all'}}}
+          option(value="check") {{_'r-check-all'}}
+          option(value="uncheck") {{_'r-uncheck-all'}}
      div.trigger-text 
-        | {{{_'r-items-check'}}}
+        | {{_'r-items-check'}}
      div.trigger-dropdown
-        input(id="checklist-name2",type=text,placeholder="{{{_'r-name'}}}")  
+        input(id="checklist-name2",type=text,placeholder="{{_'r-name'}}")  
    div.trigger-button.js-add-checkall-action.js-goto-rules
      i.fa.fa-plus

@@ -30,36 +30,36 @@ template(name="checklistActions")
    div.trigger-content
      div.trigger-dropdown
        select(id="check-item-action")
-          option(value="check") {{{_'r-check'}}}
-          option(value="uncheck") {{{_'r-uncheck'}}}
+          option(value="check") {{_'r-check'}}
+          option(value="uncheck") {{_'r-uncheck'}}
      div.trigger-text 
-        | {{{_'r-item'}}}
+        | {{_'r-item'}}
      div.trigger-dropdown
-        input(id="checkitem-name",type=text,placeholder="{{{_'r-name'}}}")
+        input(id="checkitem-name",type=text,placeholder="{{_'r-name'}}")
      div.trigger-text 
-        | {{{_'r-of-checklist'}}}
+        | {{_'r-of-checklist'}}
      div.trigger-dropdown
-        input(id="checklist-name3",type=text,placeholder="{{{_'r-name'}}}")  
+        input(id="checklist-name3",type=text,placeholder="{{_'r-name'}}")  
    div.trigger-button.js-add-check-item-action.js-goto-rules
      i.fa.fa-plus

  div.trigger-item
      div.trigger-content
        div.trigger-text 
-          | {{{_'r-add-checklist'}}}
+          | {{_'r-add-checklist'}}
        div.trigger-dropdown
-          input(id="checklist-name-3",type=text,placeholder="{{{_'r-name'}}}")
+          input(id="checklist-name-3",type=text,placeholder="{{_'r-name'}}")
        div.trigger-text 
-          | {{{_'r-with-items'}}}
+          | {{_'r-with-items'}}
        div.trigger-dropdown
-          input(id="checklist-items",type=text,placeholder="{{{_'r-items-list'}}}")    
+          input(id="checklist-items",type=text,placeholder="{{_'r-items-list'}}")    
      div.trigger-button.js-add-checklist-items-action.js-goto-rules
        i.fa.fa-plus  

  div.trigger-item
      div.trigger-content
        div.trigger-text 
-          | {{{_'r-checklist-note'}}}
+          | {{_'r-checklist-note'}}



@@ -2,7 +2,7 @@ template(name="ruleDetails")
  .rules
    h2
      i.fa.fa-magic
-      | {{{_ 'r-rule-details' }}}
+      | {{_ 'r-rule-details' }}
    .triggers-content
        .triggers-body
            .triggers-main-body
@@ -21,4 +21,4 @@ template(name="ruleDetails")
    div.rules-back
        button.js-goback
          i.fa.fa-chevron-left
-          | {{{_ 'back'}}}
+          | {{_ 'back'}}
@@ -2,10 +2,12 @@
  overflow:hidden
  overflow-y:scroll
  max-height: 400px
+  padding-right: 5px
 .rules-lists-item
  display: block
  position: relative
  overflow: auto
+  border-bottom: 1px solid #bfbfbf
  p
  	display: inline-block
  	float: left
@@ -1,7 +1,7 @@
 template(name="rulesActions")
  h2
    i.fa.fa-magic
-    | {{{_ 'r-rule' }}} "#{data.ruleName.get}" - {{{_ 'r-add-action'}}}
+    | {{_ 'r-rule' }} "#{data.ruleName.get}" - {{_ 'r-add-action'}}
  .triggers-content
    .triggers-body
      .triggers-side-menu
@@ -26,4 +26,4 @@ template(name="rulesActions")
  div.rules-back
        button.js-goback
          i.fa.fa-chevron-left
-          | {{{_ 'back'}}}
+          | {{_ 'back'}}
@@ -2,7 +2,7 @@ template(name="rulesList")
  .rules
    h2
      i.fa.fa-magic
-      | {{{_ 'r-board-rules' }}}
+      | {{_ 'r-board-rules' }}

    ul.rules-list
      each rules
@@ -12,26 +12,26 @@ template(name="rulesList")
          div.rules-btns-group
            button.js-goto-details
              i.fa.fa-eye
-              | {{{_ 'r-view-rule'}}}
+              | {{_ 'r-view-rule'}}
            if currentUser.isAdmin
              button.js-delete-rule
                i.fa.fa-trash-o
-                | {{{_ 'r-delete-rule'}}}
+                | {{_ 'r-delete-rule'}}
            else if currentUser.isBoardAdmin
              button.js-delete-rule
                i.fa.fa-trash-o
-                | {{{_ 'r-delete-rule'}}}
+                | {{_ 'r-delete-rule'}}
      else
-        li.no-items-message {{{_ 'r-no-rules' }}}
+        li.no-items-message {{_ 'r-no-rules' }}
    if currentUser.isAdmin
      div.rules-add
        button.js-goto-trigger
          i.fa.fa-plus
-          | {{{_ 'r-add-rule'}}}
-        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")
+          | {{_ 'r-add-rule'}}
+        input(type=text,placeholder="{{_ 'r-new-rule-name' }}",id="ruleTitle")
    else if currentUser.isBoardAdmin
      div.rules-add
        button.js-goto-trigger
          i.fa.fa-plus
-          | {{{_ 'r-add-rule'}}}
-        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")
+          | {{_ 'r-add-rule'}}
+        input(type=text,placeholder="{{_ 'r-new-rule-name' }}",id="ruleTitle")
@@ -1,7 +1,7 @@
 template(name="rulesTriggers")
  h2
    i.fa.fa-magic
-    | {{{_ 'r-rule' }}} "#{data.ruleName.get}" - {{{_ 'r-add-trigger'}}}
+    | {{_ 'r-rule' }} "#{data.ruleName.get}" - {{_ 'r-add-trigger'}}
  .triggers-content
    .triggers-body
      .triggers-side-menu
@@ -22,4 +22,4 @@ template(name="rulesTriggers")
  div.rules-back
        button.js-goback
          i.fa.fa-chevron-left
-          | {{{_ 'back'}}}
+          | {{_ 'back'}}
@@ -100,7 +100,7 @@ template(name="boardTriggers")
  div.trigger-item
      div.trigger-content
        div.trigger-text 
-          | {{{_'r-board-note'}}}
+          | {{_'r-board-note'}}

 template(name="boardCardTitlePopup")
    form
@@ -109,8 +109,3 @@ template(name="boardCardTitlePopup")
        input.js-card-filter-name(type="text" value=title autofocus)
      input.js-card-filter-button.primary.wide(type="submit" value="{{_ 'set-filter'}}")

-   
-  
-
-
-
@@ -5,34 +5,105 @@ template(name="people")
    else
      .content-title.ext-box
        .ext-box-left
-          span
-            i.fa.fa-users
-            | {{_ 'people'}}
-          input#searchInput(placeholder="{{_ 'search'}}")
-          button#searchButton
-            i.fa.fa-search
-            | {{_ 'search'}}
-        .ext-box-right
-          span {{_ 'people-number'}} #{peopleNumber}
+          if loading.get
+            +spinner
+          else if orgSetting.get
+            span
+              i.fa.fa-sitemap
+              unless isMiniScreen
+                | {{_ 'organizations'}}
+            input#searchOrgInput(placeholder="{{_ 'search'}}")
+            button#searchOrgButton
+              i.fa.fa-search
+              | {{_ 'search'}}
+            .ext-box-right
+              span {{#unless isMiniScreen}}{{_ 'org-number'}}{{/unless}} #{orgNumber}
+          else if teamSetting.get
+            span
+              i.fa.fa-users
+              unless isMiniScreen
+                | {{_ 'teams'}}
+            input#searchTeamInput(placeholder="{{_ 'search'}}")
+            button#searchTeamButton
+              i.fa.fa-search
+              | {{_ 'search'}}
+            .ext-box-right
+              span {{#unless isMiniScreen}}{{_ 'team-number'}}{{/unless}} #{teamNumber}
+          else if peopleSetting.get
+            span
+              i.fa.fa-user
+              unless isMiniScreen
+                | {{_ 'people'}}
+            input#searchInput(placeholder="{{_ 'search'}}")
+            button#searchButton
+              i.fa.fa-search
+              | {{_ 'search'}}
+            .ext-box-right
+              span {{#unless isMiniScreen}}{{_ 'people-number'}}{{/unless}} #{peopleNumber}
      .content-body
        .side-menu
          ul
            li.active
-              a.js-setting-menu(data-id="people-setting")
+              a.js-org-menu(data-id="org-setting")
+                i.fa.fa-sitemap
+                | {{_ 'organizations'}}
+            li
+              a.js-team-menu(data-id="team-setting")
                i.fa.fa-users
+                | {{_ 'teams'}}
+            li
+              a.js-people-menu(data-id="people-setting")
+                i.fa.fa-user
                | {{_ 'people'}}
        .main-body
          if loading.get
            +spinner
-          else if people.get
+          else if orgSetting.get
+            +orgGeneral
+          else if teamSetting.get
+            +teamGeneral
+          else if peopleSetting.get
            +peopleGeneral

+
+template(name="orgGeneral")
+  table
+    tbody
+      tr
+        th {{_ 'displayName'}}
+        th {{_ 'description'}}
+        th {{_ 'shortName'}}
+        th {{_ 'website'}}
+        th {{_ 'teams'}}
+        th {{_ 'createdAt'}}
+        th {{_ 'active'}}
+        th
+          +newOrgRow
+      each org in orgList
+        +orgRow(orgId=org._id)
+
+template(name="teamGeneral")
+  table
+    tbody
+      tr
+        th {{_ 'displayName'}}
+        th {{_ 'description'}}
+        th {{_ 'shortName'}}
+        th {{_ 'website'}}
+        th {{_ 'createdAt'}}
+        th {{_ 'active'}}
+        th
+          +newTeamRow
+      each team in teamList
+        +teamRow(teamId=team._id)
+
 template(name="peopleGeneral")
  table
    tbody
      tr
        th {{_ 'username'}}
        th {{_ 'fullname'}}
+        th {{_ 'initials'}}
        th {{_ 'admin'}}
        th {{_ 'email'}}
        th {{_ 'verified'}}
@@ -44,11 +115,93 @@ template(name="peopleGeneral")
      each user in peopleList
        +peopleRow(userId=user._id)

+template(name="newOrgRow")
+  a.new-org
+    i.fa.fa-edit
+    | {{_ 'new'}}
+
+template(name="newTeamRow")
+  a.new-team
+    i.fa.fa-edit
+    | {{_ 'new'}}
+
 template(name="newUserRow")
  a.new-user
    i.fa.fa-edit
    | {{_ 'new'}}

+template(name="orgRow")
+  tr
+    if orgData.loginDisabled
+      td <s>{{ orgData.displayName }}</s>
+    else
+      td {{ orgData.displayName }}
+    if orgData.loginDisabled
+      td <s>{{ orgData.orgDesc }}</s>
+    else
+      td {{ orgData.desc }}
+    if orgData.loginDisabled
+      td <s>{{ orgData.name }}</s>
+    else
+      td {{ orgData.name }}
+    if orgData.loginDisabled
+      td <s>{{ orgData.website }}</s>
+    else
+      td {{ orgData.website }}
+    if orgData.loginDisabled
+      td <s>{{ orgData.teams }}</s>
+    else
+      td {{ orgData.teams }}
+    if orgData.loginDisabled
+      td <s>{{ moment orgData.createdAt 'LLL' }}</s>
+    else
+      td {{ moment orgData.createdAt 'LLL' }}
+    td
+      if orgData.loginDisabled
+        | {{_ 'no'}}
+      else
+        | {{_ 'yes'}}
+    td
+      a.edit-org
+        i.fa.fa-edit
+        | {{_ 'edit'}}
+      a.more-settings-org
+        i.fa.fa-ellipsis-h
+
+template(name="teamRow")
+  tr
+    if teamData.loginDisabled
+      td <s>{{ teamData.displayName }}</s>
+    else
+      td {{ teamData.displayName }}
+    if teamData.loginDisabled
+      td <s>{{ teamData.desc }}</s>
+    else
+      td {{ teamData.desc }}
+    if teamData.loginDisabled
+      td <s>{{ teamData.dame }}</s>
+    else
+      td {{ teamData.name }}
+    if teamData.loginDisabled
+      td <s>{{ teamData.website }}</s>
+    else
+      td {{ teamData.website }}
+    if orgData.loginDisabled
+      td <s>{{ moment teamData.createdAt 'LLL' }}</s>
+    else
+      td {{ moment teamData.createdAt 'LLL' }}
+    td
+      if teamData.loginDisabled
+        | {{_ 'no'}}
+      else
+        | {{_ 'yes'}}
+    td
+      a.edit-team
+        i.fa.fa-edit
+        | {{_ 'edit'}}
+      a.more-settings-team
+        i.fa.fa-ellipsis-h
+
 template(name="peopleRow")
  tr
    if userData.loginDisabled
@@ -59,6 +212,10 @@ template(name="peopleRow")
      td <s>{{ userData.profile.fullname }}</s>
    else
      td {{ userData.profile.fullname }}
+    if userData.loginDisabled
+      td <s>{{ userData.profile.initials }}</s>
+    else
+      td {{ userData.profile.initials }}
    if userData.loginDisabled
      td
        if userData.isAdmin
@@ -104,13 +261,64 @@ template(name="peopleRow")
      a.edit-user
        i.fa.fa-edit
        | {{_ 'edit'}}
+      a.more-settings-user
+        i.fa.fa-ellipsis-h
+
+template(name="editOrgPopup")
+  form
+    label.hide.orgId(type="text" value=org._id)
+    label
+      | {{_ 'orgDisplayName'}}
+      input.js-orgDisplayName(type="text" value=org.displayName required)
+      span.error.hide.orgname-taken
+        | {{_ 'error-orgname-taken'}}
+    label
+      | {{_ 'orgDesc'}}
+      input.js-orgDesc(type="text" value=org.desc required)
+    label
+      | {{_ 'orgName'}}
+      input.js-orgName(type="text" value=org.name required)
+    label
+      | {{_ 'orgWebsite'}}
+      input.js-orgWebsite(type="text" value=org.website required)
+    label
+      | {{_ 'active'}}
+      select.select-active.js-org-isactive
+        option(value="false") {{_ 'yes'}}
+        option(value="true" selected="{{org.loginDisabled}}") {{_ 'no'}}
+    hr
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+
+template(name="editTeamPopup")
+  form
+    label.hide.teamId(type="text" value=team._id)
+    label
+      | {{_ 'displayName'}}
+      input.js-teamDisplayName(type="text" value=team.displayName required)
+      span.error.hide.teamname-taken
+        | {{_ 'error-teamname-taken'}}
+    label
+      | {{_ 'description'}}
+      input.js-orgDesc(type="text" value=org.desc required)
+    label
+      | {{_ 'name'}}
+      input.js-orgName(type="text" value=org.name required)
+    label
+      | {{_ 'website'}}
+      input.js-orgWebsite(type="text" value=org.website required)
+    label
+      | {{_ 'active'}}
+      select.select-active.js-team-isactive
+        option(value="false") {{_ 'yes'}}
+        option(value="true" selected="{{team.loginDisabled}}") {{_ 'no'}}
+    hr
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")

 template(name="editUserPopup")
  form
    label.hide.userId(type="text" value=user._id)
-    label
-      | {{_ 'fullname'}}
-      input.js-profile-fullname(type="text" value=user.profile.fullname)
    label
      | {{_ 'username'}}
      span.error.hide.username-taken
@@ -118,7 +326,18 @@ template(name="editUserPopup")
      if isLdap
        input.js-profile-username(type="text" value=user.username readonly)
      else
-        input.js-profile-username(type="text" value=user.username)
+        input.js-profile-username(type="text" value=user.username required)
+    label
+      | {{_ 'fullname'}}
+      input.js-profile-fullname(type="text" value=user.profile.fullname required)
+    label
+      | {{_ 'initials'}}
+      input.js-profile-initials(type="text" value=user.profile.initials)
+    label
+      | {{_ 'admin'}}
+      select.select-role.js-profile-isadmin
+        option(value="false") {{_ 'no'}}
+        option(value="true" selected="{{user.isAdmin}}") {{_ 'yes'}}
    label
      | {{_ 'email'}}
      span.error.hide.email-taken
@@ -126,12 +345,12 @@ template(name="editUserPopup")
      if isLdap
        input.js-profile-email(type="email" value="{{user.emails.[0].address}}" readonly)
      else
-        input.js-profile-email(type="email" value="{{user.emails.[0].address}}")
+        input.js-profile-email(type="email" value="{{user.emails.[0].address}}" required)
    label
-      | {{_ 'admin'}}
-      select.select-role.js-profile-isadmin
+      | {{_ 'verified'}}
+      select.select-verified.js-profile-email-verified
        option(value="false") {{_ 'no'}}
-        option(value="true" selected="{{user.isAdmin}}") {{_ 'yes'}}
+        option(value="true" selected="{{userData.emails.[0].verified}}") {{_ 'yes'}}
    label
      | {{_ 'active'}}
      select.select-active.js-profile-isactive
@@ -151,15 +370,64 @@ template(name="editUserPopup")
      input.js-profile-password(type="password")
    div.buttonsContainer
      input.primary.wide(type="submit" value="{{_ 'save'}}")
-    //  div
-    //  input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")
+
+template(name="newOrgPopup")
+  form
+    //label.hide.userId(type="text" value=user._id)
+    label
+      | {{_ 'displayName'}}
+      input.js-displayName(type="text" value="" required)
+    label
+      | {{_ 'description'}}
+      input.js-desc(type="text" value="" required)
+    label
+      | {{_ 'shortName'}}
+      input.js-name(type="text" value="")
+    label
+      | {{_ 'teams'}}
+      input.js-teams(type="text" value="")
+    label
+      | {{_ 'website'}}
+      input.js-website(type="text" value="")
+    label
+      | {{_ 'active'}}
+      select.select-active.js-profile-isactive
+        option(value="false" selected="selected") {{_ 'yes'}}
+        option(value="true") {{_ 'no'}}
+    hr
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+
+template(name="newTeamPopup")
+  form
+    //label.hide.teamId(type="text" value=team._id)
+    label
+      | {{_ 'displayName'}}
+      input.js-teamDisplayName(type="text" value="" required)
+    label
+      | {{_ 'description'}}
+      input.js-teamDesc(type="text" value="" required)
+    label
+      | {{_ 'shortName'}}
+      input.js-teamName(type="text" value="")
+    label
+      | {{_ 'website'}}
+      input.js-teamWebsite(type="text" value="")
+    label
+      | {{_ 'active'}}
+      select.select-active.js-profile-isactive
+        option(value="false" selected="selected") {{_ 'yes'}}
+        option(value="true") {{_ 'no'}}
+    hr
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")

 template(name="newUserPopup")
  form
    //label.hide.userId(type="text" value=user._id)
    label
      | {{_ 'fullname'}}
-      input.js-profile-fullname(type="text" value="")
+      input.js-profile-fullname(type="text" value="" required)
    label
      | {{_ 'username'}}
      span.error.hide.username-taken
@@ -167,7 +435,7 @@ template(name="newUserPopup")
      //if isLdap
      //  input.js-profile-username(type="text" value=user.username readonly)
      //else
-      input.js-profile-username(type="text" value="")
+      input.js-profile-username(type="text" value="" required)
    label
      | {{_ 'email'}}
      span.error.hide.email-taken
@@ -175,7 +443,7 @@ template(name="newUserPopup")
      //if isLdap
      //  input.js-profile-email(type="email" value="{{user.emails.[0].address}}" readonly)
      //else
-      input.js-profile-email(type="email" value="")
+      input.js-profile-email(type="email" value="" required)
    label
      | {{_ 'admin'}}
      select.select-role.js-profile-isadmin
@@ -197,6 +465,56 @@ template(name="newUserPopup")
    hr
    label
      | {{_ 'password'}}
-      input.js-profile-password(type="password")
+      input.js-profile-password(type="password" required)
    div.buttonsContainer
      input.primary.wide(type="submit" value="{{_ 'save'}}")
+
+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'}}")
+
+template(name="settingsUserPopup")
+  ul.pop-over-list
+    li
+      a.impersonate-user
+        i.fa.fa-user
+        | {{_ 'impersonate-user'}}
+  // 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'}}")
@@ -1,3 +1,5 @@
+const orgsPerPage = 25;
+const teamsPerPage = 25;
 const usersPerPage = 25;

 BlazeComponent.extendComponent({
@@ -7,17 +9,45 @@ BlazeComponent.extendComponent({
  onCreated() {
    this.error = new ReactiveVar('');
    this.loading = new ReactiveVar(false);
-    this.people = new ReactiveVar(true);
+    this.orgSetting = new ReactiveVar(true);
+    this.teamSetting = new ReactiveVar(true);
+    this.peopleSetting = new ReactiveVar(true);
+    this.findOrgsOptions = new ReactiveVar({});
+    this.findTeamsOptions = new ReactiveVar({});
    this.findUsersOptions = new ReactiveVar({});
-    this.number = new ReactiveVar(0);
+    this.numberOrgs = new ReactiveVar(0);
+    this.numberTeams = new ReactiveVar(0);
+    this.numberPeople = new ReactiveVar(0);

    this.page = new ReactiveVar(1);
    this.loadNextPageLocked = false;
    this.callFirstWith(null, 'resetNextPeak');
    this.autorun(() => {
-      const limit = this.page.get() * usersPerPage;
+      const limitOrgs = this.page.get() * orgsPerPage;
+      const limitTeams = this.page.get() * teamsPerPage;
+      const limitUsers = this.page.get() * usersPerPage;

-      this.subscribe('people', this.findUsersOptions.get(), limit, () => {
+      this.subscribe('org', this.findOrgsOptions.get(), limitOrgs, () => {
+        this.loadNextPageLocked = false;
+        const nextPeakBefore = this.callFirstWith(null, 'getNextPeak');
+        this.calculateNextPeak();
+        const nextPeakAfter = this.callFirstWith(null, 'getNextPeak');
+        if (nextPeakBefore === nextPeakAfter) {
+          this.callFirstWith(null, 'resetNextPeak');
+        }
+      });
+
+      this.subscribe('team', this.findTeamsOptions.get(), limitTeams, () => {
+        this.loadNextPageLocked = false;
+        const nextPeakBefore = this.callFirstWith(null, 'getNextPeak');
+        this.calculateNextPeak();
+        const nextPeakAfter = this.callFirstWith(null, 'getNextPeak');
+        if (nextPeakBefore === nextPeakAfter) {
+          this.callFirstWith(null, 'resetNextPeak');
+        }
+      });
+
+      this.subscribe('people', this.findUsersOptions.get(), limitUsers, () => {
        this.loadNextPageLocked = false;
        const nextPeakBefore = this.callFirstWith(null, 'getNextPeak');
        this.calculateNextPeak();
@@ -31,6 +61,22 @@ BlazeComponent.extendComponent({
  events() {
    return [
      {
+        'click #searchOrgButton'() {
+          this.filterOrg();
+        },
+        'keydown #searchOrgInput'(event) {
+          if (event.keyCode === 13 && !event.shiftKey) {
+            this.filterOrg();
+          }
+        },
+        'click #searchTeamButton'() {
+          this.filterTeam();
+        },
+        'keydown #searchTeamInput'(event) {
+          if (event.keyCode === 13 && !event.shiftKey) {
+            this.filterTeam();
+          }
+        },
        'click #searchButton'() {
          this.filterPeople();
        },
@@ -39,9 +85,18 @@ BlazeComponent.extendComponent({
            this.filterPeople();
          }
        },
+        'click #newOrgButton'() {
+          Popup.open('newOrg');
+        },
+        'click #newTeamButton'() {
+          Popup.open('newTeam');
+        },
        'click #newUserButton'() {
          Popup.open('newUser');
        },
+        'click a.js-org-menu': this.switchMenu,
+        'click a.js-team-menu': this.switchMenu,
+        'click a.js-people-menu': this.switchMenu,
      },
    ];
  },
@@ -84,18 +139,63 @@ BlazeComponent.extendComponent({
  setLoading(w) {
    this.loading.set(w);
  },
+  orgList() {
+    const orgs = Org.find(this.findOrgsOptions.get(), {
+      fields: { _id: true },
+    });
+    this.numberOrgs.set(org.count(false));
+    return orgs;
+  },
+  teamList() {
+    const teams = Team.find(this.findTeamsOptions.get(), {
+      fields: { _id: true },
+    });
+    this.numberTeams.set(team.count(false));
+    return teams;
+  },
  peopleList() {
    const users = Users.find(this.findUsersOptions.get(), {
      fields: { _id: true },
    });
-    this.number.set(users.count(false));
+    this.numberPeople.set(users.count(false));
    return users;
  },
+  orgNumber() {
+    return this.numberOrgs.get();
+  },
+  teamNumber() {
+    return this.numberTeams.get();
+  },
  peopleNumber() {
-    return this.number.get();
+    return this.numberPeople.get();
+  },
+  switchMenu(event) {
+    const target = $(event.target);
+    if (!target.hasClass('active')) {
+      $('.side-menu li.active').removeClass('active');
+      target.parent().addClass('active');
+      const targetID = target.data('id');
+      this.orgSetting.set('org-setting' === targetID);
+      this.teamSetting.set('team-setting' === targetID);
+      this.peopleSetting.set('people-setting' === targetID);
+    }
  },
 }).register('people');

+Template.orgRow.helpers({
+  orgData() {
+    const orgCollection = this.esSearch ? ESSearchResults : Org;
+    return orgCollection.findOne(this.orgId);
+  },
+});
+
+Template.teamRow.helpers({
+  teamData() {
+    const teamCollection = this.esSearch ? ESSearchResults : Team;
+    return teamCollection.findOne(this.teamId);
+  },
+});
+
 Template.peopleRow.helpers({
  userData() {
    const userCollection = this.esSearch ? ESSearchResults : Users;
@@ -122,6 +222,24 @@ Template.editUserPopup.onCreated(function() {
  });
 });

+Template.editOrgPopup.helpers({
+  org() {
+    return Org.findOne(this.orgId);
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
+});
+
+Template.editTeamPopup.helpers({
+  team() {
+    return Team.findOne(this.teamId);
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
+});
+
 Template.editUserPopup.helpers({
  user() {
    return Users.findOne(this.userId);
@@ -144,6 +262,14 @@ Template.editUserPopup.helpers({
  },
 });

+Template.newOrgPopup.onCreated(function() {
+  this.errorMessage = new ReactiveVar('');
+});
+
+Template.newTeamPopup.onCreated(function() {
+  this.errorMessage = new ReactiveVar('');
+});
+
 Template.newUserPopup.onCreated(function() {
  this.authenticationMethods = new ReactiveVar([]);
  this.errorMessage = new ReactiveVar('');
@@ -163,28 +289,76 @@ Template.newUserPopup.onCreated(function() {
  });
 });

-Template.newUserPopup.helpers({
-  //user() {
-  //  return Users.findOne(this.userId);
-  //},
-  authentications() {
-    return Template.instance().authenticationMethods.get();
+Template.newOrgPopup.helpers({
+  org() {
+    return Org.findOne(this.orgId);
  },
-  //isSelected(match) {
-  //  const userId = Template.instance().data.userId;
-  //  const selected = Users.findOne(userId).authenticationMethod;
-  //  return selected === match;
-  //},
-  //isLdap() {
-  //  const userId = Template.instance().data.userId;
-  //  const selected = Users.findOne(userId).authenticationMethod;
-  //  return selected === 'ldap';
-  //},
  errorMessage() {
    return Template.instance().errorMessage.get();
  },
 });

+Template.newTeamPopup.helpers({
+  team() {
+    return Team.findOne(this.teamId);
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
+});
+
+Template.newUserPopup.helpers({
+  user() {
+    return Users.findOne(this.userId);
+  },
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  isSelected(match) {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === match;
+  },
+  isLdap() {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === 'ldap';
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
+});
+
+BlazeComponent.extendComponent({
+  onCreated() {},
+  org() {
+    return Org.findOne(this.orgId);
+  },
+  events() {
+    return [
+      {
+        'click a.edit-org': Popup.open('editOrg'),
+        'click a.more-settings-org': Popup.open('settingsOrg'),
+      },
+    ];
+  },
+}).register('orgRow');
+
+BlazeComponent.extendComponent({
+  onCreated() {},
+  team() {
+    return Team.findOne(this.teamId);
+  },
+  events() {
+    return [
+      {
+        'click a.edit-team': Popup.open('editTeam'),
+        'click a.more-settings-team': Popup.open('settingsTeam'),
+      },
+    ];
+  },
+}).register('teamRow');
+
 BlazeComponent.extendComponent({
  onCreated() {},
  user() {
@@ -194,11 +368,32 @@ BlazeComponent.extendComponent({
    return [
      {
        'click a.edit-user': Popup.open('editUser'),
+        'click a.more-settings-user': Popup.open('settingsUser'),
      },
    ];
  },
 }).register('peopleRow');

+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click a.new-org': Popup.open('newOrg'),
+      },
+    ];
+  },
+}).register('newOrgRow');
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click a.new-team': Popup.open('newTeam'),
+      },
+    ];
+  },
+}).register('newTeamRow');
+
 BlazeComponent.extendComponent({
  events() {
    return [
@@ -213,20 +408,32 @@ Template.editUserPopup.events({
  submit(event, templateInstance) {
    event.preventDefault();
    const user = Users.findOne(this.userId);
-    const fullname = templateInstance.find('.js-profile-fullname').value.trim();
    const username = templateInstance.find('.js-profile-username').value.trim();
+    const fullname = templateInstance.find('.js-profile-fullname').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 verified = templateInstance
+      .find('.js-profile-email-verified')
+      .value.trim();
    const authentication = templateInstance
      .find('.js-authenticationMethod')
      .value.trim();

    const isChangePassword = password.length > 0;
    const isChangeUserName = username !== user.username;
+    const isChangeInitials = initials.length > 0;
+    const isChangeEmailVerified = verified !== user.emails[0].verified;
+
+    // If previously email address has not been set, it is undefined,
+    // check for undefined, and allow adding email address.
    const isChangeEmail =
-      email.toLowerCase() !== user.emails[0].address.toLowerCase();
+      email.toLowerCase() !==
+      (typeof user.emails !== 'undefined'
+        ? user.emails[0].address.toLowerCase()
+        : false);

    Users.update(this.userId, {
      $set: {
@@ -241,6 +448,14 @@ Template.editUserPopup.events({
      Meteor.call('setPassword', password, this.userId);
    }

+    if (isChangeEmailVerified) {
+      Meteor.call('setEmailVerified', email, verified === 'true', this.userId);
+    }
+
+    if (isChangeInitials) {
+      Meteor.call('setInitials', initials, this.userId);
+    }
+
    if (isChangeUserName && isChangeEmail) {
      Meteor.call(
        'setUsernameAndEmail',
@@ -296,11 +511,47 @@ Template.editUserPopup.events({
      });
    } else Popup.close();
  },
+});

-  'click #deleteButton': Popup.afterConfirm('userDelete', function() {
-    Users.remove(this.userId);
+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();
+
+    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();
+        }
+      },
+    );
    Popup.close();
-  }),
+  },
 });

 Template.newUserPopup.events({
@@ -343,3 +594,70 @@ Template.newUserPopup.events({
    Popup.close();
  },
 });
+
+Template.settingsUserPopup.events({
+  'click .impersonate-user'(event) {
+    event.preventDefault();
+
+    Meteor.call('impersonate', this.userId, err => {
+      if (!err) {
+        FlowRouter.go('/');
+        Meteor.connection.setUserId(this.userId);
+      }
+    });
+  },
+  'click #deleteButton'(event) {
+    event.preventDefault();
+    /*
+    // 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
+    //
+    //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();
+  },
+});
+
+Template.settingsUserPopup.helpers({
+  user() {
+    return Users.findOne(this.userId);
+  },
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  isSelected(match) {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === match;
+  },
+  isLdap() {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === 'ldap';
+  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
+});
@@ -21,7 +21,7 @@ table

  .ext-box-left
    display: flex;
-    width: 40%
+    width: 100%

  span
    vertical-align: center;
@@ -46,3 +46,6 @@ table

  div
    margin: auto
+
+.more-settings-user,.more-settings-team,.more-settings-org
+  margin-left: 10px;
@@ -163,13 +163,6 @@ template(name='announcementSettings')

 template(name='layoutSettings')
  ul#layout-setting.setting-detail
-    //li.layout-form
-      .title {{_ 'hide-logo'}}
-      .form-group.flex
-        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
-        span {{_ 'yes'}}
-        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}")
-        span {{_ 'no'}}
    li.layout-form
      .title {{_ 'display-authentication-method'}}
      .form-group.flex
@@ -184,10 +177,40 @@ template(name='layoutSettings')
      .title {{_ 'custom-product-name'}}
      .form-group
        input.wekan-form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
+    li.layout-form
+      .title {{_ 'hide-logo'}}
+      .form-group.flex
+        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
+        span {{_ 'yes'}}
+        input.wekan-form-control#hide-logo(type="radio" name="hideLogo" value="false" checked="{{#unless currentSetting.hideLogo}}checked{{/unless}}")
+        span {{_ 'no'}}
+    li.layout-form
+      .title {{_ 'custom-login-logo-image-url'}}
+      .form-group
+        input.wekan-form-control#custom-login-logo-image-url(type="text", placeholder="" value="{{currentSetting.customLoginLogoImageUrl}}")
+    li.layout-form
+      .title {{_ 'custom-login-logo-link-url'}}
+      .form-group
+        input.wekan-form-control#custom-login-logo-link-url(type="text", placeholder="" value="{{currentSetting.customLoginLogoLinkUrl}}")
+    li.layout-form
+      .title {{_ 'text-below-custom-login-logo'}}
+      .form-group
+        textarea#text-below-custom-login-logo.wekan-form-control= currentSetting.textBelowCustomLoginLogo
+    li.layout-form
+      .title {{_ 'custom-top-left-corner-logo-image-url'}}
+      .form-group
+        input.wekan-form-control#custom-top-left-corner-logo-image-url(type="text", placeholder="" value="{{currentSetting.customTopLeftCornerLogoImageUrl}}")
+    li.layout-form
+      .title {{_ 'custom-top-left-corner-logo-link-url'}}
+      .form-group
+        input.wekan-form-control#custom-top-left-corner-logo-link-url(type="text", placeholder="" value="{{currentSetting.customTopLeftCornerLogoLinkUrl}}")
+    li.layout-form
+      .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
      button.js-save-layout.primary {{_ 'save'}}

-
 template(name='selectAuthenticationMethod')
  select#defaultAuthenticationMethod
    each authentications
@@ -167,6 +167,30 @@ BlazeComponent.extendComponent({
    const productName = $('#product-name')
      .val()
      .trim();
+    const customLoginLogoImageUrl = $('#custom-login-logo-image-url')
+      .val()
+      .trim();
+    const customLoginLogoLinkUrl = $('#custom-login-logo-link-url')
+      .val()
+      .trim();
+    const textBelowCustomLoginLogo = $('#text-below-custom-login-logo')
+      .val()
+      .trim();
+    const customTopLeftCornerLogoImageUrl = $(
+      '#custom-top-left-corner-logo-image-url',
+    )
+      .val()
+      .trim();
+    const customTopLeftCornerLogoLinkUrl = $(
+      '#custom-top-left-corner-logo-link-url',
+    )
+      .val()
+      .trim();
+    const customTopLeftCornerLogoHeight = $(
+      '#custom-top-left-corner-logo-height',
+    )
+      .val()
+      .trim();
    const hideLogoChange = $('input[name=hideLogo]:checked').val() === 'true';
    const displayAuthenticationMethod =
      $('input[name=displayAuthenticationMethod]:checked').val() === 'true';
@@ -177,6 +201,12 @@ BlazeComponent.extendComponent({
        $set: {
          productName,
          hideLogo: hideLogoChange,
+          customLoginLogoImageUrl,
+          customLoginLogoLinkUrl,
+          textBelowCustomLoginLogo,
+          customTopLeftCornerLogoImageUrl,
+          customTopLeftCornerLogoLinkUrl,
+          customTopLeftCornerLogoHeight,
          displayAuthenticationMethod,
          defaultAuthenticationMethod,
        },
@@ -3,22 +3,21 @@ template(name="settingHeaderBar")
    span {{_ 'admin-panel'}}

  .setting-header-btns.left
-    unless isMiniScreen
-      if currentUser
-        a.setting-header-btn.settings(href="{{pathFor 'setting'}}")
-          i.fa(class="fa-cog")
-          span {{_ 'settings'}}
+    if currentUser
+      a.setting-header-btn.settings(href="{{pathFor 'setting'}}")
+        i.fa(class="fa-cog")
+        span {{_ 'settings'}}

-        a.setting-header-btn.people(href="{{pathFor 'people'}}")
-          i.fa(class="fa-users")
-          span {{_ 'people'}}
+      a.setting-header-btn.people(href="{{pathFor 'people'}}")
+        i.fa(class="fa-users")
+        span {{_ 'people'}}

-        a.setting-header-btn.informations(href="{{pathFor 'information'}}")
-          i.fa(class="fa-info-circle")
-          span {{_ 'info'}}
+      a.setting-header-btn.informations(href="{{pathFor 'information'}}")
+        i.fa(class="fa-info-circle")
+        span {{_ 'info'}}

-      else
-        a.setting-header-btn.js-log-in(
-          title="{{_ 'log-in'}}")
-          i.fa.fa-sign-in
-          span {{_ 'log-in'}}
+    else
+      a.setting-header-btn.js-log-in(
+        title="{{_ 'log-in'}}")
+        i.fa.fa-sign-in
+        span {{_ 'log-in'}}
@@ -269,14 +269,16 @@ template(name="outgoingWebhooksPopup")

 template(name="boardMenuPopup")
  ul.pop-over-list
-    li
-      a.js-open-rules-view(title="{{_ 'rules'}}")
-        i.fa.fa-magic
-        | {{_ 'rules'}}
-    li
-      a.js-custom-fields
-        i.fa.fa-list-alt
-        | {{_ 'custom-fields'}}
+    if currentUser.isBoardAdmin
+      li
+        a.js-open-rules-view(title="{{_ 'rules'}}")
+          i.fa.fa-magic
+          | {{_ 'rules'}}
+    if currentUser.isBoardAdmin
+      li
+        a.js-custom-fields
+          i.fa.fa-list-alt
+          | {{_ 'custom-fields'}}
    li
      a.js-open-archives
        i.fa.fa-archive
@@ -286,79 +288,35 @@ template(name="boardMenuPopup")
        a.js-change-board-color
          i.fa.fa-paint-brush
          | {{_ 'board-change-color'}}
-
-    //-
-      XXX Language should be handled by sandstorm, but for now display a
-      language selection link in the board menu. This link is normally present
-      in the header bar that is not displayed on sandstorm.
-    if isSandstorm
-      li
-        a.js-change-language
-          i.fa.fa-flag
-          | {{_ 'language'}}
-  unless isSandstorm
-    if currentUser.isBoardAdmin
-      hr
-      ul.pop-over-list
-        if withApi
-          li
-            a.js-export-board
-              i.fa.fa-share-alt
-              | {{_ 'export-board'}}
-        li
-          a.js-outgoing-webhooks
-            i.fa.fa-globe
-            | {{_ 'outgoing-webhooks'}}
-        li
-          a.js-card-settings
-            i.fa.fa-id-card-o
-            | {{_ 'card-settings'}}
-        li
-          a.js-subtask-settings
-            i.fa.fa-sitemap
-            | {{_ 'subtask-settings'}}
-      unless currentBoard.isTemplatesBoard
-        hr
-        ul.pop-over-list
-          li
-            a.js-archive-board
-              i.fa.fa-arrow-right
-              i.fa.fa-archive
-              | {{_ 'archive-board'}}
-
-  if isSandstorm
-    hr
-    ul.pop-over-list
+  hr
+  ul.pop-over-list
+    if withApi
      li
        a.js-export-board
          i.fa.fa-share-alt
          | {{_ 'export-board'}}
-      li
-        a.js-import-board
-          i.fa.fa-share-alt
-          i.fa.fa-sign-in
-          | {{_ 'import-board-c'}}
-      li
-        a.js-archive-board
-          i.fa.fa-arrow-right
-          i.fa.fa-archive
-          | {{_ 'archive-board'}}
+    if currentUser.isBoardAdmin
      li
        a.js-outgoing-webhooks
          i.fa.fa-globe
          | {{_ 'outgoing-webhooks'}}
-    hr
-    ul.pop-over-list
      li
        a.js-card-settings
          i.fa.fa-id-card-o
          | {{_ 'card-settings'}}
-    hr
-    ul.pop-over-list
      li
        a.js-subtask-settings
          i.fa.fa-sitemap
          | {{_ 'subtask-settings'}}
+  unless currentBoard.isTemplatesBoard
+    if currentUser.isBoardAdmin
+      hr
+      ul.pop-over-list
+        li
+          a.js-archive-board
+            i.fa.fa-arrow-right
+            i.fa.fa-archive
+            | {{_ 'archive-board'}}

 template(name="exportBoard")
  ul.pop-over-list
@@ -366,14 +324,14 @@ template(name="exportBoard")
      a.download-json-link(href="{{exportUrl}}", download="{{exportJsonFilename}}")
        i.fa.fa-share-alt
        | {{_ 'export-board-json'}}
-    //li
-    //  a(href="{{exportCsvUrl}}", download="{{exportCsvFilename}}")
-    //    i.fa.fa-share-alt
-    //    | {{_ 'export-board-csv'}}
-    //li
-    //  a(href="{{exportTsvUrl}}", download="{{exportTsvFilename}}")
-    //    i.fa.fa-share-alt
-    //    | {{_ 'export-board-tsv'}}
+    li
+      a(href="{{exportCsvUrl}}", download="{{exportCsvFilename}}")
+        i.fa.fa-share-alt
+        | {{_ 'export-board-csv'}}
+    li
+      a(href="{{exportTsvUrl}}", download="{{exportTsvFilename}}")
+        i.fa.fa-share-alt
+        | {{_ 'export-board-tsv'}}
    li
      a.html-export-board
        i.fa.fa-archive
@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 Sidebar = null;

 const defaultView = 'home';
@@ -112,10 +110,12 @@ BlazeComponent.extendComponent({
          currentUser = Meteor.user();
          if (currentUser) {
            Meteor.call('toggleMinicardLabelText');
-          } else if (cookies.has('hiddenMinicardLabelText')) {
-            cookies.remove('hiddenMinicardLabelText');
+          } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {
+            window.localStorage.removeItem('hiddenMinicardLabelText');
+            location.reload();
          } else {
-            cookies.set('hiddenMinicardLabelText', 'true');
+            window.localStorage.setItem('hiddenMinicardLabelText', 'true');
+            location.reload();
          }
        },
        'click .js-shortcuts'() {
@@ -133,7 +133,7 @@ Template.homeSidebar.helpers({
    currentUser = Meteor.user();
    if (currentUser) {
      return (currentUser.profile || {}).hiddenMinicardLabelText;
-    } else if (cookies.has('hiddenMinicardLabelText')) {
+    } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {
      return true;
    } else {
      return false;
@@ -155,6 +155,9 @@ Template.memberPopup.helpers({
  user() {
    return Users.findOne(this.userId);
  },
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
  memberType() {
    const type = Users.findOne(this.userId).isBoardAdmin() ? 'admin' : 'normal';
    if (type === 'normal') {
@@ -224,6 +227,9 @@ Template.boardMenuPopup.onCreated(function() {
 });

 Template.boardMenuPopup.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
  withApi() {
    return Template.instance().apiEnabled.get();
  },
@@ -238,7 +244,7 @@ Template.boardMenuPopup.helpers({
  },
  exportFilename() {
    const boardId = Session.get('currentBoard');
-    return `wekan-export-board-${boardId}.json`;
+    return `export-board-${boardId}.json`;
  },
 });

@@ -249,11 +255,15 @@ Template.memberPopup.events({
  },
  'click .js-change-role': Popup.open('changePermissions'),
  'click .js-remove-member': Popup.afterConfirm('removeMember', function() {
+    // This works from removing member from board, card members and assignees.
    const boardId = Session.get('currentBoard');
    const memberId = this.userId;
    Cards.find({ boardId, members: memberId }).forEach(card => {
      card.unassignMember(memberId);
    });
+    Cards.find({ boardId, assignees: memberId }).forEach(card => {
+      card.unassignAssignee(memberId);
+    });
    Boards.findOne(boardId).removeMember(memberId);
    Popup.close();
  }),
@@ -294,6 +304,9 @@ Template.membersWidget.helpers({
      return false;
    }
  },
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
 });

 Template.membersWidget.events({
@@ -451,15 +464,15 @@ BlazeComponent.extendComponent({
  },
  exportJsonFilename() {
    const boardId = Session.get('currentBoard');
-    return `wekan-export-board-${boardId}.json`;
+    return `export-board-${boardId}.json`;
  },
  exportCsvFilename() {
    const boardId = Session.get('currentBoard');
-    return `wekan-export-board-${boardId}.csv`;
+    return `export-board-${boardId}.csv`;
  },
  exportTsvFilename() {
    const boardId = Session.get('currentBoard');
-    return `wekan-export-board-${boardId}.tsv`;
+    return `export-board-${boardId}.tsv`;
  },
 }).register('exportBoardPopup');

@@ -475,6 +488,12 @@ Template.labelsWidget.events({
  'click .js-add-label': Popup.open('createLabel'),
 });

+Template.labelsWidget.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+});
+
 // Board members can assign people or labels by drag-dropping elements from the
 // sidebar to the cards on the board. In order to re-initialize the jquery-ui
 // plugin any time a draggable member or label is modified or removed we use a
@@ -34,6 +34,7 @@
      color: darken(white, 50%)
      font-size: 1em
      margin-bottom: 10px
+      font-weight: bold

      i.fa
        margin-right: 3px
@@ -167,8 +168,8 @@
  button
    float: right
    margin: 0
-    margin-bottom: 5px
-    padding: 0 2px 0 10px
+    margin: 0 0 5px 5px
+    padding: 0 10px 0 10px

@media screen and (max-width: 800px)
  .board-sidebar
@@ -5,8 +5,9 @@ template(name="archivesSidebar")
        unless isWorker
          p.quiet
            a.js-restore-all-cards {{_ 'restore-all'}}
-            | -
-            a.js-delete-all-cards {{_ 'delete-all'}}
+            if currentUser.isBoardAdmin
+              | -
+              a.js-delete-all-cards {{_ 'delete-all'}}
        each archivedCards
          .minicard-wrapper.js-minicard
            +minicard(this)
@@ -14,8 +15,9 @@ template(name="archivesSidebar")
            unless isWorker
              p.quiet
                a.js-restore-card {{_ 'restore'}}
-                | -
-                a.js-delete-card {{_ 'delete'}}
+                if currentUser.isBoardAdmin
+                  | -
+                  a.js-delete-card {{_ 'delete'}}
            if cardIsInArchivedList
              p.quiet.small ({{_ 'warn-list-archived'}})
        else
@@ -25,8 +27,9 @@ template(name="archivesSidebar")
        unless isWorker
          p.quiet
            a.js-restore-all-lists {{_ 'restore-all'}}
-            | -
-            a.js-delete-all-lists {{_ 'delete-all'}}
+            if currentUser.isBoardAdmin
+              | -
+              a.js-delete-all-lists {{_ 'delete-all'}}
        ul.archived-lists
          each archivedLists
            li.archived-lists-item
@@ -35,8 +38,9 @@ template(name="archivesSidebar")
                unless isWorker
                  p.quiet
                    a.js-restore-list {{_ 'restore'}}
-                    | -
-                    a.js-delete-list {{_ 'delete'}}
+                    if currentUser.isBoardAdmin
+                      | -
+                      a.js-delete-list {{_ 'delete'}}
          else
            li.no-items-message {{_ 'no-archived-lists'}}

@@ -44,8 +48,9 @@ template(name="archivesSidebar")
        unless isWorker
          p.quiet
            a.js-restore-all-swimlanes {{_ 'restore-all'}}
-            | -
-            a.js-delete-all-swimlanes {{_ 'delete-all'}}
+            if currentUser.isBoardAdmin
+              | -
+              a.js-delete-all-swimlanes {{_ 'delete-all'}}
        ul.archived-lists
          each archivedSwimlanes
            li.archived-lists-item
@@ -54,8 +59,9 @@ template(name="archivesSidebar")
                unless isWorker
                  p.quiet
                    a.js-restore-swimlane {{_ 'restore'}}
-                    | -
-                    a.js-delete-swimlane {{_ 'delete'}}
+                    if currentUser.isBoardAdmin
+                      | -
+                      a.js-delete-swimlane {{_ 'delete'}}
          else
            li.no-items-message {{_ 'no-archived-swimlanes'}}
  else
@@ -141,6 +141,9 @@ BlazeComponent.extendComponent({
 }).register('archivesSidebar');

 Template.archivesSidebar.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
  isWorker() {
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
    return (
@@ -4,10 +4,14 @@
  and #each x in y constructors to fix this.

 template(name="filterSidebar")
+  h3 {{_ 'list-filter-label'}}
  ul.sidebar-list
-    span {{_ 'list-filter-label'}}
    form.js-list-filter
      input(type="text")
+  hr
+  h3
+    i.fa.fa-tags
+    | {{_ 'filter-labels-label'}}
  ul.sidebar-list
    li(class="{{#if Filter.labelIds.isSelected undefined}}active{{/if}}")
          a.name.js-toggle-label-filter
@@ -27,6 +31,9 @@ template(name="filterSidebar")
          if Filter.labelIds.isSelected _id
            i.fa.fa-check
  hr
+  h3
+    i.fa.fa-users
+    | {{_ 'filter-member-label'}}
  ul.sidebar-list
    li(class="{{#if Filter.members.isSelected undefined}}active{{/if}}")
          a.name.js-toggle-member-filter
@@ -45,6 +52,9 @@ template(name="filterSidebar")
            if Filter.members.isSelected _id
              i.fa.fa-check
  hr
+  h3
+    i.fa.fa-user
+    | {{_ 'filter-assignee-label'}}
  ul.sidebar-list
    li(class="{{#if Filter.assignees.isSelected undefined}}active{{/if}}")
      a.name.js-toggle-assignee-filter
@@ -63,6 +73,9 @@ template(name="filterSidebar")
            if Filter.assignees.isSelected _id
              i.fa.fa-check
  hr
+  h3
+    i.fa.fa-list-alt
+    | {{_ 'filter-custom-fields-label'}}
  ul.sidebar-list
    li(class="{{#if Filter.customFields.isSelected undefined}}active{{/if}}")
          a.name.js-toggle-custom-fields-filter
@@ -78,6 +91,8 @@ template(name="filterSidebar")
          if Filter.customFields.isSelected _id
            i.fa.fa-check
  hr
+  h3
+    | {{_ 'other-filters-label'}}
  ul.sidebar-list
    li(class="{{#if Filter.archive.isSelected _id}}active{{/if}}")
      a.name.js-toggle-archive-filter
@@ -85,7 +100,6 @@ template(name="filterSidebar")
          | {{_ 'filter-show-archive'}}
        if Filter.archive.isSelected _id
          i.fa.fa-check
-  hr
  ul.sidebar-list
    li(class="{{#if Filter.hideEmpty.isSelected _id}}active{{/if}}")
      a.name.js-toggle-hideEmpty-filter
@@ -94,7 +108,7 @@ template(name="filterSidebar")
        if Filter.hideEmpty.isSelected _id
          i.fa.fa-check
  hr
-  span {{_ 'advanced-filter-label'}}
+  h3 {{_ 'advanced-filter-label'}}
  input.js-field-advanced-filter(type="text")
  span {{_ 'advanced-filter-description'}}
  if Filter.isActive
@@ -107,6 +121,9 @@ template(name="filterSidebar")
      span {{_ 'filter-to-selection'}}

 template(name="multiselectionSidebar")
+  h3
+    i.fa.fa-tags
+    | {{_ 'multi-selection-label'}}
  ul.sidebar-list
    each currentBoard.labels
      li
@@ -122,6 +139,9 @@ template(name="multiselectionSidebar")
          else if someSelectedElementHave 'label' _id
            i.fa.fa-ellipsis-h
  hr
+  h3
+    i.fa.fa-users
+    | {{_ 'multi-selection-member'}}
  ul.sidebar-list
    each currentBoard.activeMembers
      with getUser userId
@@ -135,7 +155,7 @@ template(name="multiselectionSidebar")
              i.fa.fa-check
            else if someSelectedElementHave 'member' _id
              i.fa.fa-ellipsis-h
-  unless currentUser.isWorker
+  if currentUser.isBoardAdmin
    hr
    a.sidebar-btn.js-move-selection
      i.fa.fa-share
@@ -134,6 +134,15 @@ BlazeComponent.extendComponent({
  },
 }).register('multiselectionSidebar');

+Template.multiselectionSidebar.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+  isCommentOnly() {
+    return Meteor.user().isCommentOnly();
+  },
+});
+
 Template.disambiguateMultiLabelPopup.events({
  'click .js-remove-label'() {
    mutateSelectedCards('removeLabel', this._id);
@@ -1,5 +1,5 @@
 template(name="swimlaneHeader")
-  .swimlane-header-wrap.js-swimlane-header(class='{{#if colorClass}}swimlane-{{colorClass}}{{/if}}')
+  .swimlane-header-wrap.js-swimlane-header(class=colorClass)
    if this.isTemplateContainer
        +swimlaneFixedHeader(this)
    else
@@ -15,8 +15,9 @@ template(name="swimlaneFixedHeader")
        = title
  .swimlane-header-menu
    unless currentUser.isCommentOnly
-      a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
-      a.fa.fa-navicon.js-open-swimlane-menu
+      if currentUser.isBoardAdmin
+        a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
+        a.fa.fa-navicon.js-open-swimlane-menu
      unless isMiniScreen
        if showDesktopDragHandles
          a.swimlane-header-handle.handle.fa.fa-arrows.js-swimlane-header-handle
@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 const { calculateIndexData } = Utils;

 let swimlaneColors;
@@ -35,7 +33,7 @@ Template.swimlaneHeader.helpers({
    currentUser = Meteor.user();
    if (currentUser) {
      return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
      return true;
    } else {
      return false;
@@ -43,6 +41,12 @@ Template.swimlaneHeader.helpers({
  },
 });

+Template.swimlaneFixedHeader.helpers({
+  isBoardAdmin() {
+    return Meteor.user().isBoardAdmin();
+  },
+});
+
 Template.swimlaneActionPopup.events({
  'click .js-set-swimlane-color': Popup.open('setSwimlaneColor'),
  'click .js-close-swimlane'(event) {
@@ -52,6 +56,12 @@ Template.swimlaneActionPopup.events({
  },
 });

+Template.swimlaneActionPopup.helpers({
+  isCommentOnly() {
+    return Meteor.user().isCommentOnly();
+  },
+});
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.currentSwimlane = this.currentData();
@@ -45,18 +45,19 @@ template(name="listsGroup")
 template(name="addListForm")
  unless currentUser.isWorker
    .list.list-composer.js-list-composer(class="{{#if isMiniScreen}}mini-list{{/if}}")
-      .list-header-add
-        +inlinedForm(autoclose=false)
-          input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"
-            autocomplete="off" autofocus)
-          .edit-controls.clearfix
-            button.primary.confirm(type="submit") {{_ 'save'}}
-            unless currentBoard.isTemplatesBoard
-              unless currentBoard.isTemplateBoard
-                span.quiet
-                  | {{_ 'or'}}
-                  a.js-list-template {{_ 'template'}}
-        else
-          a.open-list-composer.js-open-inlined-form
-            i.fa.fa-plus
-            | {{_ 'add-list'}}
+      if currentUser.isBoardAdmin
+        .list-header-add
+          +inlinedForm(autoclose=false)
+            input.list-name-input.full-line(type="text" placeholder="{{_ 'add-list'}}"
+              autocomplete="off" autofocus)
+            .edit-controls.clearfix
+              button.primary.confirm(type="submit") {{_ 'save'}}
+              unless currentBoard.isTemplatesBoard
+                unless currentBoard.isTemplateBoard
+                  span.quiet
+                    | {{_ 'or'}}
+                    a.js-list-template {{_ 'template'}}
+          else
+            a.open-list-composer.js-open-inlined-form
+              i.fa.fa-plus
+              | {{_ 'add-list'}}
@@ -1,5 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
 const { calculateIndex } = Utils;

 function currentListIsInThisSwimlane(swimlaneId) {
@@ -102,7 +100,7 @@ function initSortable(boardComponent, $listsDom) {
    if (currentUser) {
      showDesktopDragHandles = (currentUser.profile || {})
        .showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
      showDesktopDragHandles = true;
    } else {
      showDesktopDragHandles = false;
@@ -124,7 +122,8 @@ function initSortable(boardComponent, $listsDom) {
        'option',
        'disabled',
        // Disable drag-dropping when user is not member/is worker
-        !userIsMember() || Meteor.user().isWorker(),
+        //!userIsMember() || Meteor.user().isWorker(),
+        !Meteor.user().isBoardAdmin(),
        // Not disable drag-dropping while in multi-selection mode
        // MultiSelection.isActive() || !userIsMember(),
      );
@@ -178,7 +177,7 @@ BlazeComponent.extendComponent({
          if (currentUser) {
            showDesktopDragHandles = (currentUser.profile || {})
              .showDesktopDragHandles;
-          } else if (cookies.has('showDesktopDragHandles')) {
+          } else if (window.localStorage.getItem('showDesktopDragHandles')) {
            showDesktopDragHandles = true;
          } else {
            showDesktopDragHandles = false;
@@ -269,19 +268,20 @@ Template.swimlane.helpers({
    currentUser = Meteor.user();
    if (currentUser) {
      return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
      return true;
    } else {
      return false;
    }
  },
  canSeeAddList() {
-    return (
+    return Meteor.user().isBoardAdmin();
+    /*
      Meteor.user() &&
      Meteor.user().isBoardMember() &&
      !Meteor.user().isCommentOnly() &&
      !Meteor.user().isWorker()
-    );
+      */
  },
 });

@@ -36,6 +36,10 @@
 // Minimize swimlanes end https://www.w3schools.com/howto/howto_js_accordion.asp
 */

+[class=swimlane]
+  position: sticky
+  left: 0
+
 .swimlane
  // Even if this background color is the same as the body we can't leave it
  // transparent, because that won't work during a swimlane drag.
@@ -81,10 +85,16 @@
    .swimlane-header-menu
      position: absolute
      padding: 5px 5px
+      font-size: 22px

    .swimlane-header-plus-icon
      margin-left: 5px
-      margin-right: 10px
+      padding-right: 20px
+      font-size: 22px
+
+    .swimlane-header-menu-icon
+      padding-right: 20px
+      font-size: 22px

    .swimlane-header-handle
      position: absolute
@@ -1,5 +1,5 @@
 template(name="userAvatar")
-  a.member.js-member(title="{{userData.profile.fullname}} ({{userData.username}})")
+  a.member.js-member(title="{{userData.profile.fullname}} ({{userData.username}}) {{_ memberType}}")
    if userData.profile.avatarUrl
      img.avatar.avatar-image(src="{{userData.profile.avatarUrl}}")
    else
@@ -13,6 +13,46 @@ template(name="headerUserBar")
 template(name="memberMenuPopup")
  ul.pop-over-list
    with currentUser
+      li
+        a.js-my-cards(href="{{pathFor 'my-cards'}}")
+          i.fa.fa-list
+          | {{_ 'my-cards'}}
+      li
+        a.js-due-cards(href="{{pathFor 'due-cards'}}")
+          i.fa.fa-calendar
+          | {{_ 'dueCards-title'}}
+      li
+        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
+          | {{_ 'all-boards'}}
+      li
+        a(href="{{pathFor 'public'}}")
+          span.fa.fa-globe
+          | {{_ 'public'}}
+      li
+        a.board-header-btn.js-open-archived-board
+          i.fa.fa-archive
+          span {{_ 'archives'}}
+      unless currentUser.isWorker
+        ul.pop-over-list
+          li
+            a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
+              i.fa.fa-clone
+              | {{_ 'templates'}}
+      if currentUser.isAdmin
+        li
+          a.js-go-setting(href="{{pathFor 'setting'}}")
+            i.fa.fa-lock
+            | {{_ 'admin-panel'}}
+      hr
      li
        a.js-edit-profile
          i.fa.fa-user
@@ -30,22 +70,10 @@ template(name="memberMenuPopup")
          a.js-change-password
            i.fa.fa-key
            | {{_ 'changePasswordPopup-title'}}
-        li
-          a.js-change-language
-            i.fa.fa-flag
-            | {{_ 'changeLanguagePopup-title'}}
-    if currentUser.isAdmin
      li
-        a.js-go-setting(href="{{pathFor 'setting'}}")
-          i.fa.fa-lock
-          | {{_ 'admin-panel'}}
-  unless currentUser.isWorker
-    hr
-    ul.pop-over-list
-      li
-        a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}")
-          i.fa.fa-clone
-          | {{_ 'templates'}}
+        a.js-change-language
+          i.fa.fa-flag
+          | {{_ 'changeLanguagePopup-title'}}
  unless isSandstorm
    hr
    ul.pop-over-list
@@ -1,6 +1,3 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
-
 Template.headerUserBar.events({
  'click .js-open-header-member-menu': Popup.open('memberMenu'),
  'click .js-change-avatar': Popup.open('changeAvatar'),
@@ -28,6 +25,15 @@ Template.memberMenuPopup.helpers({
 });

 Template.memberMenuPopup.events({
+  'click .js-my-cards'() {
+    Popup.close();
+  },
+  'click .js-due-cards'() {
+    Popup.close();
+  },
+  'click .js-open-archived-board'() {
+    Modal.open('archivedBoards');
+  },
  'click .js-edit-profile': Popup.open('editProfile'),
  'click .js-change-settings': Popup.open('changeSettings'),
  'click .js-change-avatar': Popup.open('changeAvatar'),
@@ -164,6 +170,22 @@ Template.changeLanguagePopup.helpers({
        name = 'Brezhoneg';
      } else if (lang.name === 'ig') {
        name = 'Igbo';
+      } else if (lang.name === 'Español') {
+        name = 'español';
+      } 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 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 === '繁体中文（台湾）') {
@@ -200,7 +222,7 @@ Template.changeSettingsPopup.helpers({
    currentUser = Meteor.user();
    if (currentUser) {
      return (currentUser.profile || {}).showDesktopDragHandles;
-    } else if (cookies.has('showDesktopDragHandles')) {
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
      return true;
    } else {
      return false;
@@ -210,7 +232,7 @@ Template.changeSettingsPopup.helpers({
    currentUser = Meteor.user();
    if (currentUser) {
      return (currentUser.profile || {}).hasHiddenSystemMessages;
-    } else if (cookies.has('hasHiddenSystemMessages')) {
+    } else if (window.localStorage.getItem('hasHiddenSystemMessages')) {
      return true;
    } else {
      return false;
@@ -221,7 +243,7 @@ Template.changeSettingsPopup.helpers({
    if (currentUser) {
      return Meteor.user().getLimitToShowCardsCount();
    } else {
-      return cookies.get('limitToShowCardsCount');
+      return window.localStorage.getItem('limitToShowCardsCount');
    }
  },
  weekDays(startDay) {
@@ -242,7 +264,7 @@ Template.changeSettingsPopup.helpers({
    if (currentUser) {
      return currentUser.getStartDayOfWeek();
    } else {
-      return cookies.get('startDayOfWeek');
+      return window.localStorage.getItem('startDayOfWeek');
    }
  },
 });
@@ -252,20 +274,20 @@ Template.changeSettingsPopup.events({
    currentUser = Meteor.user();
    if (currentUser) {
      Meteor.call('toggleDesktopDragHandles');
-    } else if (cookies.has('showDesktopDragHandles')) {
-      cookies.remove('showDesktopDragHandles');
+    } else if (window.localStorage.getItem('showDesktopDragHandles')) {
+      window.localStorage.removeItem('showDesktopDragHandles');
    } else {
-      cookies.set('showDesktopDragHandles', 'true');
+      window.localStorage.setItem('showDesktopDragHandles', 'true');
    }
  },
  'click .js-toggle-system-messages'() {
    currentUser = Meteor.user();
    if (currentUser) {
      Meteor.call('toggleSystemMessages');
-    } else if (cookies.has('hasHiddenSystemMessages')) {
-      cookies.remove('hasHiddenSystemMessages');
+    } else if (window.localStorage.getItem('hasHiddenSystemMessages')) {
+      window.localStorage.removeItem('hasHiddenSystemMessages');
    } else {
-      cookies.set('hasHiddenSystemMessages', 'true');
+      window.localStorage.setItem('hasHiddenSystemMessages', 'true');
    }
  },
  'click .js-apply-user-settings'(event, templateInstance) {
@@ -283,14 +305,14 @@ Template.changeSettingsPopup.events({
      if (currentUser) {
        Meteor.call('changeLimitToShowCardsCount', minLimit);
      } else {
-        cookies.set('limitToShowCardsCount', minLimit);
+        window.localStorage.setItem('limitToShowCardsCount', minLimit);
      }
    }
    if (!isNaN(startDay)) {
      if (currentUser) {
        Meteor.call('changeStartDayOfWeek', startDay);
      } else {
-        cookies.set('startDayOfWeek', startDay);
+        window.localStorage.setItem('startDayOfWeek', startDay);
      }
    }
    Popup.back();
@@ -30,3 +30,11 @@ Blaze.registerHelper('getUser', userId => Users.findOne(userId));
 Blaze.registerHelper('concat', (...args) => args.slice(0, -1).join(''));

 Blaze.registerHelper('isMiniScreen', () => Utils.isMiniScreen());
+
+Blaze.registerHelper('isShowDesktopDragHandles', () =>
+  Utils.isShowDesktopDragHandles(),
+);
+
+Blaze.registerHelper('isMiniScreenOrShowDesktopDragHandles', () =>
+  Utils.isMiniScreenOrShowDesktopDragHandles(),
+);
@@ -45,6 +45,14 @@ Mousetrap.bind('f', () => {
  }
 });

+Mousetrap.bind('/', () => {
+  if (Sidebar.isOpen() && Sidebar.getView() === 'search') {
+    Sidebar.toggle();
+  } else {
+    Sidebar.setView('search');
+  }
+});
+
 Mousetrap.bind(['down', 'up'], (evt, key) => {
  if (!Session.get('currentCard')) {
    return;
@@ -118,6 +126,10 @@ Template.keyboardShortcuts.helpers({
      keys: ['f'],
      action: 'shortcut-toggle-filterbar',
    },
+    {
+      keys: ['/'],
+      action: 'shortcut-toggle-searchbar',
+    },
    {
      keys: ['x'],
      action: 'shortcut-clear-filters',
@@ -1,48 +1,99 @@
-import { Cookies } from 'meteor/ostrio:cookies';
-const cookies = new Cookies();
-
 Utils = {
  setBoardView(view) {
    currentUser = Meteor.user();
    if (currentUser) {
      Meteor.user().setBoardView(view);
    } else if (view === 'board-view-swimlanes') {
-      cookies.set('boardView', 'board-view-swimlanes'); //true
+      window.localStorage.setItem('boardView', 'board-view-swimlanes'); //true
      location.reload();
    } else if (view === 'board-view-lists') {
-      cookies.set('boardView', 'board-view-lists'); //true
+      window.localStorage.setItem('boardView', 'board-view-lists'); //true
      location.reload();
    } else if (view === 'board-view-cal') {
-      cookies.set('boardView', 'board-view-cal'); //true
+      window.localStorage.setItem('boardView', 'board-view-cal'); //true
      location.reload();
    } else {
-      cookies.set('boardView', 'board-view-swimlanes'); //true
+      window.localStorage.setItem('boardView', 'board-view-swimlanes'); //true
      location.reload();
    }
  },

  unsetBoardView() {
-    cookies.remove('boardView');
-    cookies.remove('collapseSwimlane');
+    window.localStorage.removeItem('boardView');
+    window.localStorage.removeItem('collapseSwimlane');
  },

  boardView() {
    currentUser = Meteor.user();
    if (currentUser) {
      return (currentUser.profile || {}).boardView;
-    } else if (cookies.get('boardView') === 'board-view-swimlanes') {
+    } else if (
+      window.localStorage.getItem('boardView') === 'board-view-swimlanes'
+    ) {
      return 'board-view-swimlanes';
-    } else if (cookies.get('boardView') === 'board-view-lists') {
+    } else if (
+      window.localStorage.getItem('boardView') === 'board-view-lists'
+    ) {
      return 'board-view-lists';
-    } else if (cookies.get('boardView') === 'board-view-cal') {
+    } else if (window.localStorage.getItem('boardView') === 'board-view-cal') {
      return 'board-view-cal';
    } else {
-      cookies.set('boardView', 'board-view-swimlanes'); //true
+      window.localStorage.setItem('boardView', 'board-view-swimlanes'); //true
      location.reload();
      return 'board-view-swimlanes';
    }
  },

+  myCardsSort() {
+    let sort = window.localStorage.getItem('myCardsSort');
+
+    if (!sort || !['board', 'dueAt'].includes(sort)) {
+      window.localStorage.setItem('myCardsSort', 'board');
+      location.reload();
+      sort = 'board';
+    }
+
+    return sort;
+  },
+
+  myCardsSortToggle() {
+    if (this.myCardsSort() === 'board') {
+      this.setMyCardsSort('dueAt');
+    } else {
+      this.setMyCardsSort('board');
+    }
+  },
+
+  setMyCardsSort(sort) {
+    window.localStorage.setItem('myCardsSort', sort);
+    location.reload();
+  },
+
+  archivedBoardIds() {
+    const archivedBoards = [];
+    Boards.find({ archived: false }).forEach(board => {
+      archivedBoards.push(board._id);
+    });
+    return archivedBoards;
+  },
+
+  dueCardsView() {
+    let view = window.localStorage.getItem('dueCardsView');
+
+    if (!view || !['me', 'all'].includes(view)) {
+      window.localStorage.setItem('dueCardsView', 'me');
+      location.reload();
+      view = 'me';
+    }
+
+    return view;
+  },
+
+  setDueCardsView(view) {
+    window.localStorage.setItem('dueCardsView', view);
+    location.reload();
+  },
+
  // XXX We should remove these two methods
  goBoardId(_id) {
    const board = Boards.findOne(_id);
@@ -189,6 +240,21 @@ Utils = {
    //return false;
  },

+  // returns if desktop drag handles are enabled
+  isShowDesktopDragHandles() {
+    const currentUser = Meteor.user();
+    if (currentUser) {
+      return (currentUser.profile || {}).showDesktopDragHandles;
+    } else {
+      return false;
+    }
+  },
+
+  // returns if mini screen or desktop drag handles
+  isMiniScreenOrShowDesktopDragHandles() {
+    return this.isMiniScreen() || this.isShowDesktopDragHandles();
+  },
+
  calculateIndexData(prevData, nextData, nItems = 1) {
    let base, increment;
    // If we drop the card to an empty column
@@ -113,6 +113,78 @@ FlowRouter.route('/shortcuts', {
  },
 });

+FlowRouter.route('/my-cards', {
+  name: 'my-cards',
+  action() {
+    Filter.reset();
+    // EscapeActions.executeAll();
+    EscapeActions.executeUpTo('popup-close');
+
+    Utils.manageCustomUI();
+    Utils.manageMatomo();
+
+    BlazeLayout.render('defaultLayout', {
+      headerBar: 'myCardsHeaderBar',
+      content: 'myCards',
+    });
+    // }
+  },
+});
+
+FlowRouter.route('/due-cards', {
+  name: 'due-cards',
+  action() {
+    Filter.reset();
+    // EscapeActions.executeAll();
+    EscapeActions.executeUpTo('popup-close');
+
+    Utils.manageCustomUI();
+    Utils.manageMatomo();
+
+    BlazeLayout.render('defaultLayout', {
+      headerBar: 'dueCardsHeaderBar',
+      content: 'dueCards',
+    });
+    // }
+  },
+});
+
+FlowRouter.route('/global-search', {
+  name: 'global-search',
+  action() {
+    Filter.reset();
+    // EscapeActions.executeAll();
+    EscapeActions.executeUpTo('popup-close');
+
+    Utils.manageCustomUI();
+    Utils.manageMatomo();
+
+    BlazeLayout.render('defaultLayout', {
+      headerBar: 'globalSearchHeaderBar',
+      content: 'globalSearch',
+    });
+  },
+});
+
+FlowRouter.route('/broken-cards', {
+  name: 'broken-cards',
+  action() {
+    const brokenCardsTemplate = 'brokenCards';
+
+    Filter.reset();
+    // EscapeActions.executeAll();
+    EscapeActions.executeUpTo('popup-close');
+
+    Utils.manageCustomUI();
+    Utils.manageMatomo();
+
+    BlazeLayout.render('defaultLayout', {
+      headerBar: 'brokenCardsHeaderBar',
+      content: brokenCardsTemplate,
+    });
+  },
+});
+
 FlowRouter.route('/import/:source', {
  name: 'import',
  triggersEnter: [AccountsTemplates.ensureSignedIn],
@@ -13,13 +13,12 @@ version: '2'
 #       see https://github.com/wekan/wekan/wiki/Backup
 # 1) Stop Wekan:
 #      docker-compose stop
-# 2) Download new version:
-#      docker-compose pull wekan
-# 3) If you have more networks for VPN etc as described at bottom of
-#    this config, download for them too:
-#      docker-compose pull wekan2
+# 2) Remove old Wekan app (wekan-app only, not that wekan-db container that has all your data)
+#      docker rm wekan-app
+# 3) Get newest docker-compose.yml from https://github.com/wekan/wekan to have correct image,
+#    for example: "image: quay.io/wekan/wekan" or version tag "image: quay.io/wekan/wekan:v4.52"
 # 4) Start Wekan:
-#      docker-compose start
+#      docker-compose up -d
 #----------------------------------------------------------------------------------
 # ==== OPTIONAL: DEDICATED DOCKER USER ====
 # 1) Optionally create a dedicated user for Wekan, for example:
@@ -92,17 +91,18 @@ services:
  wekandb:
    #-------------------------------------------------------------------------------------
    # ==== MONGODB AND METEOR VERSION ====
-    # a) For Wekan Meteor 1.8.x version at master branch, use mongo 4.x
-    # DOES NOT WORK: mongo 4.4, see https://github.com/wekan/wekan/issues/3247
-    # WORKS: mongo 3.x and 4.2
-    image: mongo:4.2
-    # b) For Wekan Meteor 1.6.x version at devel branch.
-    # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
-    #image: mongo:3.2.21
+    # a) mongodb latest, like 3.2 - 4.4 or newer https://hub.docker.com/_/mongo?tab=description
+    # 2020-12-03:
+    # - Mongo image copied from Docker Hub mongo:4.4.2-bionic to Quay
+    #   to avoid Docker Hub rate limits.
+    image: quay.io/wekan/mongo:4.4.2-bionic
    #-------------------------------------------------------------------------------------
    container_name: wekan-db
    restart: always
-    command: mongod --oplogSize 128
+    # command: mongod --oplogSize 128
+    # Syslog: mongod --syslog --oplogSize 128 --quiet
+    # Disable MongoDB logs:
+    command: mongod --logpath /dev/null --oplogSize 128 --quiet
    networks:
      - wekan-tier
    expose:
@@ -114,15 +114,12 @@ services:
  wekan:
    #-------------------------------------------------------------------------------------
    # ==== MONGODB AND METEOR VERSION ====
-    # NOTE: Quay is currently not updated, use Docker Hub image below c)
-    # a) For Wekan Meteor 1.8.x version at master branch,
-    #    using https://quay.io/wekan/wekan automatic builds
-    #image: quay.io/wekan/wekan
-    # b) Using specific Meteor 1.6.x version tag:
-    # image: quay.io/wekan/wekan:v1.95
-    # c) Using Docker Hub automatic builds https://hub.docker.com/r/wekanteam/wekan
-    image: wekanteam/wekan
-    # image: wekanteam/wekan:v2.99
+    # a) Quay automatic builds do work, https://quay.io/wekan7wekan
+    image: quay.io/wekan/wekan
+    # b) Using specific version tag:
+    # image: quay.io/wekan/wekan:v4.52
+    # c) Docker Hub builds work https://hub.docker.com/r/wekanteam/wekan
+    # image: wekanteam/wekan
    #-------------------------------------------------------------------------------------
    container_name: wekan-app
    restart: always
@@ -323,6 +320,9 @@ services:
      # ==== Debug OIDC OAuth2 etc ====
      #- DEBUG=true
      #-----------------------------------------------------------------
+      # ==== OAUTH2 ORACLE on premise identity manager OIM ====
+      #- ORACLE_OIM_ENABLED=true
+      #-----------------------------------------------------------------
      # ==== OAUTH2 AZURE ====
      # https://github.com/wekan/wekan/wiki/Azure
      # 1) Register the application with Azure. Make sure you capture
@@ -330,6 +330,8 @@ services:
      # 2) Configure the environment variables. This differs slightly
      #     by installation type, but make sure you have the following:
      #- OAUTH2_ENABLED=true
+      # Optional OAuth2 CA Cert, see https://github.com/wekan/wekan/issues/3299
+      #- OAUTH2_CA_CERT=ABCD1234
      # Use OAuth2 ADFS additional changes. Also needs OAUTH2_ENABLED=true setting.
      #- OAUTH2_ADFS_ENABLED=false
      # OAuth2 login style: popup or redirect.
@@ -618,7 +620,7 @@ services:
      #- SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE=
      #- SAML_ATTRIBUTES=
      #---------------------------------------------------------------------
-        depends_on:
+    depends_on:
      - wekandb

 #---------------------------------------------------------------------------------
@@ -1,7 +1,6 @@
 name: wekan
-version: 1.0.0
-appVersion: 2.x.x
-kubeVersion: "^1.8.0-0"
+version: 1.0.2
+apiVersion: v1
 description: Open Source kanban
 home: https://wekan.github.io/
 icon: https://wekan.github.io/wekan-logo.svg
@@ -10,4 +9,6 @@ sources:
 maintainers:
  - name: technotaff
    email: github@randall.cc
+  - name: jiangytcn
+    email: jiangyt.cn@gmail.com
 engine: gotpl