v2.75

Update translations.
Update changelog.
2019-05-22 21:47:49 +03:00 · 2019-05-22 21:44:23 +03:00 · 2019-05-22 21:42:59 +03:00 · 2019-05-22 21:37:01 +03:00 · 2019-05-22 20:15:24 +03:00 · 2019-05-14 21:33:12 +03:00
556 changed files with 53762 additions and 4723 deletions
@@ -6,7 +6,7 @@
    "browser": true
  },
  "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 2017,
    "sourceType": "module",
    "ecmaFeatures": {
      "experimentalObjectRestSpread": true
@@ -1,7 +1,6 @@
 ## Issue

 Add these issues to elsewhere:
- LDAP: https://github.com/wekan/wekan-ldap/issues
 - Snap: https://github.com/wekan/wekan-snap/issues

 Other Wekan issues can be added here.
@@ -8,7 +8,6 @@ npm-debug.log
 .vscode/
 .idea/
 .build/*
-packages/
 package-lock.json
 **/parts/
 **/stage
@@ -17,3 +16,16 @@ package-lock.json
 snap/.snapcraft/
 .idea
 .DS_Store
+.DS_Store?
+.build*
+*.browserify.js.cached
+*.browserify.js.map
+.build*
+versions.json
+.versions
+.npm
+.build*
+._*
+.Trashes
+Thumbs.db
+ehthumbs.db
@@ -31,7 +31,9 @@ kenton:accounts-sandstorm
 service-configuration@1.0.11
 useraccounts:unstyled
 useraccounts:flow-routing
-salleman:accounts-oidc
+wekan-ldap
+wekan-accounts-cas
+wekan-accounts-oidc

 # Utilities
 check@1.2.5
@@ -64,7 +66,6 @@ mquandalle:jquery-textcomplete
 mquandalle:jquery-ui-drag-drop-sort
 mquandalle:mousetrap-bindglobal
 peerlibrary:blaze-components@=0.15.1
-perak:markdown
 templates:tabs
 verron:autosize
 simple:json-routes
@@ -80,13 +81,14 @@ staringatlights:fast-render
 mixmax:smart-disconnect
 accounts-password@1.5.0
 cfs:gridfs
-eluck:accounts-lockout
 rzymek:fullcalendar
 momentjs:moment@2.22.2
 browser-policy-framing
 mquandalle:moment
 msavin:usercache
-wekan:wekan-ldap
-wekan:accounts-cas
 wekan-scrollbar
 mquandalle:perfect-scrollbar
+mdg:meteor-apm-agent
+meteorhacks:unblock
+lucasantoniassi:accounts-lockout
+wekan-markdown
@@ -60,7 +60,6 @@ ecmascript-runtime@0.5.0
 ecmascript-runtime-client@0.5.0
 ecmascript-runtime-server@0.5.0
 ejson@1.1.0
-eluck:accounts-lockout@0.9.0
 email@1.2.3
 es5-shim@4.6.15
 fastclick@1.0.13
@@ -82,8 +81,10 @@ launch-screen@1.1.1
 livedata@1.0.18
 localstorage@1.2.0
 logging@1.1.19
+lucasantoniassi:accounts-lockout@1.0.0
 matb33:collection-hooks@0.8.4
 matteodem:easy-search@1.6.4
+mdg:meteor-apm-agent@3.1.2
 mdg:validation-error@0.5.1
 meteor@1.8.2
 meteor-base@1.2.0
@@ -93,6 +94,7 @@ meteorhacks:collection-utils@1.2.0
 meteorhacks:meteorx@1.4.1
 meteorhacks:picker@1.0.3
 meteorhacks:subs-manager@1.6.4
+meteorhacks:unblock@1.1.0
 meteorspark:util@0.2.0
 minifier-css@1.2.16
 minifier-js@2.2.2
@@ -130,7 +132,6 @@ peerlibrary:base-component@0.16.0
 peerlibrary:blaze-components@0.15.1
 peerlibrary:computed-field@0.7.0
 peerlibrary:reactive-field@0.3.0
-perak:markdown@1.0.5
 promise@0.10.0
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
@@ -143,8 +144,6 @@ reload@1.1.11
 retry@1.0.9
 routepolicy@1.0.12
 rzymek:fullcalendar@3.8.0
-salleman:accounts-oidc@1.0.9
-salleman:oidc@1.0.9
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
@@ -179,8 +178,11 @@ useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
 webapp@1.4.0
 webapp-hashing@1.0.9
+wekan-accounts-oidc@1.0.10
+wekan-markdown@1.0.7
+wekan-oidc@1.0.12
 wekan-scrollbar@3.1.3
-wekan:accounts-cas@0.1.0
-wekan:wekan-ldap@0.0.2
+wekan-accounts-cas@0.1.0
+wekan-ldap@0.0.2
 yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2
@@ -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, 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, zh_CN:zh-CN, zh_TW:zh-TW
+lang_map = bg_BG:bg, en_GB:en-GB, es_AR:es-AR, 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, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK

 [wekan.application]
 file_filter = i18n/<lang>.i18n.json
@@ -1,82 +1,12 @@
-FROM debian:buster-slim
+FROM ubuntu:disco
 LABEL maintainer="wekan"

-# Declare Arguments
-ARG NODE_VERSION
-ARG METEOR_RELEASE
-ARG METEOR_EDGE
-ARG USE_EDGE
-ARG NPM_VERSION
-ARG FIBERS_VERSION
-ARG ARCHITECTURE
-ARG SRC_PATH
-ARG WITH_API
-ARG MATOMO_ADDRESS
-ARG MATOMO_SITE_ID
-ARG MATOMO_DO_NOT_TRACK
-ARG MATOMO_WITH_USERNAME
-ARG BROWSER_POLICY_ENABLED
-ARG TRUSTED_URL
-ARG WEBHOOKS_ATTRIBUTES
-ARG OAUTH2_ENABLED
-ARG OAUTH2_CLIENT_ID
-ARG OAUTH2_SECRET
-ARG OAUTH2_SERVER_URL
-ARG OAUTH2_AUTH_ENDPOINT
-ARG OAUTH2_USERINFO_ENDPOINT
-ARG OAUTH2_TOKEN_ENDPOINT
-ARG LDAP_ENABLE
-ARG LDAP_PORT
-ARG LDAP_HOST
-ARG LDAP_BASEDN
-ARG LDAP_LOGIN_FALLBACK
-ARG LDAP_RECONNECT
-ARG LDAP_TIMEOUT
-ARG LDAP_IDLE_TIMEOUT
-ARG LDAP_CONNECT_TIMEOUT
-ARG LDAP_AUTHENTIFICATION
-ARG LDAP_AUTHENTIFICATION_USERDN
-ARG LDAP_AUTHENTIFICATION_PASSWORD
-ARG LDAP_LOG_ENABLED
-ARG LDAP_BACKGROUND_SYNC
-ARG LDAP_BACKGROUND_SYNC_INTERVAL
-ARG LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED
-ARG LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS
-ARG LDAP_ENCRYPTION
-ARG LDAP_CA_CERT
-ARG LDAP_REJECT_UNAUTHORIZED
-ARG LDAP_USER_SEARCH_FILTER
-ARG LDAP_USER_SEARCH_SCOPE
-ARG LDAP_USER_SEARCH_FIELD
-ARG LDAP_SEARCH_PAGE_SIZE
-ARG LDAP_SEARCH_SIZE_LIMIT
-ARG LDAP_GROUP_FILTER_ENABLE
-ARG LDAP_GROUP_FILTER_OBJECTCLASS
-ARG LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE
-ARG LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE
-ARG LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT
-ARG LDAP_GROUP_FILTER_GROUP_NAME
-ARG LDAP_UNIQUE_IDENTIFIER_FIELD
-ARG LDAP_UTF8_NAMES_SLUGIFY
-ARG LDAP_USERNAME_FIELD
-ARG LDAP_FULLNAME_FIELD
-ARG LDAP_MERGE_EXISTING_USERS
-ARG LDAP_SYNC_USER_DATA
-ARG LDAP_SYNC_USER_DATA_FIELDMAP
-ARG LDAP_SYNC_GROUP_ROLES
-ARG LDAP_DEFAULT_DOMAIN
-ARG LOGOUT_WITH_TIMER
-ARG LOGOUT_IN
-ARG LOGOUT_ON_HOURS
-ARG LOGOUT_ON_MINUTES
-ARG CORS
-ARG DEFAULT_AUTHENTICATION_METHOD
-
 # 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"
-ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \
-    NODE_VERSION=v8.15.0 \
+ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python3 python3-pip git ca-certificates gcc-8" \
+    DEBUG=false \
+    NODE_VERSION=v8.16.0 \
    METEOR_RELEASE=1.6.0.1 \
    USE_EDGE=false \
    METEOR_EDGE=1.5-beta.17 \
@@ -85,6 +15,13 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
    ARCHITECTURE=linux-x64 \
    SRC_PATH=./ \
    WITH_API=true \
+    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3 \
+    ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60 \
+    ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15 \
+    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3 \
+    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 \
+    ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 \
+    EMAIL_NOTIFICATION_TIMEOUT=30000 \
    MATOMO_ADDRESS="" \
    MATOMO_SITE_ID="" \
    MATOMO_DO_NOT_TRACK=true \
@@ -93,12 +30,19 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
    TRUSTED_URL="" \
    WEBHOOKS_ATTRIBUTES="" \
    OAUTH2_ENABLED=false \
+    OAUTH2_LOGIN_STYLE=redirect \
    OAUTH2_CLIENT_ID="" \
    OAUTH2_SECRET="" \
    OAUTH2_SERVER_URL="" \
    OAUTH2_AUTH_ENDPOINT="" \
    OAUTH2_USERINFO_ENDPOINT="" \
    OAUTH2_TOKEN_ENDPOINT="" \
+    OAUTH2_ID_MAP="" \
+    OAUTH2_USERNAME_MAP="" \
+    OAUTH2_FULLNAME_MAP="" \
+    OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[] \
+    OAUTH2_REQUEST_PERMISSIONS=['openid','profiles','email'] \
+    OAUTH2_EMAIL_MAP="" \
    LDAP_ENABLE=false \
    LDAP_PORT=389 \
    LDAP_HOST="" \
@@ -119,6 +63,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
    LDAP_ENCRYPTION=false \
    LDAP_CA_CERT="" \
    LDAP_REJECT_UNAUTHORIZED=false \
+    LDAP_USER_AUTHENTICATION=false \
    LDAP_USER_SEARCH_FILTER="" \
    LDAP_USER_SEARCH_SCOPE="" \
    LDAP_USER_SEARCH_FIELD="" \
@@ -135,10 +80,20 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
    LDAP_USERNAME_FIELD="" \
    LDAP_FULLNAME_FIELD="" \
    LDAP_MERGE_EXISTING_USERS=false \
+    LDAP_EMAIL_FIELD="" \
+    LDAP_EMAIL_MATCH_ENABLE=false \
+    LDAP_EMAIL_MATCH_REQUIRE=false \
+    LDAP_EMAIL_MATCH_VERIFIED=false \
    LDAP_SYNC_USER_DATA=false \
    LDAP_SYNC_USER_DATA_FIELDMAP="" \
    LDAP_SYNC_GROUP_ROLES="" \
    LDAP_DEFAULT_DOMAIN="" \
+    LDAP_SYNC_ADMIN_STATUS="" \
+    LDAP_SYNC_ADMIN_GROUPS="" \
+    HEADER_LOGIN_ID="" \
+    HEADER_LOGIN_FIRSTNAME="" \
+    HEADER_LOGIN_LASTNAME="" \
+    HEADER_LOGIN_EMAIL="" \
    LOGOUT_WITH_TIMER=false \
    LOGOUT_IN="" \
    LOGOUT_ON_HOURS="" \
@@ -156,6 +111,7 @@ RUN \
    \
    # OS dependencies
    apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \
+    pip3 install -U pip setuptools wheel && \
    \
    # Meteor installer doesn't work with the default tar binary, so using bsdtar while installing.
    # https://github.com/coreos/bugs/issues/1095#issuecomment-350574389
@@ -239,24 +195,43 @@ RUN \
    fi; \
    \
    # Get additional packages
-    mkdir -p /home/wekan/app/packages && \
-    chown wekan:wekan --recursive /home/wekan && \
-    cd /home/wekan/app/packages && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \
-    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \
+    #mkdir -p /home/wekan/app/packages && \
+    #chown wekan:wekan --recursive /home/wekan && \
+    # REPOS BELOW ARE INCLUDED TO WEKAN REPO
+    #cd /home/wekan/app/packages && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git && \
+    #gosu wekan:wekan git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git && \
+    #gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan-accounts-oidc && \
+    #gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan-oidc && \
+    #gosu wekan:wekan rm -rf meteor-accounts-oidc && \
    sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
    cd /home/wekan/.meteor && \
    gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
    \
+    # extract the OpenAPI specification
+    npm install -g api2html@0.3.3 && \
+    mkdir -p /home/wekan/python && \
+    chown wekan:wekan --recursive /home/wekan/python && \
+    cd /home/wekan/python && \
+    gosu wekan:wekan git clone --depth 1 -b master https://github.com/Kronuz/esprima-python && \
+    cd /home/wekan/python/esprima-python && \
+    python3 setup.py install --record files.txt && \
+    cd /home/wekan/app &&\
+    gosu wekan:wekan mkdir -p ./public/api && \
+    gosu wekan:wekan python3 ./openapi/generate_openapi.py --release $(git describe --tags --abbrev=0) > ./public/api/wekan.yml && \
+    gosu wekan:wekan /opt/nodejs/bin/api2html -c ./public/logo-header.png -o ./public/api/wekan.html ./public/api/wekan.yml; \
    # Build app
    cd /home/wekan/app && \
    gosu wekan:wekan /home/wekan/.meteor/meteor add standard-minifier-js && \
    gosu wekan:wekan /home/wekan/.meteor/meteor npm install && \
    gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \
    cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
+    rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs && \
    chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
    #Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
    #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
@@ -275,10 +250,13 @@ RUN \
    # Cleanup
    apt-get remove --purge -y ${BUILD_DEPS} && \
    apt-get autoremove -y && \
+    npm uninstall -g api2html &&\
    rm -R /var/lib/apt/lists/* && \
    rm -R /home/wekan/.meteor && \
    rm -R /home/wekan/app && \
    rm -R /home/wekan/app_build && \
+    cat /home/wekan/python/esprima-python/files.txt | xargs rm -R && \
+    rm -R /home/wekan/python && \
    rm /home/wekan/install_meteor.sh

 ENV PORT=8080
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2014-2018 The Wekan Team
+Copyright (c) 2014-2019 The Wekan Team

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,6 +9,7 @@
 [![Code Climate](https://codeclimate.com/github/wekan/wekan/badges/gpa.svg "Code Climate")](https://codeclimate.com/github/wekan/wekan)
 [![Project Dependencies](https://david-dm.org/wekan/wekan.svg "Project Dependencies")](https://david-dm.org/wekan/wekan)
 [![Code analysis at Open Hub](https://img.shields.io/badge/code%20analysis-at%20Open%20Hub-brightgreen.svg "Code analysis at Open Hub")](https://www.openhub.net/p/wekan)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_shield)

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

@@ -22,9 +23,8 @@ It's better than at chat where details get lost when chat scrolls up.

 ## Chat

-[![Wekan Vanila Chat][vanila_badge]][vanila_chat] - Most Wekan community and developers are here at #wekan chat channel.
-Use webbrowser to register, and after that you can also alternatively use mobile app Rocket.Chat by Rocket.Chat with
-address https://chat.vanila.io and same username and password.
+[![Wekan Chat][vanila_badge]][wekan_chat] - Most Wekan community and developers are here. Works on webbrowser
+and PWA app that can be added as icon on Android and bookmark on iOS, used like native app.

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

@@ -39,33 +39,55 @@ address https://chat.vanila.io and same username and password.
 Wekan is an completely [Open Source][open_source] and [Free software][free_software]
 collaborative kanban board application with MIT license.

-Whether you’re maintaining a personal todo list, planning your holidays with some friends, or working in a team on your next revolutionary idea, Kanban boards are an unbeatable tool to keep your things organized. They give you a visual overview of the current state of your project, and make you productive by allowing you to focus on the few items that matter the most.
+Whether you’re maintaining a personal todo list, planning your holidays with some friends,
+or working in a team on your next revolutionary idea, Kanban boards are an unbeatable tool
+to keep your things organized. They give you a visual overview of the current state of your project,
+and make you productive by allowing you to focus on the few items that matter the most.

 Since Wekan is a free software, you don’t have to trust us with your data and can
 install Wekan on your own computer or server. In fact we encourage you to do
 that by providing one-click installation on various platforms.

- [Features][features]: Wekan has real-time user interface. Not all features are implemented, yet.
- [Platforms][platforms]: Wekan supports many platforms and plan is to add more. This will be the first place to look if you want to **install** it, test out and learn more in depth.
+- 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.
+- [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.
 - [Integrations][integrations]: Current possible integrations and future plans.
- [Team](https://github.com/wekan/wekan/wiki/Team): The people who spends their time and make Wekan into what it is right now.
+
+## Requirements
+
+- 64bit: Linux [Snap](https://github.com/wekan/wekan-snap/wiki/Install) or [Sandstorm](https://sandstorm.io) /
+  [Mac](https://github.com/wekan/wekan/wiki/Mac) / [Windows](https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows).
+  [More Platforms](https://github.com/wekan/wekan/wiki/Platforms). [ARM progress](https://github.com/wekan/wekan/issues/1053#issuecomment-410919264).
+- 1 GB RAM minimum free for Wekan. Production server should have miminum total 4 GB RAM.
+  For thousands of users, for example with [Docker](https://github.com/wekan/wekan/blob/devel/docker-compose.yml): 3 frontend servers,
+  each having 2 CPU and 2 wekan-app containers. One backend wekan-db server with many CPUs.  
+- Enough disk space and alerts about low disk space. If you run out disk space, MongoDB database gets corrupted.
+- SECURITY: Updating to newest Wekan version very often. Please check you do not have automatic updates of Sandstorm or Snap turned off.
+  Old versions have security issues because of old versions Node.js etc. Only newest Wekan is supported.
+  Wekan on Sandstorm is not usually affected by any Standalone Wekan (Snap/Docker/Source) security issues.
+- [Reporting all new bugs immediately](https://github.com/wekan/wekan/issues).
+  New features and fixes are added to Wekan [many times a day](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md).
+- [Backups](https://github.com/wekan/wekan/wiki/Backup) of Wekan database once a day miminum.
+  Bugs, updates, users deleting list or card, harddrive full, harddrive crash etc can eat your data. There is no undo yet.
+  Some bug can cause Wekan board to not load at all, requiring manual fixing of database content.

 ## Roadmap

-[Roadmap](https://github.com/wekan/wekan/wiki/Roadmap)
+[Roadmap Milestones](https://github.com/wekan/wekan/milestones)

-Upcoming Wekan App Development Platform will make possible many use cases. If you don't find your feature or integration in
-GitHub issues and [Features][features] or [Integrations][integrations] page at wiki, please add them.
+[Developer Documentation][dev_docs]

-We are very welcoming to new developers and teams to submit new pull requests to devel branch to make this Wekan App Development Platform possible faster. Please see [Developer Documentation][dev_docs] to get started.
+- There is many companies and individuals contributing code to Wekan, to add features and bugfixes
+  [many times a day](https://github.com/wekan/wekan/blob/devel/CHANGELOG.md).
+- [Please add Add new Feature Requests and Bug Reports immediately](https://github.com/wekan/wekan/issues).
+- [Commercial Support](https://wekan.team).
+- [Bounties](https://wekan.team/bounties/index.html).

-We also welcome sponsors for features and bugfixes. By working directly with Wekan you get the benefit of active maintenance and new features added by growing Wekan developer community.
-
-Actual work happens at [Wekan GitHub issues][wekan_issues].
-
-See [Development links on Wekan wiki](https://github.com/wekan/wekan/wiki#Development) bottom of the page for more info.
-
-If you want to know what is going on exactly this moment, you can check out the [project page](https://github.com/wekan/wekan/projects/2).
+We also welcome sponsors for features and bugfixes.
+By working directly with Wekan you get the benefit of active maintenance and new features added by growing Wekan developer community.

 ## Demo

@@ -111,4 +133,7 @@ with [Meteor](https://www.meteor.com).
 [open_source]: https://en.wikipedia.org/wiki/Open-source_software
 [free_software]: https://en.wikipedia.org/wiki/Free_software
 [vanila_badge]: https://vanila.io/img/join-chat-button2.png
-[vanila_chat]: https://chat.vanila.io/channel/wekan
+[wekan_chat]: https://community.vanila.io/wekan
+
+
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_large)
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.00.0"
+appVersion: "v2.75.0"
 files:
  userUploads:
    - README.md
@@ -99,6 +99,9 @@ template(name="boardActivities")
          else
            | {{{_ 'activity-added' memberLink cardLink}}}.

+        if($eq activityType 'moveCardBoard')
+          | {{{_ 'activity-moved' cardLink oldBoardName boardName}}}.
+
        if($eq activityType 'moveCard')
          | {{{_ 'activity-moved' cardLink oldList.title list.title}}}.

@@ -114,6 +117,12 @@ template(name="boardActivities")
        if($eq activityType 'removedLabel')
          | {{{_ 'activity-removed-label' lastLabel cardLink}}}.

+        if($eq activityType 'setCustomField')
+          | {{{_ 'activity-set-customfield' lastCustomField lastCustomFieldValue cardLink}}}.
+
+        if($eq activityType 'unsetCustomField')
+          | {{{_ 'activity-unset-customfield' lastCustomField cardLink}}}.
+
        if($eq activityType 'unjoinMember')
          if($eq user._id member._id)
            | {{{_ 'activity-unjoined' cardLink}}}.
@@ -129,7 +138,7 @@ template(name="cardActivities")
      p.activity-desc
        +memberName(user=user)
        if($eq activityType 'createCard')
-          | {{_ 'activity-added' cardLabel list.title}}.
+          | {{_ 'activity-added' cardLabel listName}}.
        if($eq activityType 'importCard')
          | {{{_ 'activity-imported' cardLabel list.title sourceLink}}}.
        if($eq activityType 'joinMember')
@@ -170,6 +179,10 @@ template(name="cardActivities")
          | {{_ 'activity-sent' cardLabel boardLabel}}.
        if($eq activityType 'moveCard')
          | {{_ 'activity-moved' cardLabel oldList.title list.title}}.
+
+        if($eq activityType 'moveCardBoard')
+          | {{{_ 'activity-moved' cardLink oldBoardName boardName}}}.
+
        if($eq activityType 'addAttachment')
          | {{{_ 'activity-attached' attachmentLink cardLabel}}}.
          if attachment.isImage
@@ -74,6 +74,8 @@ BlazeComponent.extendComponent({

  lastLabel(){
    const lastLabelId = this.currentData().labelId;
+    if (!lastLabelId)
+      return null;
    const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(lastLabelId);
    if(lastLabel.name === undefined || lastLabel.name === ''){
      return lastLabel.color;
@@ -82,6 +84,28 @@ BlazeComponent.extendComponent({
    }
  },

+  lastCustomField(){
+    const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
+    if (!lastCustomField)
+      return null;
+    return lastCustomField.name;
+  },
+
+  lastCustomFieldValue(){
+    const lastCustomField = CustomFields.findOne(this.currentData().customFieldId);
+    if (!lastCustomField)
+      return null;
+    const value = this.currentData().value;
+    if (lastCustomField.settings.dropdownItems && lastCustomField.settings.dropdownItems.length > 0) {
+      const dropDownValue = _.find(lastCustomField.settings.dropdownItems, (item) => {
+        return item._id === value;
+      });
+      if (dropDownValue)
+        return dropDownValue.name;
+    }
+    return value;
+  },
+
  listLabel() {
    return this.currentData().list().title;
  },
@@ -117,6 +141,8 @@ BlazeComponent.extendComponent({

  customField() {
    const customField = this.currentData().customField();
+    if (!customField)
+      return null;
    return customField.name;
  },

@@ -1,9 +1,3 @@
-Template.boardListHeaderBar.events({
-  'click .js-open-archived-board'() {
-    Modal.open('archivedBoards');
-  },
-});
-
 BlazeComponent.extendComponent({
  onCreated() {
    this.subscribe('archivedBoards');
@@ -20,16 +20,22 @@ template(name="boardBody")
      class="{{#if draggingActive.get}}is-dragging-active{{/if}}")
      if showOverlay.get
        .board-overlay
-      if isViewSwimlanes
+      if currentBoard.isTemplatesBoard
        each currentBoard.swimlanes
          +swimlane(this)
-      if isViewLists
-        +listsGroup
-      if isViewCalendar
+      else if isViewSwimlanes
+        each currentBoard.swimlanes
+          +swimlane(this)
+      else if isViewLists
+        +listsGroup(currentBoard)
+      else if isViewCalendar
        +calendarView
+      else
+        +listsGroup(currentBoard)

 template(name="calendarView")
-  .calendar-view.swimlane
-    if currentCard
-      +cardDetails(currentCard)
-    +fullcalendar(calendarOptions)
+  if isViewCalendar
+    .calendar-view.swimlane
+      if currentCard
+        +cardDetails(currentCard)
+      +fullcalendar(calendarOptions)
@@ -1,5 +1,6 @@
 const subManager = new SubsManager();
 const { calculateIndex, enableClickOnTouch } = Utils;
+const swimlaneWhileSortingHeight = 150;

 BlazeComponent.extendComponent({
  onCreated() {
@@ -13,7 +14,7 @@ BlazeComponent.extendComponent({
      const currentBoardId = Session.get('currentBoard');
      if (!currentBoardId)
        return;
-      const handle = subManager.subscribe('board', currentBoardId);
+      const handle = subManager.subscribe('board', currentBoardId, false);
      Tracker.nonreactive(() => {
        Tracker.autorun(() => {
          this.isBoardReady.set(handle.ready());
@@ -35,6 +36,37 @@ BlazeComponent.extendComponent({
    this._isDragging = false;
    // Used to set the overlay
    this.mouseHasEnterCardDetails = false;
+
+    // fix swimlanes sort field if there are null values
+    const currentBoardData = Boards.findOne(Session.get('currentBoard'));
+    const nullSortSwimlanes = currentBoardData.nullSortSwimlanes();
+    if (nullSortSwimlanes.count() > 0) {
+      const swimlanes = currentBoardData.swimlanes();
+      let count = 0;
+      swimlanes.forEach((s) => {
+        Swimlanes.update(s._id, {
+          $set: {
+            sort: count,
+          },
+        });
+        count += 1;
+      });
+    }
+
+    // fix lists sort field if there are null values
+    const nullSortLists = currentBoardData.nullSortLists();
+    if (nullSortLists.count() > 0) {
+      const lists = currentBoardData.lists();
+      let count = 0;
+      lists.forEach((l) => {
+        Lists.update(l._id, {
+          $set: {
+            sort: count,
+          },
+        });
+        count += 1;
+      });
+    }
  },
  onRendered() {
    const boardComponent = this;
@@ -43,21 +75,64 @@ BlazeComponent.extendComponent({
    $swimlanesDom.sortable({
      tolerance: 'pointer',
      appendTo: '.board-canvas',
-      helper: 'clone',
+      helper(evt, item) {
+        const helper = $(`<div class="swimlane"
+                               style="flex-direction: column;
+                                      height: ${swimlaneWhileSortingHeight}px;
+                                      width: $(boardComponent.width)px;
+                                      overflow: hidden;"/>`);
+        helper.append(item.clone());
+        // Also grab the list of lists of cards
+        const list = item.next();
+        helper.append(list.clone());
+        return helper;
+      },
      handle: '.js-swimlane-header',
-      items: '.js-swimlane:not(.placeholder)',
+      items: '.swimlane:not(.placeholder)',
      placeholder: 'swimlane placeholder',
      distance: 7,
      start(evt, ui) {
+        const listDom = ui.placeholder.next('.js-swimlane');
+        const parentOffset = ui.item.parent().offset();
+
        ui.placeholder.height(ui.helper.height());
        EscapeActions.executeUpTo('popup-close');
+        listDom.addClass('moving-swimlane');
        boardComponent.setIsDragging(true);
+
+        ui.placeholder.insertAfter(ui.placeholder.next());
+        boardComponent.origPlaceholderIndex = ui.placeholder.index();
+
+        // resize all swimlanes + headers to be a total of 150 px per row
+        // this could be achieved by setIsDragging(true) but we want immediate
+        // result
+        ui.item.siblings('.js-swimlane').css('height', `${swimlaneWhileSortingHeight - 26}px`);
+
+        // set the new scroll height after the resize and insertion of
+        // the placeholder. We want the element under the cursor to stay
+        // at the same place on the screen
+        ui.item.parent().get(0).scrollTop = ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
+      },
+      beforeStop(evt, ui) {
+        const parentOffset = ui.item.parent().offset();
+        const siblings = ui.item.siblings('.js-swimlane');
+        siblings.css('height', '');
+
+        // compute the new scroll height after the resize and removal of
+        // the placeholder
+        const scrollTop = ui.placeholder.get(0).offsetTop + parentOffset.top - evt.pageY;
+
+        // then reset the original view of the swimlane
+        siblings.removeClass('moving-swimlane');
+
+        // and apply the computed scrollheight
+        ui.item.parent().get(0).scrollTop = scrollTop;
      },
      stop(evt, ui) {
        // To attribute the new index number, we need to get the DOM element
        // of the previous and the following card -- if any.
-        const prevSwimlaneDom = ui.item.prev('.js-swimlane').get(0);
-        const nextSwimlaneDom = ui.item.next('.js-swimlane').get(0);
+        const prevSwimlaneDom = ui.item.prevAll('.js-swimlane').get(0);
+        const nextSwimlaneDom = ui.item.nextAll('.js-swimlane').get(0);
        const sortIndex = calculateIndex(prevSwimlaneDom, nextSwimlaneDom, 1);

        $swimlanesDom.sortable('cancel');
@@ -72,6 +147,30 @@ BlazeComponent.extendComponent({

        boardComponent.setIsDragging(false);
      },
+      sort(evt, ui) {
+        // get the mouse position in the sortable
+        const parentOffset = ui.item.parent().offset();
+        const cursorY = evt.pageY - parentOffset.top + ui.item.parent().scrollTop();
+
+        // compute the intended index of the placeholder (we need to skip the
+        // slots between the headers and the list of cards)
+        const newplaceholderIndex = Math.floor(cursorY / swimlaneWhileSortingHeight);
+        let destPlaceholderIndex = (newplaceholderIndex + 1) * 2;
+
+        // if we are scrolling far away from the bottom of the list
+        if (destPlaceholderIndex >= ui.item.parent().get(0).childElementCount) {
+          destPlaceholderIndex = ui.item.parent().get(0).childElementCount - 1;
+        }
+
+        // update the placeholder position in the DOM tree
+        if (destPlaceholderIndex !== ui.placeholder.index()) {
+          if (destPlaceholderIndex < boardComponent.origPlaceholderIndex) {
+            ui.placeholder.insertBefore(ui.placeholder.siblings().slice(destPlaceholderIndex - 2, destPlaceholderIndex - 1));
+          } else {
+            ui.placeholder.insertAfter(ui.placeholder.siblings().slice(destPlaceholderIndex - 1, destPlaceholderIndex));
+          }
+        }
+      },
    });

    // ugly touch event hotfix
@@ -92,19 +191,19 @@ BlazeComponent.extendComponent({
  isViewSwimlanes() {
    const currentUser = Meteor.user();
    if (!currentUser) return false;
-    return (currentUser.profile.boardView === 'board-view-swimlanes');
+    return ((currentUser.profile || {}).boardView === 'board-view-swimlanes');
  },

  isViewLists() {
    const currentUser = Meteor.user();
    if (!currentUser) return true;
-    return (currentUser.profile.boardView === 'board-view-lists');
+    return ((currentUser.profile || {}).boardView === 'board-view-lists');
  },

  isViewCalendar() {
    const currentUser = Meteor.user();
-    if (!currentUser) return true;
-    return (currentUser.profile.boardView === 'board-view-cal');
+    if (!currentUser) return false;
+    return ((currentUser.profile || {}).boardView === 'board-view-cal');
  },

  openNewListForm() {
@@ -233,4 +332,9 @@ BlazeComponent.extendComponent({
      },
    };
  },
+  isViewCalendar() {
+    const currentUser = Meteor.user();
+    if (!currentUser) return false;
+    return ((currentUser.profile || {}).boardView === 'board-view-cal');
+  },
 }).register('calendarView');
@@ -50,6 +50,6 @@ position()
        display: flex
        flex-direction: column
        margin: 0
-        padding: 0 40px 0px 0
+        padding: 0 0px 0px 0
        overflow-x: hidden
        overflow-y: auto
@@ -7,71 +7,69 @@ template(name="boardHeaderBar")

  .board-header-btns.left
    unless isMiniScreen
-      unless isSandstorm
-        if currentBoard
-          if currentUser
-            a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
-              title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
-              i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
-              if showStarCounter
-                span
-                  = currentBoard.stars
+      if currentBoard
+        if currentUser
+          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
+            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
+            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
+            if showStarCounter
+              span
+                = currentBoard.stars

-            a.board-header-btn(
-              class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
-              title="{{_ currentBoard.permission}}")
-              i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
-              span {{_ currentBoard.permission}}
+          a.board-header-btn(
+            class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
+            title="{{_ currentBoard.permission}}")
+            i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
+            span {{_ currentBoard.permission}}

-            a.board-header-btn.js-watch-board(
-              title="{{_ watchLevel }}")
-              if $eq watchLevel "watching"
-                i.fa.fa-eye
-              if $eq watchLevel "tracking"
-                i.fa.fa-bell
-              if $eq watchLevel "muted"
-                i.fa.fa-bell-slash
-              span {{_ watchLevel}}
+          a.board-header-btn.js-watch-board(
+            title="{{_ watchLevel }}")
+            if $eq watchLevel "watching"
+              i.fa.fa-eye
+            if $eq watchLevel "tracking"
+              i.fa.fa-bell
+            if $eq watchLevel "muted"
+              i.fa.fa-bell-slash
+            span {{_ watchLevel}}

-          else
-            a.board-header-btn.js-log-in(
-              title="{{_ 'log-in'}}")
-              i.fa.fa-sign-in
-              span {{_ 'log-in'}}
+        else
+          a.board-header-btn.js-log-in(
+            title="{{_ 'log-in'}}")
+            i.fa.fa-sign-in
+            span {{_ 'log-in'}}

  .board-header-btns.right
    if currentBoard
      if isMiniScreen
-        unless isSandstorm
-          if currentUser
-            a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
-              title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
-              i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
-              if showStarCounter
-                span
-                  = currentBoard.stars
+        if currentUser
+          a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}"
+            title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}")
+            i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}")
+            if showStarCounter
+              span
+                = currentBoard.stars

-            a.board-header-btn(
-              class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
-              title="{{_ currentBoard.permission}}")
-              i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
-              span {{_ currentBoard.permission}}
+          a.board-header-btn(
+            class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}"
+            title="{{_ currentBoard.permission}}")
+            i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}")
+            span {{_ currentBoard.permission}}

-            a.board-header-btn.js-watch-board(
-              title="{{_ watchLevel }}")
-              if $eq watchLevel "watching"
-                i.fa.fa-eye
-              if $eq watchLevel "tracking"
-                i.fa.fa-bell
-              if $eq watchLevel "muted"
-                i.fa.fa-bell-slash
-              span {{_ watchLevel}}
+          a.board-header-btn.js-watch-board(
+            title="{{_ watchLevel }}")
+            if $eq watchLevel "watching"
+              i.fa.fa-eye
+            if $eq watchLevel "tracking"
+              i.fa.fa-bell
+            if $eq watchLevel "muted"
+              i.fa.fa-bell-slash
+            span {{_ watchLevel}}

-          else
-            a.board-header-btn.js-log-in(
-              title="{{_ 'log-in'}}")
-              i.fa.fa-sign-in
-              span {{_ 'log-in'}}
+        else
+          a.board-header-btn.js-log-in(
+            title="{{_ 'log-in'}}")
+            i.fa.fa-sign-in
+            span {{_ 'log-in'}}

      if isSandstorm
        if currentUser
@@ -96,10 +94,11 @@ template(name="boardHeaderBar")
        i.fa.fa-search
        span {{_ 'search'}}

-      a.board-header-btn.js-toggle-board-view(
-        title="{{_ 'board-view'}}")
-        i.fa.fa-th-large
-        span {{_ currentUser.profile.boardView}}
+      unless currentBoard.isTemplatesBoard
+        a.board-header-btn.js-toggle-board-view(
+          title="{{_ 'board-view'}}")
+          i.fa.fa-th-large
+          span {{#if currentUser.profile.boardView}}{{_ currentUser.profile.boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}}

      if canModifyBoard
        a.board-header-btn.js-multiselection-activate(
@@ -112,40 +111,8 @@ template(name="boardHeaderBar")
              i.fa.fa-times-thin

      .separator
-      a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}")
-        i.board-header-btn-icon.fa.fa-navicon
-
-template(name="boardMenuPopup")
-  ul.pop-over-list
-    li: a.js-custom-fields {{_ 'custom-fields'}}
-    li: a.js-open-archives {{_ 'archived-items'}}
-    if currentUser.isBoardAdmin
-      li: a.js-change-board-color {{_ '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 {{_ 'language'}}
-  unless isSandstorm
-    if currentUser.isBoardAdmin
-      hr
-      ul.pop-over-list
-        li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
-        li: a.js-archive-board {{_ 'archive-board'}}
-        li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
-      hr
-      ul.pop-over-list
-        li: a.js-subtask-settings {{_ 'subtask-settings'}}
-
-  if isSandstorm
-    hr
-    ul.pop-over-list
-      li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
-      li: a.js-import-board {{_ 'import-board-c'}}
-    hr
-    ul.pop-over-list
-      li: a.js-subtask-settings {{_ 'subtask-settings'}}
+      a.board-header-btn.js-toggle-sidebar
+        i.fa.fa-navicon

 template(name="boardVisibilityList")
  ul.pop-over-list
@@ -196,64 +163,6 @@ template(name="boardChangeWatchPopup")
            i.fa.fa-check
          span.sub-name {{_ 'muted-info'}}

-template(name="boardChangeColorPopup")
-  .board-backgrounds-list.clearfix
-    each backgroundColors
-      .board-background-select.js-select-background
-        span.background-box(class="board-color-{{this}}")
-          if isSelected
-            i.fa.fa-check
-
-template(name="boardSubtaskSettingsPopup")
-  form.board-subtask-settings
-    h3 {{_ 'show-parent-in-minicard'}}
-      a#prefix-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}")
-        span {{_ 'prefix-with-full-path'}}
-      a#prefix-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}")
-        span {{_ 'prefix-with-parent'}}
-      a#subtext-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}")
-        span {{_ 'subtext-with-full-path'}}
-      a#subtext-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}")
-        span {{_ 'subtext-with-parent'}}
-      a#no-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}")
-        span {{_ 'no-parent'}}
-    div
-      hr
-
-    div.check-div
-      a.flex.js-field-has-subtasks(class="{{#if allowsSubtasks}}is-checked{{/if}}")
-        .materialCheckBox(class="{{#if allowsSubtasks}}is-checked{{/if}}")
-        span {{_ 'show-subtasks-field'}}
-
-    label
-      | {{_ 'deposit-subtasks-board'}}
-      select.js-field-deposit-board(disabled="{{#unless allowsSubtasks}}disabled{{/unless}}")
-          each boards
-            if isBoardSelected
-              option(value=_id selected="selected") {{title}}
-            else
-              option(value=_id) {{title}}
-          if isNullBoardSelected
-            option(value='null' selected="selected") {{_ 'custom-field-dropdown-none'}}
-          else
-            option(value='null') {{_ 'custom-field-dropdown-none'}}
-    div
-      hr
-
-    label
-      | {{_ 'deposit-subtasks-list'}}
-      select.js-field-deposit-list(disabled="{{#unless hasLists}}disabled{{/unless}}")
-          each lists
-            if isListSelected
-              option(value=_id selected="selected") {{title}}
-            else
-              option(value=_id) {{title}}
-
 template(name="createBoard")
  form
    label
@@ -275,50 +184,21 @@ template(name="createBoard")
    input.primary.wide(type="submit" value="{{_ 'create'}}")
    span.quiet
      | {{_ 'or'}}
-      a.js-import-board {{_ 'import-board'}}
-
-template(name="chooseBoardSource")
-  ul.pop-over-list
-    li
-      a(href="{{pathFor '/import/trello'}}") {{_ 'from-trello'}}
-    li
-      a(href="{{pathFor '/import/wekan'}}") {{_ 'from-wekan'}}
+      a.js-import-board {{_ 'import'}}
+    span.quiet
+      | /
+      a.js-board-template {{_ 'template'}}

 template(name="boardChangeTitlePopup")
  form
    label
      | {{_ 'title'}}
-      input.js-board-name(type="text" value=title autofocus)
+      input.js-board-name(type="text" value=title autofocus dir="auto")
    label
      | {{_ 'description'}}
-      textarea.js-board-desc= description
+      textarea.js-board-desc(dir="auto")= description
    input.primary.wide(type="submit" value="{{_ 'rename'}}")

 template(name="boardCreateRulePopup")
  p {{_ 'close-board-pop'}}
  button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
-
-
-template(name="archiveBoardPopup")
-  p {{_ 'close-board-pop'}}
-  button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
-
-template(name="outgoingWebhooksPopup")
-  each integrations
-    form.integration-form
-      if title
-        h4 {{title}}
-      else
-        h4 {{_ 'no-name'}}
-      label
-        | URL
-        input.js-outgoing-webhooks-url(type="text" name="url" value=url)
-        input(type="hidden" value=_id name="id")
-      input.primary.wide(type="submit" value="{{_ 'save'}}")
-  form.integration-form
-    h4
-      | {{_ 'new-outgoing-webhook'}}
-    label
-      | URL
-      input.js-outgoing-webhooks-url(type="text" name="url" autofocus)
-    input.primary.wide(type="submit" value="{{_ 'save'}}")
@@ -89,14 +89,19 @@ BlazeComponent.extendComponent({
      },
      'click .js-toggle-board-view'() {
        const currentUser = Meteor.user();
-        if (currentUser.profile.boardView === 'board-view-swimlanes') {
+        if ((currentUser.profile || {}).boardView === 'board-view-swimlanes') {
          currentUser.setBoardView('board-view-cal');
-        } else if (currentUser.profile.boardView === 'board-view-lists') {
+        } else if ((currentUser.profile || {}).boardView === 'board-view-lists') {
          currentUser.setBoardView('board-view-swimlanes');
-        } else if (currentUser.profile.boardView === 'board-view-cal') {
+        } else if ((currentUser.profile || {}).boardView === 'board-view-cal') {
          currentUser.setBoardView('board-view-lists');
+        } else {
+          currentUser.setBoardView('board-view-swimlanes');
        }
      },
+      'click .js-toggle-sidebar'() {
+        Sidebar.toggle();
+      },
      'click .js-open-filter-view'() {
        Sidebar.setView('filter');
      },
@@ -135,124 +140,6 @@ Template.boardHeaderBar.helpers({
  },
 });

-BlazeComponent.extendComponent({
-  backgroundColors() {
-    return Boards.simpleSchema()._schema.color.allowedValues;
-  },
-
-  isSelected() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return currentBoard.color === this.currentData().toString();
-  },
-
-  events() {
-    return [{
-      'click .js-select-background'(evt) {
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
-        const newColor = this.currentData().toString();
-        currentBoard.setColor(newColor);
-        evt.preventDefault();
-      },
-    }];
-  },
-}).register('boardChangeColorPopup');
-
-BlazeComponent.extendComponent({
-  onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
-  },
-
-  allowsSubtasks() {
-    return this.currentBoard.allowsSubtasks;
-  },
-
-  isBoardSelected() {
-    return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id;
-  },
-
-  isNullBoardSelected() {
-    return (this.currentBoard.subtasksDefaultBoardId === null) || (this.currentBoard.subtasksDefaultBoardId === undefined);
-  },
-
-  boards() {
-    return Boards.find({
-      archived: false,
-      'members.userId': Meteor.userId(),
-    }, {
-      sort: ['title'],
-    });
-  },
-
-  lists() {
-    return Lists.find({
-      boardId: this.currentBoard._id,
-      archived: false,
-    }, {
-      sort: ['title'],
-    });
-  },
-
-  hasLists() {
-    return this.lists().count() > 0;
-  },
-
-  isListSelected() {
-    return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id;
-  },
-
-  presentParentTask() {
-    let result = this.currentBoard.presentParentTask;
-    if ((result === null) || (result === undefined)) {
-      result = 'no-parent';
-    }
-    return result;
-  },
-
-  events() {
-    return [{
-      'click .js-field-has-subtasks'(evt) {
-        evt.preventDefault();
-        this.currentBoard.allowsSubtasks = !this.currentBoard.allowsSubtasks;
-        this.currentBoard.setAllowsSubtasks(this.currentBoard.allowsSubtasks);
-        $('.js-field-has-subtasks .materialCheckBox').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
-        $('.js-field-has-subtasks').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
-        $('.js-field-deposit-board').prop('disabled', !this.currentBoard.allowsSubtasks);
-      },
-      'change .js-field-deposit-board'(evt) {
-        let value = evt.target.value;
-        if (value === 'null') {
-          value = null;
-        }
-        this.currentBoard.setSubtasksDefaultBoardId(value);
-        evt.preventDefault();
-      },
-      'change .js-field-deposit-list'(evt) {
-        this.currentBoard.setSubtasksDefaultListId(evt.target.value);
-        evt.preventDefault();
-      },
-      'click .js-field-show-parent-in-minicard'(evt) {
-        const value = evt.target.id || $(evt.target).parent()[0].id ||  $(evt.target).parent()[0].parent()[0].id;
-        const options = [
-          'prefix-with-full-path',
-          'prefix-with-parent',
-          'subtext-with-full-path',
-          'subtext-with-parent',
-          'no-parent'];
-        options.forEach(function(element) {
-          if (element !== value) {
-            $(`#${element} .materialCheckBox`).toggleClass('is-checked', false);
-            $(`#${element}`).toggleClass('is-checked', false);
-          }
-        });
-        $(`#${value} .materialCheckBox`).toggleClass('is-checked', true);
-        $(`#${value}`).toggleClass('is-checked', true);
-        this.currentBoard.setPresentParentTask(value);
-        evt.preventDefault();
-      },
-    }];
-  },
-}).register('boardSubtaskSettingsPopup');
-
 const CreateBoard = BlazeComponent.extendComponent({
  template() {
    return 'createBoard';
@@ -304,16 +191,11 @@ const CreateBoard = BlazeComponent.extendComponent({
      'click .js-import': Popup.open('boardImportBoard'),
      submit: this.onSubmit,
      'click .js-import-board': Popup.open('chooseBoardSource'),
+      'click .js-board-template': Popup.open('searchElement'),
    }];
  },
 }).register('createBoardPopup');

-BlazeComponent.extendComponent({
-  template() {
-    return 'chooseBoardSource';
-  },
-}).register('chooseBoardSourcePopup');
-
 (class HeaderBarCreateBoard extends CreateBoard {
  onSubmit(evt) {
    super.onSubmit(evt);
@@ -363,50 +245,3 @@ BlazeComponent.extendComponent({
    }];
  },
 }).register('boardChangeWatchPopup');
-
-BlazeComponent.extendComponent({
-  integrations() {
-    const boardId = Session.get('currentBoard');
-    return Integrations.find({ boardId: `${boardId}` }).fetch();
-  },
-
-  integration(id) {
-    const boardId = Session.get('currentBoard');
-    return Integrations.findOne({ _id: id, boardId: `${boardId}` });
-  },
-
-  events() {
-    return [{
-      'submit'(evt) {
-        evt.preventDefault();
-        const url = evt.target.url.value;
-        const boardId = Session.get('currentBoard');
-        let id = null;
-        let integration = null;
-        if (evt.target.id) {
-          id = evt.target.id.value;
-          integration = this.integration(id);
-          if (url) {
-            Integrations.update(integration._id, {
-              $set: {
-                url: `${url}`,
-              },
-            });
-          } else {
-            Integrations.remove(integration._id);
-          }
-        } else if (url) {
-          Integrations.insert({
-            userId: Meteor.userId(),
-            enabled: true,
-            type: 'outgoing-webhooks',
-            url: `${url}`,
-            boardId: `${boardId}`,
-            activities: ['all'],
-          });
-        }
-        Popup.close();
-      },
-    }];
-  },
-}).register('outgoingWebhooksPopup');
@@ -18,17 +18,25 @@ template(name="boardList")
          else
            a.js-open-board.board-list-item(href="{{pathFor 'board' id=_id slug=slug}}")
              span.details
-                span.board-list-item-name= title
+                span.board-list-item-name
+                  +viewer
+                    = title
                i.fa.js-star-board(
                  class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
                  title="{{_ 'star-board-title'}}")
-
+                p.board-list-item-desc
+                  +viewer
+                    = description
                if hasSpentTimeCards
                  i.fa.js-has-spenttime-cards(
                    class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
                    title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
-
-                p.board-list-item-desc= description
+                i.fa.js-clone-board(
+                    class="fa-clone"
+                    title="{{_ 'duplicate-board'}}")
+                i.fa.js-archive-board(
+                    class="fa-archive"
+                    title="{{_ 'archive-board'}}")

 template(name="boardListHeaderBar")
  h1 {{_ 'my-boards'}}
@@ -36,3 +44,6 @@ template(name="boardListHeaderBar")
    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'}}
@@ -1,5 +1,20 @@
 const subManager = new SubsManager();

+Template.boardListHeaderBar.events({
+  'click .js-open-archived-board'() {
+    Modal.open('archivedBoards');
+  },
+});
+
+Template.boardListHeaderBar.helpers({
+  templatesBoardId() {
+    return Meteor.user().getTemplatesBoardId();
+  },
+  templatesBoardSlug() {
+    return Meteor.user().getTemplatesBoardSlug();
+  },
+});
+
 BlazeComponent.extendComponent({
  onCreated() {
    Meteor.subscribe('setting');
@@ -9,23 +24,21 @@ BlazeComponent.extendComponent({
    return Boards.find({
      archived: false,
      'members.userId': Meteor.userId(),
-    }, {
-      sort: ['title'],
-    });
+      type: 'board',
+    }, { sort: ['title'] });
  },
-
  isStarred() {
    const user = Meteor.user();
    return user && user.hasStarred(this.currentData()._id);
  },

  hasOvertimeCards() {
-    subManager.subscribe('board', this.currentData()._id);
+    subManager.subscribe('board', this.currentData()._id, false);
    return this.currentData().hasOvertimeCards();
  },

  hasSpentTimeCards() {
-    subManager.subscribe('board', this.currentData()._id);
+    subManager.subscribe('board', this.currentData()._id, false);
    return this.currentData().hasSpentTimeCards();
  },

@@ -42,6 +55,26 @@ BlazeComponent.extendComponent({
        Meteor.user().toggleBoardStar(boardId);
        evt.preventDefault();
      },
+      'click .js-clone-board'(evt) {
+        Meteor.call('cloneBoard',
+          this.currentData()._id,
+          Session.get('fromBoard'),
+          (err, res) => {
+            if (err) {
+              this.setError(err.error);
+            } else {
+              Session.set('fromBoard', null);
+              Utils.goBoardId(res);
+            }
+          }
+        );
+        evt.preventDefault();
+      },
+      'click .js-archive-board'(evt) {
+        const boardId = this.currentData()._id;
+        Meteor.call('archiveBoard', boardId);
+        evt.preventDefault();
+      },
      'click .js-accept-invite'() {
        const boardId = this.currentData()._id;
        Meteor.user().removeInvite(boardId);
@@ -94,13 +94,41 @@ $spaceBetweenTiles = 16px
  .is-star-active
    color: white

+  .fa-clone
+    position: absolute;
+    bottom: 0
+    font-size: 14px
+    height: 18px
+    line-height: 18px
+    opacity: 0
+    right: 0
+    padding: 9px 9px
+    transition-duration: .15s
+    transition-property: color, font-size, background
+
+  .fa-archive
+    position: absolute;
+    bottom: 0
+    font-size: 14px
+    height: 18px
+    line-height: 18px
+    opacity: 0
+    left: 0
+    padding: 9px 9px
+    transition-duration: .15s
+    transition-property: color, font-size, background
+
  li:hover a
    &:hover
      .fa-star,
+      .fa-clone,
+      .fa-archive,
      .fa-star-o
        color: white

    .fa-star,
+    .fa-clone,
+    .fa-archive,
    .fa-star-o
      color: white
      opacity: .75
@@ -0,0 +1,8 @@
+template(name="miniboard")
+  .minicard(
+    class="minicard-{{colorClass}}")
+    .minicard-title
+      .handle
+        .fa.fa-arrows
+      +viewer
+        = title
@@ -4,9 +4,10 @@ template(name="cardCustomFieldsPopup")
            li.item(class="")
                a.name.js-select-field(href="#")
                    span.full-name
+                      +viewer
                        = name
                    if hasCustomField
-                        i.fa.fa-check
+                      i.fa.fa-check
    hr
    a.quiet-button.full.js-settings
        i.fa.fa-cog
@@ -61,9 +62,13 @@ template(name="cardCustomField-dropdown")
            select.inline
                each items
                    if($eq data.value this._id)
-                        option(value=_id selected="selected") {{name}}
+                        option(value=_id selected="selected")
+                          +viewer
+                            = name
                    else
-                        option(value=_id) {{name}}
+                        option(value=_id)
+                          +viewer
+                            = name
            .edit-controls.clearfix
                button.primary(type="submit") {{_ 'save'}}
                a.fa.fa-times-thin.js-close-inlined-form
@@ -73,4 +78,4 @@ template(name="cardCustomField-dropdown")
                    +viewer
                        = selectedItem
                else
-                    | {{_ 'edit'}}
+                    | {{_ 'edit'}}
@@ -1,6 +1,6 @@
 template(name="cardDetails")
  section.card-details.js-card-details.js-perfect-scrollbar: .card-details-canvas
-    .card-details-header
+    .card-details-header(class='{{#if colorClass}}card-details-{{colorClass}}{{/if}}')
      +inlinedForm(classNames="js-card-details-title")
        +editCardTitleForm
      else
@@ -19,16 +19,14 @@ template(name="cardDetails")
            a.js-parent-card(href=linkForCard) {{title}}
          // else
            {{_ 'top-level-card'}}
-        unless isSandstorm
-          if isLinkedCard
-            h3.linked-card-location
-              +viewer
-                | {{getBoardTitle}} > {{getTitle}}
+        if isLinkedCard
+          h3.linked-card-location
+            +viewer
+              | {{getBoardTitle}} > {{getTitle}}

    if getArchived
      if isLinkedBoard
-        unless isSandstorm
-          p.warning {{_ 'board-archived'}}
+        p.warning {{_ 'board-archived'}}
      else
        p.warning {{_ 'card-archived'}}

@@ -79,7 +77,9 @@ template(name="cardDetails")
        h3.card-details-item-title {{_ '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)= name
+            span.card-label(class="card-label-{{color}}" title=name)
+              +viewer
+                = name
        if canModifyCard
          a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}")
            i.fa.fa-plus
@@ -88,7 +88,8 @@ template(name="cardDetails")
      each customFieldsWD
        .card-details-item.card-details-item-customfield
          h3.card-details-item-title
-            = definition.name
+            +viewer
+              = definition.name
          +cardCustomField

    .card-details-items
@@ -192,29 +193,27 @@ template(name="cardDetails")
    unless currentUser.isNoComments
      if isLoaded.get
        if isLinkedCard
-          unless isSandstorm
-            +activities(card=this mode="linkedcard")
+          +activities(card=this mode="linkedcard")
        else if isLinkedBoard
-          unless isSandstorm
-            +activities(card=this mode="linkedboard")
+          +activities(card=this mode="linkedboard")
        else
          +activities(card=this mode="card")

 template(name="editCardTitleForm")
-  textarea.js-edit-card-title(rows='1' autofocus)
+  textarea.js-edit-card-title(rows='1' autofocus dir="auto")
    = getTitle
  .edit-controls.clearfix
    button.primary.confirm.js-submit-edit-card-title-form(type="submit") {{_ 'save'}}
    a.fa.fa-times-thin.js-close-inlined-form

 template(name="editCardRequesterForm")
-  input.js-edit-card-requester(type='text' autofocus value=getRequestedBy)
+  input.js-edit-card-requester(type='text' autofocus value=getRequestedBy dir="auto")
  .edit-controls.clearfix
    button.primary.confirm.js-submit-edit-card-requester-form(type="submit") {{_ 'save'}}
    a.fa.fa-times-thin.js-close-inlined-form

 template(name="editCardAssignerForm")
-  input.js-edit-card-assigner(type='text' autofocus value=getAssignedBy)
+  input.js-edit-card-assigner(type='text' autofocus value=getAssignedBy dir="auto")
  .edit-controls.clearfix
    button.primary.confirm.js-submit-edit-card-assigner-form(type="submit") {{_ 'save'}}
    a.fa.fa-times-thin.js-close-inlined-form
@@ -225,15 +224,16 @@ template(name="cardDetailsActionsPopup")
  if canModifyCard
    hr
    ul.pop-over-list
-      li: a.js-members {{_ 'card-edit-members'}}
-      li: a.js-labels {{_ 'card-edit-labels'}}
-      li: a.js-attachments {{_ 'card-edit-attachments'}}
+      //li: a.js-members {{_ 'card-edit-members'}}
+      //li: a.js-labels {{_ 'card-edit-labels'}}
+      //li: a.js-attachments {{_ 'card-edit-attachments'}}
      li: a.js-custom-fields {{_ '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'}}
-      li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
+      //li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
+      //li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
+      //li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
+      //li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
      li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
+      li: a.js-set-card-color {{_ 'setCardColorPopup-title'}}
    hr
    ul.pop-over-list
      li: a.js-move-card-to-top {{_ 'moveCardToTop-title'}}
@@ -309,33 +309,41 @@ template(name="cardMorePopup")
    h2 {{_ 'change-card-parent'}}
    label {{_ 'source-board'}}:
      select.js-field-parent-board
+        if isTopLevel
+          option(value="none" selected) {{_ 'custom-field-dropdown-none'}}
+        else
+          option(value="none") {{_ 'custom-field-dropdown-none'}}
        each boards
          if isParentBoard
            option(value="{{_id}}" selected) {{title}}
          else
            option(value="{{_id}}") {{title}}
-        if isTopLevel
-          option(value="none" selected) {{_ 'custom-field-dropdown-none'}}
-        else
-          option(value="none") {{_ 'custom-field-dropdown-none'}}

    label {{_ 'parent-card'}}:
      select.js-field-parent-card
        if isTopLevel
          option(value="none" selected) {{_ 'custom-field-dropdown-none'}}
        else
+          option(value="none") {{_ 'custom-field-dropdown-none'}}
          each cards
            if isParentCard
              option(value="{{_id}}" selected) {{title}}
            else
              option(value="{{_id}}") {{title}}
-          option(value="none") {{_ 'custom-field-dropdown-none'}}
    br
    | {{_ 'added'}}
    span.date(title=card.createdAt) {{ moment createdAt 'LLL' }}
    a.js-delete(title="{{_ 'card-delete-notice'}}") {{_ 'delete'}}

-
+template(name="setCardColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      unless $eq color 'white'
+        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'}}
+    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}

 template(name="cardDeletePopup")
  p {{_ "card-delete-pop"}}
@@ -1,6 +1,11 @@
 const subManager = new SubsManager();
 const { calculateIndexData, enableClickOnTouch } = Utils;

+let cardColors;
+Meteor.startup(() => {
+  cardColors = Cards.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
  mixins() {
    return [Mixins.InfiniteScrolling, Mixins.PerfectScrollbar];
@@ -73,14 +78,13 @@ BlazeComponent.extendComponent({
    //Scroll top
    const cardViewStartTop = $cardView.offset().top;
    const cardContainerScrollTop = $cardContainer.scrollTop();
+
    let topOffset = false;
-    if(cardViewStartTop < 0){
-      topOffset = 0;
-    } else if(cardViewStartTop - cardContainerScrollTop > 100) {
-      topOffset = cardViewStartTop - cardContainerScrollTop - 100;
+    if(cardViewStartTop !== 100){
+      topOffset = cardViewStartTop - 100;
    }
    if(topOffset !== false) {
-      bodyBoardComponent.scrollTop(topOffset);
+      bodyBoardComponent.scrollTop(cardContainerScrollTop + topOffset);
    }

  },
@@ -337,6 +341,7 @@ Template.cardDetailsActionsPopup.events({
  'click .js-move-card': Popup.open('moveCard'),
  'click .js-copy-card': Popup.open('copyCard'),
  'click .js-copy-checklist-cards': Popup.open('copyChecklistToManyCards'),
+  'click .js-set-card-color': Popup.open('setCardColor'),
  'click .js-move-card-to-top' (evt) {
    evt.preventDefault();
    const minOrder = _.min(this.list().cards(this.swimlaneId).map((c) => c.sort));
@@ -407,17 +412,19 @@ Template.moveCardPopup.events({
    // XXX We should *not* get the currentCard from the global state, but
    // 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;
    const lSelect = $('.js-select-lists')[0];
-    const newListId = lSelect.options[lSelect.selectedIndex].value;
+    const listId = lSelect.options[lSelect.selectedIndex].value;
    const slSelect = $('.js-select-swimlanes')[0];
-    card.swimlaneId = slSelect.options[slSelect.selectedIndex].value;
-    card.move(card.swimlaneId, newListId, 0);
+    const swimlaneId = slSelect.options[slSelect.selectedIndex].value;
+    card.move(boardId, swimlaneId, listId, 0);
    Popup.close();
  },
 });
 BlazeComponent.extendComponent({
  onCreated() {
-    subManager.subscribe('board', Session.get('currentBoard'));
+    subManager.subscribe('board', Session.get('currentBoard'), false);
    this.selectedBoardId = new ReactiveVar(Session.get('currentBoard'));
  },

@@ -425,6 +432,7 @@ BlazeComponent.extendComponent({
    const boards = Boards.find({
      archived: false,
      'members.userId': Meteor.userId(),
+      _id: {$ne: Meteor.user().getTemplatesBoardId()},
    }, {
      sort: ['title'],
    });
@@ -445,38 +453,21 @@ BlazeComponent.extendComponent({
    return [{
      'change .js-select-boards'(evt) {
        this.selectedBoardId.set($(evt.currentTarget).val());
-        subManager.subscribe('board', this.selectedBoardId.get());
+        subManager.subscribe('board', this.selectedBoardId.get(), false);
      },
    }];
  },
 }).register('boardsAndLists');

-
-function cloneCheckList(_id, checklist) {
-  'use strict';
-  const checklistId = checklist._id;
-  checklist.cardId = _id;
-  checklist._id = null;
-  const newChecklistId = Checklists.insert(checklist);
-  ChecklistItems.find({checklistId}).forEach(function(item) {
-    item._id = null;
-    item.checklistId = newChecklistId;
-    item.cardId = _id;
-    ChecklistItems.insert(item);
-  });
-}
-
 Template.copyCardPopup.events({
  'click .js-done'() {
    const card = Cards.findOne(Session.get('currentCard'));
-    const oldId = card._id;
-    card._id = null;
    const lSelect = $('.js-select-lists')[0];
-    card.listId = lSelect.options[lSelect.selectedIndex].value;
+    listId = lSelect.options[lSelect.selectedIndex].value;
    const slSelect = $('.js-select-swimlanes')[0];
-    card.swimlaneId = slSelect.options[slSelect.selectedIndex].value;
+    const swimlaneId = slSelect.options[slSelect.selectedIndex].value;
    const bSelect = $('.js-select-boards')[0];
-    card.boardId = bSelect.options[bSelect.selectedIndex].value;
+    const boardId = bSelect.options[bSelect.selectedIndex].value;
    const textarea = $('#copy-card-title');
    const title = textarea.val().trim();
    // insert new card to the bottom of new list
@@ -485,38 +476,13 @@ Template.copyCardPopup.events({
    if (title) {
      card.title = title;
      card.coverId = '';
-      const _id = Cards.insert(card);
+      const _id = card.copy(boardId, swimlaneId, listId);
      // In case the filter is active we need to add the newly inserted card in
      // the list of exceptions -- cards that are not filtered. Otherwise the
      // card will disappear instantly.
      // See https://github.com/wekan/wekan/issues/80
      Filter.addException(_id);

-      // copy checklists
-      let cursor = Checklists.find({cardId: oldId});
-      cursor.forEach(function() {
-        cloneCheckList(_id, arguments[0]);
-      });
-
-      // copy subtasks
-      cursor = Cards.find({parentId: oldId});
-      cursor.forEach(function() {
-        'use strict';
-        const subtask = arguments[0];
-        subtask.parentId = _id;
-        subtask._id = null;
-        /* const newSubtaskId = */ Cards.insert(subtask);
-      });
-
-      // copy card comments
-      cursor = CardComments.find({cardId: oldId});
-      cursor.forEach(function () {
-        'use strict';
-        const comment = arguments[0];
-        comment.cardId = _id;
-        comment._id = null;
-        CardComments.insert(comment);
-      });
      Popup.close();
    }
  },
@@ -553,9 +519,8 @@ Template.copyChecklistToManyCardsPopup.events({
        Filter.addException(_id);

        // copy checklists
-        let cursor = Checklists.find({cardId: oldId});
-        cursor.forEach(function() {
-          cloneCheckList(_id, arguments[0]);
+        Checklists.find({cardId: oldId}).forEach((ch) => {
+          ch.copy(_id);
        });

        // copy subtasks
@@ -569,13 +534,8 @@ Template.copyChecklistToManyCardsPopup.events({
        });

        // copy card comments
-        cursor = CardComments.find({cardId: oldId});
-        cursor.forEach(function () {
-          'use strict';
-          const comment = arguments[0];
-          comment.cardId = _id;
-          comment._id = null;
-          CardComments.insert(comment);
+        CardComments.find({cardId: oldId}).forEach((cmt) => {
+          cmt.copy(_id);
        });
      }
      Popup.close();
@@ -586,11 +546,48 @@ Template.copyChecklistToManyCardsPopup.events({
 BlazeComponent.extendComponent({
  onCreated() {
    this.currentCard = this.currentData();
+    this.currentColor = new ReactiveVar(this.currentCard.color);
+  },
+
+  colors() {
+    return cardColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    if (this.currentColor.get() === null) {
+      return color === 'white';
+    }
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.currentCard.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentCard.setColor(null);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setCardColorPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentCard = this.currentData();
+    this.parentBoard = new ReactiveVar(null);
    this.parentCard = this.currentCard.parentCard();
    if (this.parentCard) {
-      this.parentBoard = this.parentCard.board();
+      const list = $('.js-field-parent-card');
+      list.val(this.parentCard._id);
+      this.parentBoard.set(this.parentCard.board()._id);
    } else {
-      this.parentBoard = null;
+      this.parentBoard.set(null);
    }
  },

@@ -598,6 +595,9 @@ BlazeComponent.extendComponent({
    const boards = Boards.find({
      archived: false,
      'members.userId': Meteor.userId(),
+      _id: {
+        $ne: Meteor.user().getTemplatesBoardId(),
+      },
    }, {
      sort: ['title'],
    });
@@ -605,8 +605,12 @@ BlazeComponent.extendComponent({
  },

  cards() {
-    if (this.parentBoard) {
-      return this.parentBoard.cards();
+    const currentId = Session.get('currentCard');
+    if (this.parentBoard.get()) {
+      return Cards.find({
+        boardId: this.parentBoard.get(),
+        _id: {$ne: currentId},
+      });
    } else {
      return [];
    }
@@ -614,8 +618,8 @@ BlazeComponent.extendComponent({

  isParentBoard() {
    const board = this.currentData();
-    if (this.parentBoard) {
-      return board._id === this.parentBoard;
+    if (this.parentBoard.get()) {
+      return board._id === this.parentBoard.get();
    }
    return false;
  },
@@ -629,11 +633,10 @@ BlazeComponent.extendComponent({
  },

  setParentCardId(cardId) {
-    if (cardId === 'null') {
-      cardId = null;
-      this.parentCard = null;
-    } else {
+    if (cardId) {
      this.parentCard = Cards.findOne(cardId);
+    } else {
+      this.parentCard = null;
    }
    this.currentCard.setParentId(cardId);
  },
@@ -670,23 +673,14 @@ BlazeComponent.extendComponent({
      'change .js-field-parent-board'(evt) {
        const selection = $(evt.currentTarget).val();
        const list = $('.js-field-parent-card');
-        list.empty();
        if (selection === 'none') {
-          this.parentBoard = null;
-          list.prop('disabled', true);
+          this.parentBoard.set(null);
        } else {
-          this.parentBoard = Boards.findOne(selection);
-          this.parentBoard.cards().forEach(function(card) {
-            list.append(
-              $('<option></option>').val(card._id).html(card.title)
-            );
-          });
+          subManager.subscribe('board', $(evt.currentTarget).val(), false);
+          this.parentBoard.set(selection);
          list.prop('disabled', false);
        }
-        list.append(
-          `<option value='none' selected='selected'>${TAPi18n.__('custom-field-dropdown-none')}</option>`
-        );
-        this.setParentCardId('null');
+        this.setParentCardId(null);
      },
      'change .js-field-parent-card'(evt) {
        const selection = $(evt.currentTarget).val();
@@ -133,10 +133,92 @@ input[type="submit"].attachment-add-link-submit

    .card-details-canvas
      width: 100%
-
+      padding-left: 0px;
+ 
    .card-details-header
      .close-card-details
        margin-right: 0px

      .card-details-menu
        margin-right: 10px
+
+card-details-color(background, color...)
+  background: background !important
+  if color
+    color: color !important //overwrite text for better visibility
+
+.card-details-white
+  card-details-color(unset, #000) //Black text for better visibility
+  border: 1px solid #eee
+
+.card-details-green
+  card-details-color(#3cb500, #ffffff) //White text for better visibility
+
+.card-details-yellow
+  card-details-color(#fad900, #000) //Black text for better visibility
+
+.card-details-orange
+  card-details-color(#ff9f19, #000) //Black text for better visibility
+
+.card-details-red
+  card-details-color(#eb4646, #ffffff) //White text for better visibility
+
+.card-details-purple
+  card-details-color(#a632db, #ffffff) //White text for better visibility
+
+.card-details-blue
+  card-details-color(#0079bf, #ffffff) //White text for better visibility
+
+.card-details-pink
+  card-details-color(#ff78cb, #000) //Black text for better visibility
+
+.card-details-sky
+  card-details-color(#00c2e0, #ffffff) //White text for better visibility
+
+.card-details-black
+  card-details-color(#4d4d4d, #ffffff) //White text for better visibility
+
+.card-details-lime
+  card-details-color(#51e898, #000) //Black text for better visibility
+
+.card-details-silver
+  card-details-color(#c0c0c0, #000) //Black text for better visibility
+
+.card-details-peachpuff
+  card-details-color(#ffdab9, #000) //Black text for better visibility
+
+.card-details-crimson
+  card-details-color(#dc143c, #ffffff) //White text for better visibility
+
+.card-details-plum
+  card-details-color(#dda0dd, #000) //Black text for better visibility
+
+.card-details-darkgreen
+  card-details-color(#006400, #ffffff) //White text for better visibility
+
+.card-details-slateblue
+  card-details-color(#6a5acd, #ffffff) //White text for better visibility
+
+.card-details-magenta
+  card-details-color(#ff00ff, #ffffff) //White text for better visibility
+
+.card-details-gold
+  card-details-color(#ffd700, #000) //Black text for better visibility
+
+.card-details-navy
+  card-details-color(#000080, #ffffff) //White text for better visibility
+
+.card-details-gray
+  card-details-color(#808080, #ffffff) //White text for better visibility
+
+.card-details-saddlebrown
+  card-details-color(#8b4513, #ffffff) //White text for better visibility
+
+.card-details-paleturquoise
+  card-details-color(#afeeee, #000) //Black text for better visibility
+
+.card-details-mistyrose
+  card-details-color(#ffe4e1, #000) //Black text for better visibility
+
+.card-details-indigo
+  card-details-color(#4b0082, #ffffff) //White text for better visibility
@@ -56,7 +56,7 @@ template(name="addChecklistItemForm")
    a.fa.fa-times-thin.js-close-inlined-form

 template(name="editChecklistItemForm")
-  textarea.js-edit-checklist-item(rows='1' autofocus)
+  textarea.js-edit-checklist-item(rows='1' autofocus dir="auto")
    if $eq type 'item'
      = item.title
    else
@@ -31,7 +31,8 @@ template(name="cardLabelsPopup")
        a.card-label-edit-button.fa.fa-pencil.js-edit-label
        span.card-label.card-label-selectable.js-select-label(class="card-label-{{color}}"
          class="{{# if isLabelSelected ../_id }}active{{/if}}")
-            = name
+            +viewer
+              = name
            if(isLabelSelected ../_id)
              i.card-label-selectable-icon.fa.fa-check
  if currentUser.isBoardAdmin
@@ -1,7 +1,8 @@
 template(name="minicard")
  .minicard(
    class="{{#if isLinkedCard}}linked-card{{/if}}"
-    class="{{#if isLinkedBoard}}linked-board{{/if}}")
+    class="{{#if isLinkedBoard}}linked-board{{/if}}"
+    class="minicard-{{colorClass}}")
    if cover
      .minicard-cover(style="background-image: url('{{cover.url}}');")
    if labels
@@ -57,7 +58,8 @@ template(name="minicard")
          .minicard-custom-field
            if definition.showLabelOnMiniCard
              .minicard-custom-field-item
-                = definition.name
+                +viewer
+                  = definition.name
            .minicard-custom-field-item
              +viewer
                = trueValue
@@ -202,3 +202,86 @@
      border-top-right-radius: 0
      z-index: 15
      box-shadow: 0 1px 2px rgba(0,0,0,.15)
+
+minicard-color(background, color...)
+  background-color: background
+  if color
+    color: color //overwrite text for better visibility
+  &:hover:not(.minicard-composer),
+  .is-selected &,
+  .draggable-hover-card &
+    background: darken(background, 3%)
+  .draggable-hover-card &
+    background: darken(background, 7%)
+
+.minicard-green
+  minicard-color(#3cb500, #ffffff) //White text for better visibility
+
+.minicard-yellow
+  minicard-color(#fad900)
+
+.minicard-orange
+  minicard-color(#ff9f19)
+
+.minicard-red
+  minicard-color(#eb4646, #ffffff) //White text for better visibility
+
+.minicard-purple
+  minicard-color(#a632db, #ffffff) //White text for better visibility
+
+.minicard-blue
+  minicard-color(#0079bf, #ffffff) //White text for better visibility
+
+.minicard-pink
+  minicard-color(#ff78cb)
+
+.minicard-sky
+  minicard-color(#00c2e0, #ffffff) //White text for better visibility
+
+.minicard-black
+  minicard-color(#4d4d4d, #ffffff) //White text for better visibility
+
+.minicard-lime
+  minicard-color(#51e898)
+
+.minicard-silver
+  minicard-color(#c0c0c0)
+
+.minicard-peachpuff
+  minicard-color(#ffdab9)
+
+.minicard-crimson
+  minicard-color(#dc143c, #ffffff) //White text for better visibility
+
+.minicard-plum
+  minicard-color(#dda0dd)
+
+.minicard-darkgreen
+  minicard-color(#006400, #ffffff) //White text for better visibility
+
+.minicard-slateblue
+  minicard-color(#6a5acd, #ffffff) //White text for better visibility
+
+.minicard-magenta
+  minicard-color(#ff00ff, #ffffff) //White text for better visibility
+
+.minicard-gold
+  minicard-color(#ffd700)
+
+.minicard-navy
+  minicard-color(#000080, #ffffff) //White text for better visibility
+
+.minicard-gray
+  minicard-color(#808080, #ffffff) //White text for better visibility
+
+.minicard-saddlebrown
+  minicard-color(#8b4513, #ffffff) //White text for better visibility
+
+.minicard-paleturquoise
+  minicard-color(#afeeee)
+
+.minicard-mistyrose
+  minicard-color(#ffe4e1)
+
+.minicard-indigo
+  minicard-color(#4b0082, #ffffff) //White text for better visibility
@@ -50,13 +50,13 @@ template(name="subtaskDeleteDialog")
      button.toggle-delete-subtask-dialog(type="button") {{_ 'cancel'}}

 template(name="addSubtaskItemForm")
-  textarea.js-add-subtask-item(rows='1' autofocus)
+  textarea.js-add-subtask-item(rows='1' autofocus dir="auto")
  .edit-controls.clearfix
    button.primary.confirm.js-submit-add-subtask-item-form(type="submit") {{_ 'save'}}
    a.fa.fa-times-thin.js-close-inlined-form

 template(name="editSubtaskItemForm")
-  textarea.js-edit-subtask-item(rows='1' autofocus)
+  textarea.js-edit-subtask-item(rows='1' autofocus dir="auto")
    if $eq type 'item'
      = item.title
    else
@@ -76,7 +76,7 @@ template(name="subtasksItems")
      else
        +subtaskItemDetail(item = item subtasks = subtasks)
    if canModifyCard
-      +inlinedForm(autoclose=false classNames="js-add-subtask-item" subtasks = subtasks)
+      +inlinedForm(autoclose=false classNames="js-add-subtask-item" subtasks = subtasks dir="auto")
        +addSubtaskItemForm
      else
        a.add-subtask-item.js-open-inlined-form
@@ -67,7 +67,13 @@ BlazeComponent.extendComponent({
        const nCards = MultiSelection.isActive() ? MultiSelection.count() : 1;
        const sortIndex = calculateIndex(prevCardDom, nextCardDom, nCards);
        const listId = Blaze.getData(ui.item.parents('.list').get(0))._id;
-        const swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id;
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        let swimlaneId = '';
+        const boardView = (Meteor.user().profile || {}).boardView;
+        if (boardView === 'board-view-swimlanes' || currentBoard.isTemplatesBoard())
+          swimlaneId = Blaze.getData(ui.item.parents('.swimlane').get(0))._id;
+        else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView)
+          swimlaneId = currentBoard.getDefaultSwimline()._id;

        // Normally the jquery-ui sortable library moves the dragged DOM element
        // to its new position, which disrupts Blaze reactive updates mechanism
@@ -80,12 +86,12 @@ BlazeComponent.extendComponent({

        if (MultiSelection.isActive()) {
          Cards.find(MultiSelection.getMongoSelector()).forEach((card, i) => {
-            card.move(swimlaneId, listId, sortIndex.base + i * sortIndex.increment);
+            card.move(currentBoard._id, swimlaneId, listId, sortIndex.base + i * sortIndex.increment);
          });
        } else {
          const cardDomElement = ui.item.get(0);
          const card = Blaze.getData(cardDomElement);
-          card.move(swimlaneId, listId, sortIndex.base);
+          card.move(currentBoard._id, swimlaneId, listId, sortIndex.base);
        }
        boardComponent.setIsDragging(false);
      },
@@ -10,7 +10,6 @@
  // transparent, because that won't work during a list drag.
  background: darken(white, 13%)
  border-left: 1px solid darken(white, 20%)
-  border-bottom: 1px solid #CCC
  padding: 0
  float: left

@@ -44,12 +43,24 @@
      background: white
      margin: -3px 0 8px

-.list-header
+.list-header-card-count
+  height: 35px
+
+.list-header-add
  flex: 0 0 auto
-  margin: 20px 12px 4px
+  padding: 20px 12px 4px
  position: relative
  min-height: 20px

+.list-header
+  flex: 0 0 auto
+  padding: 20px 12px 4px
+  position: relative
+  min-height: 20px
+  background-color: #e4e4e4;
+  border-bottom: 6px solid #e4e4e4;
+
+
  &.ui-sortable-handle
    cursor: grab

@@ -68,16 +79,18 @@
    text-overflow: ellipsis
    word-wrap: break-word

+
  .list-header-watch-icon
    padding-left: 10px
    color: #a6a6a6

+
  .list-header-menu
    position: absolute
-    padding: 7px
+    padding: 27px 19px
    margin-top: 1px
-    top: -@padding
-    right: -@padding
+    top: -7px
+    right: -7px

  .list-header-plus-icon
    color: #a6a6a6
@@ -86,6 +99,10 @@
  .highlight
    color: #ce1414

+  .cardCount
+    color: #8c8c8c
+    font-size: 0.8em
+
 .list-body
  flex: 1 1 auto
  flex-direction: column
@@ -143,9 +160,12 @@
    float: left

@media screen and (max-width: 800px)
+  .list-header-menu
+    margin-right: 30px
+
  .mini-list
    flex: 0 0 60px
-    height: 60px
+    height: auto
    width: 100%
    border-left: 0px
    border-bottom: 1px solid darken(white, 20%)
@@ -154,6 +174,8 @@
    display: block
    width: 100%
    border-left: 0px
+    &:first-child
+      margin-left: 0px

    &.ui-sortable-helper
      flex: 0 0 60px
@@ -172,8 +194,16 @@
      border-left: 0px
      border-bottom: 1px solid darken(white, 20%)

-  .list-header
+  .list-body
+    padding: 15px 19px;

+  .list-header
+    padding: 0 12px 0px
+    border-bottom: 0px solid #e4e4e4
+    height: 60px
+    margin-top: 10px
+    display: flex
+    align-items: center
    .list-header-left-icon
      display: inline
      padding: 7px
@@ -185,8 +215,10 @@
    .list-header-menu-icon
      position: absolute
      padding: 7px
-      top: -@padding
+      top: 50%
+      transform: translateY(-50%)
      right: 17px
+      font-size: 20px

 .link-board-wrapper
  display: flex
@@ -198,3 +230,85 @@
 .search-card-results
  max-height: 250px
  overflow: hidden
+
+.sk-spinner-list
+  margin-top: unset !important
+
+list-header-color(background, color...)
+  border-bottom: 6px solid background
+
+.list-header-white
+  list-header-color(#ffffff, #4d4d4d) //Black text for better visibility
+  border: 1px solid #eee
+
+.list-header-green
+  list-header-color(#3cb500, #ffffff) //White text for better visibility
+
+.list-header-yellow
+  list-header-color(#fad900, #4d4d4d) //Black text for better visibility
+
+.list-header-orange
+  list-header-color(#ff9f19, #4d4d4d) //Black text for better visibility
+
+.list-header-red
+  list-header-color(#eb4646, #ffffff) //White text for better visibility
+
+.list-header-purple
+  list-header-color(#a632db, #ffffff) //White text for better visibility
+
+.list-header-blue
+  list-header-color(#0079bf, #ffffff) //White text for better visibility
+
+.list-header-pink
+  list-header-color(#ff78cb, #4d4d4d) //Black text for better visibility
+
+.list-header-sky
+  list-header-color(#00c2e0, #ffffff) //White text for better visibility
+
+.list-header-black
+  list-header-color(#4d4d4d, #ffffff) //White text for better visibility
+
+.list-header-lime
+  list-header-color(#51e898, #4d4d4d) //Black text for better visibility
+
+.list-header-silver
+  list-header-color(unset, #4d4d4d) //Black text for better visibility
+
+.list-header-peachpuff
+  list-header-color(#ffdab9, #4d4d4d) //Black text for better visibility
+
+.list-header-crimson
+  list-header-color(#dc143c, #ffffff) //White text for better visibility
+
+.list-header-plum
+  list-header-color(#dda0dd, #4d4d4d) //Black text for better visibility
+
+.list-header-darkgreen
+  list-header-color(#006400, #ffffff) //White text for better visibility
+
+.list-header-slateblue
+  list-header-color(#6a5acd, #ffffff) //White text for better visibility
+
+.list-header-magenta
+  list-header-color(#ff00ff, #ffffff) //White text for better visibility
+
+.list-header-gold
+  list-header-color(#ffd700, #4d4d4d) //Black text for better visibility
+
+.list-header-navy
+  list-header-color(#000080, #ffffff) //White text for better visibility
+
+.list-header-gray
+  list-header-color(#808080, #ffffff) //White text for better visibility
+
+.list-header-saddlebrown
+  list-header-color(#8b4513, #ffffff) //White text for better visibility
+
+.list-header-paleturquoise
+  list-header-color(#afeeee, #4d4d4d) //Black text for better visibility
+
+.list-header-mistyrose
+  list-header-color(#ffe4e1, #4d4d4d) //Black text for better visibility
+
+.list-header-indigo
+  list-header-color(#4b0082, #ffffff) //White text for better visibility
@@ -4,7 +4,7 @@ template(name="listBody")
      if cards.count
        +inlinedForm(autoclose=false position="top")
          +addCardForm(listId=_id position="top")
-      each (cards (idOrNull ../../_id))
+      each (cardsWithLimit (idOrNull ../../_id))
        a.minicard-wrapper.js-minicard(href=absoluteUrl
          class="{{#if cardIsSelected}}is-selected{{/if}}"
          class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
@@ -12,6 +12,9 @@ template(name="listBody")
            .materialCheckBox.multi-selection-checkbox.js-toggle-multi-selection(
              class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}")
          +minicard(this)
+      if (showSpinner (idOrNull ../../_id))
+        +spinnerList
+
      if canSeeAddCard
        +inlinedForm(autoclose=false position="bottom")
          +addCardForm(listId=_id position="bottom")
@@ -20,13 +23,23 @@ template(name="listBody")
            i.fa.fa-plus
            | {{_ 'add-card'}}

+template(name="spinnerList")
+  .sk-spinner.sk-spinner-wave.sk-spinner-list(
+    class=currentBoard.colorClass
+    id="showMoreResults")
+    .sk-rect1
+    .sk-rect2
+    .sk-rect3
+    .sk-rect4
+    .sk-rect5
+
 template(name="addCardForm")
  .minicard.minicard-composer.js-composer
    if getLabels
      .minicard-labels
        each getLabels
          .minicard-label(class="card-label-{{color}}" title="{{name}}")
-    textarea.minicard-composer-textarea.js-card-title(autofocus)
+    textarea.minicard-composer-textarea.js-card-title(autofocus dir="auto")
    if members.get
      .minicard-members.js-minicard-composer-members
        each members.get
@@ -34,14 +47,19 @@ template(name="addCardForm")

  .add-controls.clearfix
    button.primary.confirm(type="submit") {{_ 'add'}}
-    unless isSandstorm
-      span.quiet
-        | {{_ 'or'}}
-        a.js-link {{_ 'link'}}
-      span.quiet
-        | &nbsp;
-        | /
-        a.js-search {{_ 'search'}}
+    unless currentBoard.isTemplatesBoard
+      unless currentBoard.isTemplateBoard
+        span.quiet
+          | {{_ 'or'}}
+          a.js-link {{_ 'link'}}
+        span.quiet
+          | &nbsp;
+          | /
+          a.js-search {{_ 'search'}}
+        span.quiet
+          | &nbsp;
+          | /
+          a.js-card-template {{_ 'template'}}

 template(name="autocompleteLabelLine")
  .minicard-label(class="card-label-{{colorName}}" title=labelName)
@@ -51,11 +69,9 @@ template(name="linkCardPopup")
  label {{_ 'boards'}}:
  .link-board-wrapper
    select.js-select-boards
+      option(value="")
      each boards
-        if $eq _id currentBoard._id
-          option(value="{{_id}}" selected) {{_ 'current'}}
-        else
-          option(value="{{_id}}") {{title}}
+        option(value="{{_id}}") {{title}}
    input.primary.confirm.js-link-board(type="button" value="{{_ 'link'}}")

  label {{_ 'swimlanes'}}:
@@ -74,22 +90,41 @@ template(name="linkCardPopup")
      option(value="{{getId}}") {{getTitle}}

  .edit-controls.clearfix
-    unless isSandstorm
-      input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")
+    input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")

-template(name="searchCardPopup")
-  label {{_ 'boards'}}:
-  .link-board-wrapper
-    select.js-select-boards
-      each boards
-        if $eq _id currentBoard._id
-          option(value="{{_id}}" selected) {{_ 'current'}}
-        else
+template(name="searchElementPopup")
+  form
+    label
+      | {{_ 'title'}}
+      input.js-element-title(type="text" placeholder="{{_ 'title'}}" autofocus required dir="auto")
+  unless isTemplateSearch
+    label {{_ 'boards'}}:
+    .link-board-wrapper
+      select.js-select-boards
+        option(value="")
+        each boards
          option(value="{{_id}}") {{title}}
  form.js-search-term-form
-    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus)
+    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
  .list-body.js-perfect-scrollbar.search-card-results
    .minicards.clearfix.js-minicards
-      each results
-        a.minicard-wrapper.js-minicard
-          +minicard(this)
+      if isBoardTemplateSearch
+        each results
+          a.minicard-wrapper.js-minicard
+            +miniboard(this)
+      if isListTemplateSearch
+        each results
+          a.minicard-wrapper.js-minicard
+            +minilist(this)
+      if isSwimlaneTemplateSearch
+        each results
+          a.minicard-wrapper.js-minicard
+            +miniswimlane(this)
+      if isCardTemplateSearch
+        each results
+          a.minicard-wrapper.js-minicard
+            +minicard(this)
+      unless isTemplateSearch
+        each results
+          a.minicard-wrapper.js-minicard
+            +minicard(this)
@@ -1,6 +1,12 @@
 const subManager = new SubsManager();
+const InfiniteScrollIter = 10;

 BlazeComponent.extendComponent({
+  onCreated() {
+    // for infinite scrolling
+    this.cardlimit = new ReactiveVar(InfiniteScrollIter);
+  },
+
  mixins() {
    return [Mixins.PerfectScrollbar];
  },
@@ -39,27 +45,56 @@ BlazeComponent.extendComponent({
    const labelIds = formComponent.labels.get();
    const customFields = formComponent.customFields.get();

-    const boardId = this.data().board();
+    const board = this.data().board();
+    let linkedId = '';
    let swimlaneId = '';
-    const boardView = Meteor.user().profile.boardView;
-    if (boardView === 'board-view-swimlanes')
-      swimlaneId = this.parentComponent().parentComponent().data()._id;
-    else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal'))
-      swimlaneId = boardId.getDefaultSwimline()._id;
-
+    const boardView = (Meteor.user().profile || {}).boardView;
+    let cardType = 'cardType-card';
    if (title) {
+      if (board.isTemplatesBoard()) {
+        swimlaneId = this.parentComponent().parentComponent().data()._id; // Always swimlanes view
+        const swimlane = Swimlanes.findOne(swimlaneId);
+        // If this is the card templates swimlane, insert a card template
+        if (swimlane.isCardTemplatesSwimlane())
+          cardType = 'template-card';
+        // If this is the board templates swimlane, insert a board template and a linked card
+        else if (swimlane.isBoardTemplatesSwimlane()) {
+          linkedId = Boards.insert({
+            title,
+            permission: 'private',
+            type: 'template-board',
+          });
+          Swimlanes.insert({
+            title: TAPi18n.__('default'),
+            boardId: linkedId,
+          });
+          cardType = 'cardType-linkedBoard';
+        }
+      } else if (boardView === 'board-view-swimlanes')
+        swimlaneId = this.parentComponent().parentComponent().data()._id;
+      else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView)
+        swimlaneId = board.getDefaultSwimline()._id;
+
      const _id = Cards.insert({
        title,
        members,
        labelIds,
        customFields,
        listId: this.data()._id,
-        boardId: boardId._id,
+        boardId: board._id,
        sort: sortIndex,
        swimlaneId,
-        type: 'cardType-card',
+        type: cardType,
+        linkedId,
      });

+      // if the displayed card count is less than the total cards in the list,
+      // we need to increment the displayed card count to prevent the spinner
+      // to appear
+      const cardCount = this.data().cards(this.idOrNull(swimlaneId)).count();
+      if (this.cardlimit.get() < cardCount) {
+        this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
+      }

      // In case the filter is active we need to add the newly inserted card in
      // the list of exceptions -- cards that are not filtered. Otherwise the
@@ -92,9 +127,9 @@ BlazeComponent.extendComponent({
      const methodName = evt.shiftKey ? 'toggleRange' : 'toggle';
      MultiSelection[methodName](this.currentData()._id);

-    // If the card is already selected, we want to de-select it.
-    // XXX We should probably modify the minicard href attribute instead of
-    // overwriting the event in case the card is already selected.
+      // If the card is already selected, we want to de-select it.
+      // XXX We should probably modify the minicard href attribute instead of
+      // overwriting the event in case the card is already selected.
    } else if (Session.equals('currentCard', this.currentData()._id)) {
      evt.stopImmediatePropagation();
      evt.preventDefault();
@@ -114,11 +149,31 @@ BlazeComponent.extendComponent({

  idOrNull(swimlaneId) {
    const currentUser = Meteor.user();
-    if (currentUser.profile.boardView === 'board-view-swimlanes')
+    if ((currentUser.profile || {}).boardView === 'board-view-swimlanes' ||
+        this.data().board().isTemplatesBoard())
      return swimlaneId;
    return undefined;
  },

+  cardsWithLimit(swimlaneId) {
+    const limit = this.cardlimit.get();
+    const selector = {
+      listId: this.currentData()._id,
+      archived: false,
+    };
+    if (swimlaneId)
+      selector.swimlaneId = swimlaneId;
+    return Cards.find(Filter.mongoSelector(selector), {
+      sort: ['sort'],
+      limit,
+    });
+  },
+
+  showSpinner(swimlaneId) {
+    const list = Template.currentData();
+    return list.cards(swimlaneId).count() > this.cardlimit.get();
+  },
+
  canSeeAddCard() {
    return !this.reachedWipLimit() && Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
  },
@@ -179,7 +234,7 @@ BlazeComponent.extendComponent({

  pressKey(evt) {
    // Pressing Enter should submit the card
-    if (evt.keyCode === 13) {
+    if (evt.keyCode === 13 && !evt.shiftKey) {
      evt.preventDefault();
      const $form = $(evt.currentTarget).closest('form');
      // XXX For some reason $form.submit() does not work (it's probably a bug
@@ -188,8 +243,8 @@ BlazeComponent.extendComponent({
      // work.
      $form.find('button[type=submit]').click();

-    // Pressing Tab should open the form of the next column, and Maj+Tab go
-    // in the reverse order
+      // Pressing Tab should open the form of the next column, and Maj+Tab go
+      // in the reverse order
    } else if (evt.keyCode === 9) {
      evt.preventDefault();
      const isReverse = evt.shiftKey;
@@ -211,7 +266,8 @@ BlazeComponent.extendComponent({
    return [{
      keydown: this.pressKey,
      'click .js-link': Popup.open('linkCard'),
-      'click .js-search': Popup.open('searchCard'),
+      'click .js-search': Popup.open('searchElement'),
+      'click .js-card-template': Popup.open('searchElement'),
    }];
  },

@@ -249,7 +305,7 @@ BlazeComponent.extendComponent({
          const currentBoard = Boards.findOne(Session.get('currentBoard'));
          callback($.map(currentBoard.labels, (label) => {
            if (label.name.indexOf(term) > -1 ||
-                label.color.indexOf(term) > -1) {
+              label.color.indexOf(term) > -1) {
              return label;
            }
            return null;
@@ -286,23 +342,13 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  onCreated() {
-    // Prefetch first non-current board id
-    const boardId = Boards.findOne({
-      archived: false,
-      'members.userId': Meteor.userId(),
-      _id: {$ne: Session.get('currentBoard')},
-    }, {
-      sort: ['title'],
-    })._id;
-    // Subscribe to this board
-    subManager.subscribe('board', boardId);
-    this.selectedBoardId = new ReactiveVar(boardId);
+    this.selectedBoardId = new ReactiveVar('');
    this.selectedSwimlaneId = new ReactiveVar('');
    this.selectedListId = new ReactiveVar('');

    this.boardId = Session.get('currentBoard');
    // In order to get current board info
-    subManager.subscribe('board', this.boardId);
+    subManager.subscribe('board', this.boardId, false);
    this.board = Boards.findOne(this.boardId);
    // List where to insert card
    const list = $(Popup._getTopStack().openerElement).closest('.js-list');
@@ -310,10 +356,10 @@ BlazeComponent.extendComponent({
    // Swimlane where to insert card
    const swimlane = $(Popup._getTopStack().openerElement).closest('.js-swimlane');
    this.swimlaneId = '';
-    const boardView = Meteor.user().profile.boardView;
+    const boardView = (Meteor.user().profile || {}).boardView;
    if (boardView === 'board-view-swimlanes')
      this.swimlaneId = Blaze.getData(swimlane[0])._id;
-    else if (boardView === 'board-view-lists')
+    else if (boardView === 'board-view-lists' || !boardView)
      this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
  },

@@ -322,6 +368,7 @@ BlazeComponent.extendComponent({
      archived: false,
      'members.userId': Meteor.userId(),
      _id: {$ne: Session.get('currentBoard')},
+      type: 'board',
    }, {
      sort: ['title'],
    });
@@ -329,7 +376,7 @@ BlazeComponent.extendComponent({
  },

  swimlanes() {
-    if (!this.selectedBoardId) {
+    if (!this.selectedBoardId.get()) {
      return [];
    }
    const swimlanes = Swimlanes.find({boardId: this.selectedBoardId.get()});
@@ -339,7 +386,7 @@ BlazeComponent.extendComponent({
  },

  lists() {
-    if (!this.selectedBoardId) {
+    if (!this.selectedBoardId.get()) {
      return [];
    }
    const lists = Lists.find({boardId: this.selectedBoardId.get()});
@@ -360,13 +407,14 @@ BlazeComponent.extendComponent({
      archived: false,
      linkedId: {$nin: ownCardsIds},
      _id: {$nin: ownCardsIds},
+      type: {$nin: ['template-card']},
    });
  },

  events() {
    return [{
      'change .js-select-boards'(evt) {
-        subManager.subscribe('board', $(evt.currentTarget).val());
+        subManager.subscribe('board', $(evt.currentTarget).val(), false);
        this.selectedBoardId.set($(evt.currentTarget).val());
      },
      'change .js-select-swimlanes'(evt) {
@@ -427,35 +475,49 @@ BlazeComponent.extendComponent({
  },

  onCreated() {
-    // Prefetch first non-current board id
-    let board = Boards.findOne({
-      archived: false,
-      'members.userId': Meteor.userId(),
-      _id: {$ne: Session.get('currentBoard')},
-    });
+    this.isCardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-card-template');
+    this.isListTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-list-template');
+    this.isSwimlaneTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-open-add-swimlane-menu');
+    this.isBoardTemplateSearch = $(Popup._getTopStack().openerElement).hasClass('js-add-board');
+    this.isTemplateSearch = this.isCardTemplateSearch ||
+      this.isListTemplateSearch ||
+      this.isSwimlaneTemplateSearch ||
+      this.isBoardTemplateSearch;
+    let board = {};
+    if (this.isTemplateSearch) {
+      board = Boards.findOne((Meteor.user().profile || {}).templatesBoardId);
+    } else {
+      // Prefetch first non-current board id
+      board = Boards.findOne({
+        archived: false,
+        'members.userId': Meteor.userId(),
+        _id: {$nin: [Session.get('currentBoard'), (Meteor.user().profile || {}).templatesBoardId]},
+      });
+    }
    if (!board) {
      Popup.close();
      return;
    }
    const boardId = board._id;
    // Subscribe to this board
-    subManager.subscribe('board', boardId);
+    subManager.subscribe('board', boardId, false);
    this.selectedBoardId = new ReactiveVar(boardId);

-    this.boardId = Session.get('currentBoard');
-    // In order to get current board info
-    subManager.subscribe('board', this.boardId);
-    board = Boards.findOne(this.boardId);
-    // List where to insert card
-    const list = $(Popup._getTopStack().openerElement).closest('.js-list');
-    this.listId = Blaze.getData(list[0])._id;
-    // Swimlane where to insert card
-    const swimlane = $(Popup._getTopStack().openerElement).closest('.js-swimlane');
-    this.swimlaneId = '';
-    if (board.view === 'board-view-swimlanes')
-      this.swimlaneId = Blaze.getData(swimlane[0])._id;
-    else
-      this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
+    if (!this.isBoardTemplateSearch) {
+      this.boardId = Session.get('currentBoard');
+      // In order to get current board info
+      subManager.subscribe('board', this.boardId, false);
+      this.swimlaneId = '';
+      // Swimlane where to insert card
+      const swimlane = $(Popup._getTopStack().openerElement).parents('.js-swimlane');
+      if ((Meteor.user().profile || {}).boardView === 'board-view-swimlanes')
+        this.swimlaneId = Blaze.getData(swimlane[0])._id;
+      else
+        this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
+      // List where to insert card
+      const list = $(Popup._getTopStack().openerElement).closest('.js-list');
+      this.listId = Blaze.getData(list[0])._id;
+    }
    this.term = new ReactiveVar('');
  },

@@ -464,6 +526,7 @@ BlazeComponent.extendComponent({
      archived: false,
      'members.userId': Meteor.userId(),
      _id: {$ne: Session.get('currentBoard')},
+      type: 'board',
    }, {
      sort: ['title'],
    });
@@ -475,13 +538,27 @@ BlazeComponent.extendComponent({
      return [];
    }
    const board = Boards.findOne(this.selectedBoardId.get());
-    return board.searchCards(this.term.get(), false);
+    if (!this.isTemplateSearch || this.isCardTemplateSearch) {
+      return board.searchCards(this.term.get(), false);
+    } else if (this.isListTemplateSearch) {
+      return board.searchLists(this.term.get());
+    } else if (this.isSwimlaneTemplateSearch) {
+      return board.searchSwimlanes(this.term.get());
+    } else if (this.isBoardTemplateSearch) {
+      const boards = board.searchBoards(this.term.get());
+      boards.forEach((board) => {
+        subManager.subscribe('board', board.linkedId, false);
+      });
+      return boards;
+    } else {
+      return [];
+    }
  },

  events() {
    return [{
      'change .js-select-boards'(evt) {
-        subManager.subscribe('board', $(evt.currentTarget).val());
+        subManager.subscribe('board', $(evt.currentTarget).val(), false);
        this.selectedBoardId.set($(evt.currentTarget).val());
      },
      'submit .js-search-term-form'(evt) {
@@ -489,20 +566,99 @@ BlazeComponent.extendComponent({
        this.term.set(evt.target.searchTerm.value);
      },
      'click .js-minicard'(evt) {
-        // LINK CARD
-        const card = Blaze.getData(evt.currentTarget);
-        const _id = Cards.insert({
-          title: card.title, //dummy
-          listId: this.listId,
-          swimlaneId: this.swimlaneId,
-          boardId: this.boardId,
-          sort: Lists.findOne(this.listId).cards().count(),
-          type: 'cardType-linkedCard',
-          linkedId: card.linkedId || card._id,
-        });
-        Filter.addException(_id);
+        // 0. Common
+        const title = $('.js-element-title').val().trim();
+        if (!title)
+          return;
+        const element = Blaze.getData(evt.currentTarget);
+        element.title = title;
+        let _id = '';
+        if (!this.isTemplateSearch || this.isCardTemplateSearch) {
+          // Card insertion
+          // 1. Common
+          element.sort = Lists.findOne(this.listId).cards().count();
+          // 1.A From template
+          if (this.isTemplateSearch) {
+            element.type = 'cardType-card';
+            element.linkedId = '';
+            _id = element.copy(this.boardId, this.swimlaneId, this.listId);
+            // 1.B Linked card
+          } else {
+            delete element._id;
+            element.type = 'cardType-linkedCard';
+            element.linkedId = element.linkedId || element._id;
+            _id = Cards.insert(element);
+          }
+          Filter.addException(_id);
+          // List insertion
+        } else if (this.isListTemplateSearch) {
+          element.sort = Swimlanes.findOne(this.swimlaneId).lists().count();
+          element.type = 'list';
+          _id = element.copy(this.boardId, this.swimlaneId);
+        } else if (this.isSwimlaneTemplateSearch) {
+          element.sort = Boards.findOne(this.boardId).swimlanes().count();
+          element.type = 'swimlalne';
+          _id = element.copy(this.boardId);
+        } else if (this.isBoardTemplateSearch) {
+          board = Boards.findOne(element.linkedId);
+          board.sort = Boards.find({archived: false}).count();
+          board.type = 'board';
+          board.title = element.title;
+          delete board.slug;
+          _id = board.copy();
+        }
        Popup.close();
      },
    }];
  },
-}).register('searchCardPopup');
+}).register('searchElementPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.cardlimit = this.parentComponent().cardlimit;
+
+    this.listId = this.parentComponent().data()._id;
+    this.swimlaneId = '';
+
+    const boardView = (Meteor.user().profile || {}).boardView;
+    if (boardView === 'board-view-swimlanes')
+      this.swimlaneId = this.parentComponent().parentComponent().parentComponent().data()._id;
+  },
+
+  onRendered() {
+    this.spinner = this.find('.sk-spinner-list');
+    this.container = this.$(this.spinner).parents('.js-perfect-scrollbar')[0];
+
+    $(this.container).on(`scroll.spinner_${this.swimlaneId}_${this.listId}`, () => this.updateList());
+    $(window).on(`resize.spinner_${this.swimlaneId}_${this.listId}`, () => this.updateList());
+
+    this.updateList();
+  },
+
+  onDestroyed() {
+    $(this.container).off(`scroll.spinner_${this.swimlaneId}_${this.listId}`);
+    $(window).off(`resize.spinner_${this.swimlaneId}_${this.listId}`);
+  },
+
+  updateList() {
+    if (this.spinnerInView()) {
+      this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
+      window.requestIdleCallback(() => this.updateList());
+    }
+  },
+
+  spinnerInView() {
+    const parentViewHeight = this.container.clientHeight;
+    const bottomViewPosition = this.container.scrollTop + parentViewHeight;
+
+    const threshold = this.spinner.offsetTop;
+
+    // spinner deleted
+    if (!this.spinner.offsetTop) {
+      return false;
+    }
+
+    return bottomViewPosition > threshold;
+  },
+
+}).register('spinnerList');
@@ -1,5 +1,7 @@
 template(name="listHeader")
-  .list-header.js-list-header
+  .list-header.js-list-header(
+    class="{{#if limitToShowCardsCount}}list-header-card-count{{/if}}"
+    class="{{#if colorClass}}list-header-{{colorClass}}{{/if}}")
    +inlinedForm
      +editListTitleForm
    else
@@ -8,7 +10,8 @@ template(name="listHeader")
          a.list-header-left-icon.fa.fa-angle-left.js-unselect-list
      h2.list-header-name(
        class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
-        = title
+        +viewer
+          = title
        if wipLimit.enabled
         |&nbsp;(
         span(class="{{#if reachedWipLimit}}highlight{{/if}}") {{cards.count}}
@@ -16,7 +19,7 @@ template(name="listHeader")

        if showCardsCountForList cards.count
          |&nbsp;
-          p.quiet.small {{cardsCount}} {{_ 'cards-count'}}
+          span(class="cardCount") {{cardsCount}} {{_ 'cards-count'}}
      if isMiniScreen
        if currentList
          if isWatching
@@ -49,6 +52,9 @@ template(name="listActionPopup")
    li: a.js-toggle-watch-list {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}}
  unless currentUser.isCommentOnly
    hr
+    ul.pop-over-list
+      li: a.js-set-color-list {{_ 'set-color-list'}}
+    hr
    ul.pop-over-list
      if cards.count
        li: a.js-select-cards {{_ 'list-select-cards'}}
@@ -111,3 +117,13 @@ template(name="wipLimitErrorPopup")
    p {{_ 'wipLimitErrorPopup-dialog-pt1'}}
    p {{_ 'wipLimitErrorPopup-dialog-pt2'}}
    button.full.js-back-view(type="submit") {{_ 'cancel'}}
+
+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}}")
+        if(isSelected color)
+          i.fa.fa-check
+    button.primary.confirm.js-submit {{_ 'save'}}
+    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}
@@ -1,3 +1,8 @@
+let listsColors;
+Meteor.startup(() => {
+  listsColors = Lists.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
  canSeeAddCard() {
    const list = Template.currentData();
@@ -25,7 +30,7 @@ BlazeComponent.extendComponent({
  cardsCount() {
    const list = Template.currentData();
    let swimlaneId = '';
-    const boardView = Meteor.user().profile.boardView;
+    const boardView = (Meteor.user().profile || {}).boardView;
    if (boardView === 'board-view-swimlanes')
      swimlaneId = this.parentComponent().parentComponent().data()._id;

@@ -72,6 +77,7 @@ Template.listActionPopup.helpers({

 Template.listActionPopup.events({
  'click .js-list-subscribe' () {},
+  'click .js-set-color-list': Popup.open('setListColor'),
  'click .js-select-cards' () {
    const cardIds = this.allCards().map((card) => card._id);
    MultiSelection.add(cardIds);
@@ -154,3 +160,34 @@ Template.listMorePopup.events({
    Utils.goBoardId(this.boardId);
  }),
 });
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentList = this.currentData();
+    this.currentColor = new ReactiveVar(this.currentList.color);
+  },
+
+  colors() {
+    return listsColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.currentList.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentList.setColor(null);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setListColorPopup');
@@ -0,0 +1,8 @@
+template(name="minilist")
+  .minicard(
+    class="minicard-{{colorClass}}")
+    .minicard-title
+      .handle
+        .fa.fa-arrows
+      +viewer
+        = title
@@ -1,5 +1,6 @@
 template(name="editor")
  textarea.editor(
+    dir="auto"
    class="{{class}}"
    id=id
    autofocus=autofocus
@@ -7,7 +8,7 @@ template(name="editor")
    +Template.contentBlock

 template(name="viewer")
-  .viewer
+  .viewer(dir="auto")
    +mentions
      +markdown
        {{> UI.contentBlock }}
@@ -36,7 +36,10 @@ import sanitizeXss from 'xss';
 const at = HTML.CharRef({html: '&commat;', str: '@'});
 Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
  const view = this;
+  let content = Blaze.toHTML(view.templateContentBlock);
  const currentBoard = Boards.findOne(Session.get('currentBoard'));
+  if (!currentBoard)
+    return HTML.Raw(sanitizeXss(content));
  const knowedUsers = currentBoard.members.map((member) => {
    const u = Users.findOne(member.userId);
    if(u){
@@ -45,7 +48,6 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
    return member;
  });
  const mentionRegex = /\B@([\w.]*)/gi;
-  let content = Blaze.toHTML(view.templateContentBlock);

  let currentMention;
  while ((currentMention = mentionRegex.exec(content)) !== null) {
@@ -4,39 +4,38 @@ template(name="header")
    list all starred boards with a link to go there. This is inspired by the
    Reddit "subreddit" bar.
    The first link goes to the boards page.
-  unless isSandstorm
-    if currentUser
-      #header-quick-access(class=currentBoard.colorClass)
-        if isMiniScreen
-          ul
-            li
-              a(href="{{pathFor 'home'}}")
-                span.fa.fa-home
+  if currentUser
+    #header-quick-access(class=currentBoard.colorClass)
+      if isMiniScreen
+        ul
+          li
+            a(href="{{pathFor 'home'}}")
+              span.fa.fa-home

-            if currentList
-              each currentBoard.lists
-                li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}")
-                  a.js-select-list
-                    = title
-          #header-new-board-icon
-        else
-          ul
-            li
-              a(href="{{pathFor 'home'}}")
-                span.fa.fa-home
-                | {{_ 'all-boards'}}
-            each currentUser.starredBoards
-              li.separator -
-              li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
-                a(href="{{pathFor 'board' id=_id slug=slug}}")
+          if currentList
+            each currentBoard.lists
+              li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}")
+                a.js-select-list
                  = title
-            else
-              li.current {{_ 'quick-access-description'}}
+        #header-new-board-icon
+      else
+        ul
+          li
+            a(href="{{pathFor 'home'}}")
+              span.fa.fa-home
+              | {{_ 'all-boards'}}
+          each currentUser.starredBoards
+            li.separator -
+            li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
+              a(href="{{pathFor 'board' id=_id slug=slug}}")
+                = title
+          else
+            li.current {{_ 'quick-access-description'}}

-        a#header-new-board-icon.js-create-board
-          i.fa.fa-plus(title="Create a new board")
+      a#header-new-board-icon.js-create-board
+        i.fa.fa-plus(title="Create a new board")

-        +headerUserBar
+      +headerUserBar

  #header(class=currentBoard.colorClass)
    //-
@@ -46,19 +45,16 @@ template(name="header")
    #header-main-bar(class="{{#if wrappedHeader}}wrapper{{/if}}")
      +Template.dynamic(template=headerBar)

-      unless hideLogo
+      //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.
-        if isSandstorm
-          .wekan-logo
-            img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
-        else
-          unless currentSetting.hideLogo
-            a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
-              img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
+
+      //  unless currentSetting.hideLogo
+      //    a.wekan-logo(href="{{pathFor 'home'}}" title="{{_ 'header-logo-title'}}")
+      //    img(src="{{pathFor '/logo-header.png'}}" alt="")

  if appIsOffline
    +offlineWarning
@@ -1,39 +1,32 @@
 head
-  title Wekan
-  meta(name="viewport"
-   content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0")
+  title
+  meta(name="viewport" content="maximum-scale=1.0,width=device-width,initial-scale=1.0,user-scalable=0")
  meta(http-equiv="X-UA-Compatible" content="IE=edge")
  //- XXX We should use pathFor in the following `href` to support the case
    where the application is deployed with a path prefix, but it seems to be
    difficult to do that cleanly with Blaze -- at least without adding extra
    packages.
-  link(rel="shortcut icon" href="/public/wekan-favicon.png")
-  link(rel="apple-touch-icon" href="/public/wekan-favicon.png")
-  link(rel="mask-icon" href="/public/wekan-150.svg")
-  link(rel="manifest" href="/public/wekan-manifest.json")
+  link(rel="shortcut icon" href="/wekan-favicon.png")
+  link(rel="apple-touch-icon" href="/wekan-favicon.png")
+  link(rel="mask-icon" href="/wekan-logo-150.svg")
+  link(rel="manifest" href="/wekan-manifest.json")

 template(name="userFormsLayout")
  section.auth-layout
-    unless currentSetting.hideLogo
-      h1.at-form-landing-logo
-        img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
-    if currentSetting.hideLogo
-      h1
-        br
-        br
    section.auth-dialog
-      +Template.dynamic(template=content)
-      +connectionMethod
-      if isCas
-        .at-form
-          button#cas(class='at-btn submit' type='submit') {{casSignInLabel}}
-      div.at-form-lang
-        select.select-lang.js-userform-set-language
-          each languages
-            if isCurrentLanguage
-              option(value="{{tag}}" selected="selected") {{name}}
-            else
-              option(value="{{tag}}") {{name}}
+      if isLoading
+        +loader
+      else
+        +Template.dynamic(template=content)
+        if currentSetting.displayAuthenticationMethod
+          +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
+        div.at-form-lang
+          select.select-lang.js-userform-set-language
+            each languages
+              if isCurrentLanguage
+                option(value="{{tag}}" selected="selected") {{name}}
+              else
+                option(value="{{tag}}") {{name}}

 template(name="defaultLayout")
  +header
@@ -66,3 +59,14 @@ template(name="message")
    unless currentUser
      with(pathFor route='atSignIn')
        p {{{_ 'page-maybe-private' this}}}
+
+template(name="loader")
+  h1.loadingText {{_ 'loading'}}
+  .lds-roller
+    div
+    div
+    div
+    div
+    div
+    div
+    div
@@ -20,13 +20,20 @@ const validator = {
  },
 };

-Template.userFormsLayout.onCreated(() => {
-  Meteor.subscribe('setting');
+Template.userFormsLayout.onCreated(function() {
+  const instance = this;
+  instance.currentSetting = new ReactiveVar();
+  instance.isLoading = new ReactiveVar(false);

+  Meteor.subscribe('setting', {
+    onReady() {
+      instance.currentSetting.set(Settings.findOne());
+      return this.stop();
+    },
+  });
 });

 Template.userFormsLayout.onRendered(() => {
-
  AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator);

  const i18nTag = navigator.language;
@@ -37,11 +44,13 @@ Template.userFormsLayout.onRendered(() => {
 });

 Template.userFormsLayout.helpers({
-
  currentSetting() {
-    return Settings.findOne();
+    return Template.instance().currentSetting.get();
  },

+  isLoading() {
+    return Template.instance().isLoading.get();
+  },

  afterBodyStart() {
    return currentSetting.customHTMLafterBodyStart;
@@ -59,6 +68,8 @@ Template.userFormsLayout.helpers({
        name = 'Brezhoneg';
      } else if (lang.name === 'ig') {
        name = 'Igbo';
+      } else if (lang.name === 'oc') {
+        name = 'Occitan';
      }
      return { tag, name };
    }).sort(function(a, b) {
@@ -75,17 +86,6 @@ Template.userFormsLayout.helpers({
    const curLang = T9n.getLanguage() || 'en';
    return t9nTag === curLang;
  },
-/*
-  isCas() {
-    return Meteor.settings.public &&
-      Meteor.settings.public.cas &&
-      Meteor.settings.public.cas.loginUrl;
-  },
-
-  casSignInLabel() {
-    return TAPi18n.__('casSignIn', {}, T9n.getLanguage() || 'en');
-  },
-*/
 });

 Template.userFormsLayout.events({
@@ -94,49 +94,13 @@ Template.userFormsLayout.events({
    T9n.setLanguage(i18nTagToT9n(i18nTag));
    evt.preventDefault();
  },
-  'click button#cas'() {
-    Meteor.loginWithCas(function() {
-      if (FlowRouter.getRouteName() === 'atSignIn') {
-        FlowRouter.go('/');
-      }
-    });
-  },
-  'click #at-btn'(event) {
-    /* All authentication method can be managed/called here.
-       !! DON'T FORGET to correctly fill the fields of the user during its creation if necessary authenticationMethod : String !!
-    */
-    const authenticationMethodSelected = $('.select-authentication').val();
-    // Local account
-    if (authenticationMethodSelected === 'password') {
-      return;
-    }
-
-    // Stop submit #at-pwd-form
-    event.preventDefault();
-    event.stopImmediatePropagation();
-
-    const email = $('#at-field-username_and_email').val();
-    const password = $('#at-field-password').val();
-
-    // Ldap account
-    if (authenticationMethodSelected === 'ldap') {
-      // Check if the user can use the ldap connection
-      Meteor.subscribe('user-authenticationMethod', email, {
-        onReady() {
-          const user = Users.findOne();
-          if (user === undefined || user.authenticationMethod === 'ldap') {
-            // Use the ldap connection package
-            Meteor.loginWithLDAP(email, password, function(error) {
-              if (!error) {
-                // Connection
-                return FlowRouter.go('/');
-              }
-              return error;
-            });
-          }
-          return this.stop();
-        },
-      });
+  'click #at-btn'(event, instance) {
+    if (FlowRouter.getRouteName() === 'atSignIn') {
+      instance.isLoading.set(true);
+      authentication(event, instance)
+        .then(() => {
+          instance.isLoading.set(false);
+        });
    }
  },
 });
@@ -146,3 +110,64 @@ Template.defaultLayout.events({
    Modal.close();
  },
 });
+
+async function authentication(event, instance) {
+  const match = $('#at-field-username_and_email').val();
+  const password = $('#at-field-password').val();
+
+  if (!match || !password) return undefined;
+
+  const result = await getAuthenticationMethod(instance.currentSetting.get(), match);
+
+  if (result === 'password') return undefined;
+
+  // Stop submit #at-pwd-form
+  event.preventDefault();
+  event.stopImmediatePropagation();
+
+  switch (result) {
+  case 'ldap':
+    return new Promise((resolve) => {
+      Meteor.loginWithLDAP(match, password, function() {
+        resolve(FlowRouter.go('/'));
+      });
+    });
+
+  case 'cas':
+    return new Promise((resolve) => {
+      Meteor.loginWithCas(match, password, function() {
+        resolve(FlowRouter.go('/'));
+      });
+    });
+
+  default:
+    return undefined;
+  }
+}
+
+function getAuthenticationMethod({displayAuthenticationMethod, defaultAuthenticationMethod}, match) {
+  if (displayAuthenticationMethod) {
+    return $('.select-authentication').val();
+  }
+  return getUserAuthenticationMethod(defaultAuthenticationMethod, match);
+}
+
+function getUserAuthenticationMethod(defaultAuthenticationMethod, match) {
+  return new Promise((resolve) => {
+    try {
+      Meteor.subscribe('user-authenticationMethod', match, {
+        onReady() {
+          const user = Users.findOne();
+
+          const authenticationMethod = user
+            ? user.authenticationMethod
+            : defaultAuthenticationMethod;
+
+          resolve(authenticationMethod);
+        },
+      });
+    } catch(error) {
+      resolve(defaultAuthenticationMethod);
+    }
+  });
+}
@@ -61,7 +61,7 @@ body
      display: block
      float: right
      font-size: 24px
-  
+
  .modal-content-wide
    width: 800px
    min-height: 0px
@@ -290,7 +290,7 @@ kbd
 // Implement a thiner close icon as suggested in
 // https://github.com/FortAwesome/Font-Awesome/issues/1540#issuecomment-68689950
 .fa.fa-times-thin:before
-  content: '\00d7';
+  content: '\00d7'

 .fa.fa-globe.colorful, .fa.fa-bell.colorful
  color: #4caf50
@@ -399,3 +399,103 @@ a
  height: 37px
  margin: 8px 10px 0 0
  width: 50px
+
+.select-authentication
+  width: 100%
+
+.auth-layout
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  height: 100%
+
+  .auth-dialog
+    margin: 0 !important
+
+.loadingText
+  text-align: center
+
+.lds-roller
+  display: block
+  margin: auto
+  position: relative
+  width: 64px
+  height: 64px
+
+  div
+    animation: lds-roller 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite
+    transform-origin: 32px 32px
+
+  div:after
+    content: " "
+    display: block
+    position: absolute
+    width: 6px
+    height: 6px
+    border-radius: 50%
+    background: #dedede
+    margin: -3px 0 0 -3px
+
+  div:nth-child(1)
+    animation-delay: -0.036s
+
+  div:nth-child(1):after
+    top: 50px
+    left: 50px
+
+  div:nth-child(2)
+    animation-delay: -0.072s
+
+  div:nth-child(2):after
+    top: 54px
+    left: 45px
+
+  div:nth-child(3)
+    animation-delay: -0.108s
+
+  div:nth-child(3):after
+    top: 57px
+    left: 39px
+
+  div:nth-child(4)
+    animation-delay: -0.144s
+
+  div:nth-child(4):after
+    top: 58px
+    left: 32px
+
+  div:nth-child(5)
+    animation-delay: -0.18s
+
+  div:nth-child(5):after
+    top: 57px
+    left: 25px
+
+  div:nth-child(6)
+    animation-delay: -0.216s
+
+  div:nth-child(6):after
+    top: 54px
+    left: 19px
+
+  div:nth-child(7)
+    animation-delay: -0.252s
+
+  div:nth-child(7):after
+    top: 50px
+    left: 14px
+
+  div:nth-child(8)
+    animation-delay: -0.288s
+
+  div:nth-child(8):after
+    top: 45px
+    left: 10px
+
+@keyframes lds-roller
+  0%
+    transform: rotate(0deg)
+
+  100%
+    transform: rotate(360deg)
@@ -35,9 +35,21 @@ template(name="cardActions")
    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'}}}
+        button.trigger-button.trigger-button-color.js-show-color-palette(
+          id="color-action"
+          class="card-details-{{cardColorButton}}")
+          | {{{_ cardColorButtonText }}}
+    div.trigger-button.js-set-color-action.js-goto-rules
+      i.fa.fa-plus

-   
-  
-
-
-
+template(name="setCardActionsColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      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,6 +1,20 @@
+let cardColors;
+Meteor.startup(() => {
+  cardColors = Cards.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.subscribe('allRules');
+    this.cardColorButtonValue = new ReactiveVar('green');
+  },
+
+  cardColorButton() {
+    return this.cardColorButtonValue.get();
+  },
+
+  cardColorButtonText() {
+    return `color-${ this.cardColorButtonValue.get() }`;
  },

  labels() {
@@ -112,7 +126,63 @@ BlazeComponent.extendComponent({
          boardId,
        });
      },
+      'click .js-show-color-palette'(event){
+        const funct = Popup.open('setCardActionsColor');
+        const colorButton = this.find('#color-action');
+        if (colorButton.value === '') {
+          colorButton.value = 'green';
+        }
+        funct.call(this, event);
+      },
+      'click .js-set-color-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const selectedColor = this.cardColorButtonValue.get();
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const triggerId = Triggers.insert(trigger);
+        const actionId = Actions.insert({
+          actionType: 'setColor',
+          selectedColor,
+          boardId,
+          desc,
+        });
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+        });
+      },
    }];
  },

 }).register('cardActions');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentAction = this.currentData();
+    this.colorButtonValue = Popup.getOpenerComponent().cardColorButtonValue;
+    this.currentColor = new ReactiveVar(this.colorButtonValue.get());
+  },
+
+  colors() {
+    return cardColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.colorButtonValue.set(this.currentColor.get());
+        Popup.close();
+      },
+    }];
+  },
+}).register('setCardActionsColorPopup');
@@ -174,6 +174,15 @@
          top:30px
        .trigger-button.trigger-button-person
          right:-40px
+        .trigger-button.trigger-button-color
+          top: unset
+          position: unset
+          transform: unset
+          font-size: 16px
+          width:auto
+          padding-left: 10px
+          padding-right: 10px
+          height:40px
      .trigger-item.trigger-item-mail
        height:300px
  
@@ -64,8 +64,7 @@ template(name="boardTriggers")
      div.trigger-text 
        | {{_'r-in-swimlane'}}
      div.trigger-dropdown
-        input(id="create-swimlane-name",type=text,placeholder="{{_'r-swimlane-name'}}") 
-      div.trigger-button.trigger-button-person.js-show-user-field  
+        input(id="create-swimlane-name-2",type=text,placeholder="{{_'r-swimlane-name'}}") 
      div.trigger-button.trigger-button-person.js-show-user-field
        i.fa.fa-user
      div.user-details.hide-element
@@ -39,15 +39,18 @@ BlazeComponent.extendComponent({
      'click .js-add-moved-trigger' (event) {
        const datas = this.data();
        const desc = Utils.getTriggerActionDesc(event, this);
-        const swimlaneName = this.find('#create-swimlane-name').value;
+        const swimlaneName = this.find('#create-swimlane-name-2').value;
        const actionSelected = this.find('#move-action').value;
        const listName = this.find('#move-list-name').value;
        const boardId = Session.get('currentBoard');
+        const divId = $(event.currentTarget.parentNode).attr('id');
+        const cardTitle = this.cardTitleFilters[divId];
        if (actionSelected === 'moved-to') {
          datas.triggerVar.set({
            activityType: 'moveCard',
            boardId,
            listName,
+            cardTitle,
            swimlaneName,
            'oldListName': '*',
            desc,
@@ -57,6 +60,7 @@ BlazeComponent.extendComponent({
          datas.triggerVar.set({
            activityType: 'moveCard',
            boardId,
+            cardTitle,
            swimlaneName,
            'listName': '*',
            'oldListName': listName,
@@ -1,13 +1,13 @@
 template(name="cardTriggers")
  div.trigger-item
    div.trigger-content
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-when-a-label-is'}}
      div.trigger-dropdown
        select(id="label-action")
          option(value="added") {{_'r-added-to'}}
          option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-a-card'}}
      div.trigger-button.trigger-button-person.js-show-user-field
        i.fa.fa-user
@@ -21,20 +21,20 @@ template(name="cardTriggers")

  div.trigger-item
    div.trigger-content
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-when-the-label-is'}}
      div.trigger-dropdown
        select(id="spec-label")
          each labels
-            option(value="#{_id}")
-              = name
-      div.trigger-text 
+            option(value="#{_id}" style="background-color: #{name}")
+              = translatedname
+      div.trigger-text
        | {{_'r-is'}}
      div.trigger-dropdown
        select(id="spec-label-action")
          option(value="added") {{_'r-added-to'}}
          option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-a-card'}}
      div.trigger-button.trigger-button-person.js-show-user-field
        i.fa.fa-user
@@ -48,13 +48,13 @@ template(name="cardTriggers")

  div.trigger-item
    div.trigger-content
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-when-a-member'}}
      div.trigger-dropdown
        select(id="gen-member-action")
          option(value="added") {{_'r-added-to'}}
          option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-a-card'}}
      div.trigger-button.trigger-button-person.js-show-user-field
        i.fa.fa-user
@@ -69,17 +69,17 @@ template(name="cardTriggers")

  div.trigger-item
    div.trigger-content
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-when-the-member'}}
      div.trigger-dropdown
-        input(id="spec-member",type=text,placeholder="{{_'r-name'}}") 
-      div.trigger-text 
+        input(id="spec-member",type=text,placeholder="{{_'r-name'}}")
+      div.trigger-text
        | {{_'r-is'}}
      div.trigger-dropdown
        select(id="spec-member-action")
          option(value="added") {{_'r-added-to'}}
          option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-a-card'}}
      div.trigger-button.trigger-button-person.js-show-user-field
        i.fa.fa-user
@@ -93,15 +93,15 @@ template(name="cardTriggers")

  div.trigger-item
    div.trigger-content
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-when-a-attach'}}
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-is'}}
      div.trigger-dropdown
        select(id="attach-action")
          option(value="added") {{_'r-added-to'}}
          option(value="removed") {{_'r-removed-from'}}
-      div.trigger-text 
+      div.trigger-text
        | {{_'r-a-card'}}
      div.trigger-button.trigger-button-person.js-show-user-field
        i.fa.fa-user
@@ -6,7 +6,10 @@ BlazeComponent.extendComponent({
    const labels = Boards.findOne(Session.get('currentBoard')).labels;
    for (let i = 0; i < labels.length; i++) {
      if (labels[i].name === '' || labels[i].name === undefined) {
-        labels[i].name = labels[i].color.toUpperCase();
+        labels[i].name = labels[i].color;
+        labels[i].translatedname = `${TAPi18n.__(`color-${  labels[i].color}`)}`;
+      } else {
+        labels[i].translatedname = labels[i].name;
      }
    }
    return labels;
@@ -2,5 +2,8 @@ template(name='connectionMethod')
  div.at-form-authentication
    label {{_ 'authentication-method'}}
    select.select-authentication
-        each authentications
-            option(value="{{value}}") {{_ value}}
+      each authentications
+        if isSelected value
+          option(value="{{value}}" selected) {{_ value}}
+        else
+          option(value="{{value}}") {{_ value}}
@@ -31,4 +31,7 @@ Template.connectionMethod.helpers({
  authentications() {
    return Template.instance().authenticationMethods.get();
  },
+  isSelected(match) {
+    return Template.instance().data.authenticationMethod === match;
+  },
 });
@@ -3,8 +3,13 @@ template(name="people")
    unless currentUser.isAdmin
      | {{_ 'error-notAuthorized'}}
    else
-      .content-title
-        span {{_ 'people'}}
+      .content-title.ext-box
+        .ext-box-left
+          span {{_ 'people'}}
+          input#searchInput(placeholder="{{_ 'search'}}")
+          button#searchButton {{_ 'search'}}
+        .ext-box-right
+          span {{_ 'people-number'}} #{peopleNumber}
      .content-body
        .side-menu
          ul
@@ -102,5 +107,8 @@ template(name="editUserPopup")
    label
      | {{_ 'password'}}
      input.js-profile-password(type="password")
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+      div
+      input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")

-    input.primary.wide(type="submit" value="{{_ 'save'}}")
@@ -8,6 +8,8 @@ BlazeComponent.extendComponent({
    this.error = new ReactiveVar('');
    this.loading = new ReactiveVar(false);
    this.people = new ReactiveVar(true);
+    this.findUsersOptions = new ReactiveVar({});
+    this.number = new ReactiveVar(0);

    this.page = new ReactiveVar(1);
    this.loadNextPageLocked = false;
@@ -26,6 +28,33 @@ BlazeComponent.extendComponent({
      });
    });
  },
+  events() {
+    return [{
+      'click #searchButton'() {
+        this.filterPeople();
+      },
+      'keydown #searchInput'(event) {
+        if (event.keyCode === 13 && !event.shiftKey) {
+          this.filterPeople();
+        }
+      },
+    }];
+  },
+  filterPeople() {
+    const value = $('#searchInput').first().val();
+    if (value === '') {
+      this.findUsersOptions.set({});
+    } else {
+      const regex = new RegExp(value, 'i');
+      this.findUsersOptions.set({
+        $or: [
+          { username: regex },
+          { 'profile.fullname': regex },
+          { 'emails.address': regex },
+        ],
+      });
+    }
+  },
  loadNextPage() {
    if (this.loadNextPageLocked === false) {
      this.page.set(this.page.get() + 1);
@@ -49,9 +78,14 @@ BlazeComponent.extendComponent({
    this.loading.set(w);
  },
  peopleList() {
-    return Users.find({}, {
+    const users = Users.find(this.findUsersOptions.get(), {
      fields: {_id: true},
    });
+    this.number.set(users.count());
+    return users;
+  },
+  peopleNumber() {
+    return this.number.get();
  },
 }).register('people');

@@ -64,6 +98,7 @@ Template.peopleRow.helpers({

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

  Meteor.call('getAuthenticationsEnabled', (_, result) => {
    if (result) {
@@ -95,6 +130,9 @@ Template.editUserPopup.helpers({
    const selected = Users.findOne(userId).authenticationMethod;
    return selected === 'ldap';
  },
+  errorMessage() {
+    return Template.instance().errorMessage.get();
+  },
 });

 BlazeComponent.extendComponent({
@@ -186,4 +224,9 @@ Template.editUserPopup.events({
      });
    } else Popup.close();
  },
+
+  'click #deleteButton'() {
+    Users.remove(this.userId);
+    Popup.close();
+  },
 });
@@ -13,3 +13,36 @@ table

  tr:nth-child(even)
    background-color: #dddddd;
+
+.ext-box
+  display: flex;
+  flex-direction: row;
+  height: 34px;
+
+  .ext-box-left
+    display: flex;
+    width: 40%
+
+  span
+    vertical-align: center;
+    line-height: 34px;
+    margin-right: 10px;
+
+  input, button
+    margin: 0 10px 0 0;
+    padding: 0;
+
+  button
+    min-width: 60px;
+
+.content-wrapper
+  margin-top: 10px
+
+.buttonsContainer
+  display: flex
+
+  input
+    margin: 0
+
+  div
+    margin: auto
@@ -134,17 +134,27 @@ template(name='announcementSettings')

 template(name='layoutSettings')
  ul#layout-setting.setting-detail
-    li.layout-form
+    //li.layout-form
      .title {{_ 'hide-logo'}}
      .form-group.flex
        input.form-control#hide-logo(type="radio" name="hideLogo" value="true" checked="{{#if currentSetting.hideLogo}}checked{{/if}}")
        span {{_ 'yes'}}
        input.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
+        input.form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="true" checked="{{#if currentSetting.displayAuthenticationMethod}}checked{{/if}}")
+        span {{_ 'yes'}}
+        input.form-control#display-authentication-method(type="radio" name="displayAuthenticationMethod" value="false" checked="{{#unless currentSetting.displayAuthenticationMethod}}checked{{/unless}}")
+        span {{_ 'no'}}
+    li.layout-form
+      .title {{_ 'default-authentication-method'}}
+      +selectAuthenticationMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
    li.layout-form
      .title {{_ 'custom-product-name'}}
      .form-group
-        input.form-control#product-name(type="text", placeholder="Wekan" value="{{currentSetting.productName}}")
+        input.form-control#product-name(type="text", placeholder="" value="{{currentSetting.productName}}")
    li.layout-form
      .title {{_ 'add-custom-html-after-body-start'}}
      textarea#customHTMLafterBodyStart.form-control= currentSetting.customHTMLafterBodyStart
@@ -153,3 +163,12 @@ template(name='layoutSettings')
      textarea#customHTMLbeforeBodyEnd.form-control= currentSetting.customHTMLbeforeBodyEnd
    li
      button.js-save-layout.primary {{_ 'save'}}
+
+
+template(name='selectAuthenticationMethod')
+  select#defaultAuthenticationMethod
+    each authentications
+      if isSelected value
+        option(value="{{value}}" selected) {{_ value}}
+      else
+        option(value="{{value}}") {{_ value}}
@@ -62,6 +62,9 @@ BlazeComponent.extendComponent({
  toggleHideLogo() {
    $('#hide-logo').toggleClass('is-checked');
  },
+  toggleDisplayAuthenticationMethod() {
+    $('#display-authentication-method').toggleClass('is-checked');
+  },
  switchMenu(event) {
    const target = $(event.target);
    if (!target.hasClass('active')) {
@@ -87,7 +90,7 @@ BlazeComponent.extendComponent({
  },

  inviteThroughEmail() {
-    const emails = $('#email-to-invite').val().trim().split('\n').join(',').split(',');
+    const emails = $('#email-to-invite').val().toLowerCase().trim().split('\n').join(',').split(',');
    const boardsToInvite = [];
    $('.js-toggle-board-choose .materialCheckBox.is-checked').each(function () {
      boardsToInvite.push($(this).data('id'));
@@ -140,17 +143,20 @@ BlazeComponent.extendComponent({

    const productName = $('#product-name').val().trim();
    const hideLogoChange = ($('input[name=hideLogo]:checked').val() === 'true');
+    const displayAuthenticationMethod = ($('input[name=displayAuthenticationMethod]:checked').val() === 'true');
+    const defaultAuthenticationMethod = $('#defaultAuthenticationMethod').val();
    const customHTMLafterBodyStart = $('#customHTMLafterBodyStart').val().trim();
    const customHTMLbeforeBodyEnd = $('#customHTMLbeforeBodyEnd').val().trim();

    try {
-
      Settings.update(Settings.findOne()._id, {
        $set: {
          productName,
          hideLogo: hideLogoChange,
          customHTMLafterBodyStart,
          customHTMLbeforeBodyEnd,
+          displayAuthenticationMethod,
+          defaultAuthenticationMethod,
        },
      });
    } catch (e) {
@@ -165,17 +171,14 @@ BlazeComponent.extendComponent({

  sendSMTPTestEmail() {
    Meteor.call('sendSMTPTestEmail', (err, ret) => {
-      if (!err && ret) { /* eslint-disable no-console */
+      if (!err && ret) {
        const message = `${TAPi18n.__(ret.message)}: ${ret.email}`;
-        console.log(message);
        alert(message);
      } else {
        const reason = err.reason || '';
        const message = `${TAPi18n.__(err.error)}\n${reason}`;
-        console.log(message, err);
        alert(message);
      }
-      /* eslint-enable no-console */
    });
  },

@@ -190,6 +193,7 @@ BlazeComponent.extendComponent({
      'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
      'click a.js-toggle-hide-logo': this.toggleHideLogo,
      'click button.js-save-layout': this.saveLayout,
+      'click a.js-toggle-display-authentication-method': this.toggleDisplayAuthenticationMethod,
    }];
  },
 }).register('setting');
@@ -262,3 +266,29 @@ BlazeComponent.extendComponent({
    }];
  },
 }).register('announcementSettings');
+
+
+Template.selectAuthenticationMethod.onCreated(function() {
+  this.authenticationMethods = new ReactiveVar([]);
+
+  Meteor.call('getAuthenticationsEnabled', (_, result) => {
+    if (result) {
+      // TODO : add a management of different languages
+      // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')})
+      this.authenticationMethods.set([
+        {value: 'password'},
+        // Gets only the authentication methods availables
+        ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})),
+      ]);
+    }
+  });
+});
+
+Template.selectAuthenticationMethod.helpers({
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  isSelected(match) {
+    return Template.instance().data.authenticationMethod === match;
+  },
+});
@@ -52,6 +52,10 @@

    .main-body
      padding: 0.1em 1em
+      -webkit-user-select: auto // Safari 3.1+
+      -moz-user-select: auto // Firefox 2+
+      -ms-user-select: auto // IE 10+
+      user-select: auto // Standard syntax

      ul
        li
@@ -4,22 +4,21 @@ template(name="settingHeaderBar")

  .setting-header-btns.left
    unless isMiniScreen
-      unless isSandstorm
-        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'}}
@@ -1,9 +1,9 @@
 template(name="sidebar")
  .board-sidebar.sidebar(class="{{#if isOpen}}is-open{{/if}}")
-    a.sidebar-tongue.js-toggle-sidebar(
-      class="{{#if isTongueHidden}}is-hidden{{/if}}",
-      title="{{showTongueTitle}}")
-      i.fa.fa-angle-left
+    //a.sidebar-tongue.js-toggle-sidebar(
+    //  class="{{#if isTongueHidden}}is-hidden{{/if}}",
+    //  title="{{showTongueTitle}}")
+    //  i.fa.fa-navicon
    .sidebar-shadow
      .sidebar-content.sidebar-shortcuts
        a.board-header-btn.js-shortcuts
@@ -11,7 +11,7 @@ template(name="sidebar")
          span {{_ 'keyboard-shortcuts' }}
      .sidebar-content.js-board-sidebar-content.js-perfect-scrollbar
        a.hide-btn.js-hide-sidebar
-          i.fa.fa-angle-right
+          i.fa.fa-navicon
        unless isDefaultView
          h2
            a.fa.fa-chevron-left.js-back-home
@@ -34,6 +34,9 @@ template(name="membersWidget")
    h3
      i.fa.fa-user
      | {{_ 'members'}}
+      a.board-header-btn.js-open-board-menu(title="{{_ 'boardMenuPopup-title'}}").right
+        i.board-header-btn-icon.fa.fa-cog
+
    .board-widget-content
      each currentBoard.activeMembers
        +userAvatar(userId=this.userId showStatus=true)
@@ -53,6 +56,130 @@ template(name="membersWidget")
    button.js-member-invite-accept.primary {{_ 'accept'}}
    button.js-member-invite-decline {{_ 'decline'}}

+template(name="boardChangeColorPopup")
+  .board-backgrounds-list.clearfix
+    each backgroundColors
+      .board-background-select.js-select-background
+        span.background-box(class="board-color-{{this}}")
+          if isSelected
+            i.fa.fa-check
+
+template(name="boardSubtaskSettingsPopup")
+  form.board-subtask-settings
+    h3 {{_ 'show-parent-in-minicard'}}
+      a#prefix-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-full-path'}}is-checked{{/if}}")
+        span {{_ 'prefix-with-full-path'}}
+      a#prefix-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'prefix-with-parent'}}is-checked{{/if}}")
+        span {{_ 'prefix-with-parent'}}
+      a#subtext-with-full-path.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-full-path'}}is-checked{{/if}}")
+        span {{_ 'subtext-with-full-path'}}
+      a#subtext-with-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'subtext-with-parent'}}is-checked{{/if}}")
+        span {{_ 'subtext-with-parent'}}
+      a#no-parent.flex.js-field-show-parent-in-minicard(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if $eq presentParentTask 'no-parent'}}is-checked{{/if}}")
+        span {{_ 'no-parent'}}
+    div
+      hr
+
+    div.check-div
+      a.flex.js-field-has-subtasks(class="{{#if allowsSubtasks}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if allowsSubtasks}}is-checked{{/if}}")
+        span {{_ 'show-subtasks-field'}}
+
+    label
+      | {{_ 'deposit-subtasks-board'}}
+      select.js-field-deposit-board(disabled="{{#unless allowsSubtasks}}disabled{{/unless}}")
+          each boards
+            if isBoardSelected
+              option(value=_id selected="selected") {{title}}
+            else
+              option(value=_id) {{title}}
+          if isNullBoardSelected
+            option(value='null' selected="selected") {{_ 'custom-field-dropdown-none'}}
+          else
+            option(value='null') {{_ 'custom-field-dropdown-none'}}
+    div
+      hr
+
+    label
+      | {{_ 'deposit-subtasks-list'}}
+      select.js-field-deposit-list(disabled="{{#unless hasLists}}disabled{{/unless}}")
+          each lists
+            if isListSelected
+              option(value=_id selected="selected") {{title}}
+            else
+              option(value=_id) {{title}}
+
+template(name="chooseBoardSource")
+  ul.pop-over-list
+    li
+      a(href="{{pathFor '/import/trello'}}") {{_ 'from-trello'}}
+    li
+      a(href="{{pathFor '/import/wekan'}}") {{_ 'from-wekan'}}
+
+template(name="archiveBoardPopup")
+  p {{_ 'close-board-pop'}}
+  button.js-confirm.negate.full(type="submit") {{_ 'archive'}}
+
+template(name="outgoingWebhooksPopup")
+  each integrations
+    form.integration-form
+      if title
+        h4 {{title}}
+      else
+        h4 {{_ 'no-name'}}
+      label
+        | URL
+        input.js-outgoing-webhooks-url(type="text" name="url" value=url)
+        input(type="hidden" value=_id name="id")
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+  form.integration-form
+    h4
+      | {{_ 'new-outgoing-webhook'}}
+    label
+      | URL
+      input.js-outgoing-webhooks-url(type="text" name="url" autofocus)
+    input.primary.wide(type="submit" value="{{_ 'save'}}")
+
+template(name="boardMenuPopup")
+  ul.pop-over-list
+    li: a.js-custom-fields {{_ 'custom-fields'}}
+    li: a.js-open-archives {{_ 'archived-items'}}
+    if currentUser.isBoardAdmin
+      li: a.js-change-board-color {{_ '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 {{_ 'language'}}
+  unless isSandstorm
+    if currentUser.isBoardAdmin
+      hr
+      ul.pop-over-list
+        li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
+        unless currentBoard.isTemplatesBoard
+          li: a.js-archive-board {{_ 'archive-board'}}
+        li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
+      hr
+      ul.pop-over-list
+        li: a.js-subtask-settings {{_ 'subtask-settings'}}
+
+  if isSandstorm
+    hr
+    ul.pop-over-list
+      li: a(href="{{exportUrl}}", download="{{exportFilename}}") {{_ 'export-board'}}
+      li: a.js-import-board {{_ 'import-board-c'}}
+      li: a.js-archive-board {{_ 'archive-board'}}
+      li: a.js-outgoing-webhooks {{_ 'outgoing-webhooks'}}
+    hr
+    ul.pop-over-list
+      li: a.js-subtask-settings {{_ 'subtask-settings'}}
+
 template(name="labelsWidget")
  .board-widget.board-widget-labels
    h3
@@ -62,7 +189,9 @@ template(name="labelsWidget")
      each currentBoard.labels
          a.card-label(class="card-label-{{color}}"
            class="{{#if currentUser.isNotCommentOnly}}js-label{{/if}}")
-            span.card-label-name= name
+            span.card-label-name
+              +viewer
+                = name
      if currentUser.isBoardAdmin
        a.card-label.add-label.js-add-label
          i.fa.fa-plus
@@ -83,17 +212,16 @@ template(name="memberPopup")
    ul.pop-over-list
      li
        a.js-filter-member {{_ 'filter-cards'}}
-      unless isSandstorm
-        if currentUser.isBoardAdmin
-          li
-            a.js-change-role
-              | {{_ 'change-permissions'}}
-              span.quiet (#{memberType})
+      if currentUser.isBoardAdmin
        li
-          if $eq currentUser._id userId
-            a.js-leave-member {{_ 'leave-board'}}
-          else if currentUser.isBoardAdmin
-            a.js-remove-member {{_ 'remove-from-board'}}
+          a.js-change-role
+            | {{_ 'change-permissions'}}
+            span.quiet (#{memberType})
+      li
+        if $eq currentUser._id userId
+          a.js-leave-member {{_ 'leave-board'}}
+        else if currentUser.isBoardAdmin
+          a.js-remove-member {{_ 'remove-from-board'}}


 template(name="removeMemberPopup")
@@ -142,6 +142,52 @@ Template.memberPopup.helpers({
  },
 });

+Template.boardMenuPopup.events({
+  'click .js-rename-board': Popup.open('boardChangeTitle'),
+  'click .js-custom-fields'() {
+    Sidebar.setView('customFields');
+    Popup.close();
+  },
+  'click .js-open-archives'() {
+    Sidebar.setView('archives');
+    Popup.close();
+  },
+  'click .js-change-board-color': Popup.open('boardChangeColor'),
+  'click .js-change-language': Popup.open('changeLanguage'),
+  'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    currentBoard.archive();
+    // XXX We should have some kind of notification on top of the page to
+    // confirm that the board was successfully archived.
+    FlowRouter.go('home');
+  }),
+  'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    Popup.close();
+    Boards.remove(currentBoard._id);
+    FlowRouter.go('home');
+  }),
+  'click .js-outgoing-webhooks': Popup.open('outgoingWebhooks'),
+  'click .js-import-board': Popup.open('chooseBoardSource'),
+  'click .js-subtask-settings': Popup.open('boardSubtaskSettings'),
+});
+
+Template.boardMenuPopup.helpers({
+  exportUrl() {
+    const params = {
+      boardId: Session.get('currentBoard'),
+    };
+    const queryParams = {
+      authToken: Accounts._storedLoginToken(),
+    };
+    return FlowRouter.path('/api/boards/:boardId/export', params, queryParams);
+  },
+  exportFilename() {
+    const boardId = Session.get('currentBoard');
+    return `wekan-export-board-${boardId}.json`;
+  },
+});
+
 Template.memberPopup.events({
  'click .js-filter-member'() {
    Filter.members.toggle(this.userId);
@@ -190,7 +236,14 @@ Template.membersWidget.helpers({

 Template.membersWidget.events({
  'click .js-member': Popup.open('member'),
+  'click .js-open-board-menu': Popup.open('boardMenu'),
  'click .js-manage-board-members': Popup.open('addMember'),
+  'click .js-import': Popup.open('boardImportBoard'),
+  submit: this.onSubmit,
+  'click .js-import-board': Popup.open('chooseBoardSource'),
+  'click .js-open-archived-board'() {
+    Modal.open('archivedBoards');
+  },
  'click .sandstorm-powerbox-request-identity'() {
    window.sandstormRequestIdentity();
  },
@@ -209,6 +262,59 @@ Template.membersWidget.events({
  },
 });

+BlazeComponent.extendComponent({
+  integrations() {
+    const boardId = Session.get('currentBoard');
+    return Integrations.find({ boardId: `${boardId}` }).fetch();
+  },
+
+  integration(id) {
+    const boardId = Session.get('currentBoard');
+    return Integrations.findOne({ _id: id, boardId: `${boardId}` });
+  },
+
+  events() {
+    return [{
+      'submit'(evt) {
+        evt.preventDefault();
+        const url = evt.target.url.value;
+        const boardId = Session.get('currentBoard');
+        let id = null;
+        let integration = null;
+        if (evt.target.id) {
+          id = evt.target.id.value;
+          integration = this.integration(id);
+          if (url) {
+            Integrations.update(integration._id, {
+              $set: {
+                url: `${url}`,
+              },
+            });
+          } else {
+            Integrations.remove(integration._id);
+          }
+        } else if (url) {
+          Integrations.insert({
+            userId: Meteor.userId(),
+            enabled: true,
+            type: 'outgoing-webhooks',
+            url: `${url}`,
+            boardId: `${boardId}`,
+            activities: ['all'],
+          });
+        }
+        Popup.close();
+      },
+    }];
+  },
+}).register('outgoingWebhooksPopup');
+
+BlazeComponent.extendComponent({
+  template() {
+    return 'chooseBoardSource';
+  },
+}).register('chooseBoardSourcePopup');
+
 Template.labelsWidget.events({
  'click .js-label': Popup.open('editLabel'),
  'click .js-add-label': Popup.open('createLabel'),
@@ -258,6 +364,124 @@ function draggableMembersLabelsWidgets() {
 Template.membersWidget.onRendered(draggableMembersLabelsWidgets);
 Template.labelsWidget.onRendered(draggableMembersLabelsWidgets);

+BlazeComponent.extendComponent({
+  backgroundColors() {
+    return Boards.simpleSchema()._schema.color.allowedValues;
+  },
+
+  isSelected() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    return currentBoard.color === this.currentData().toString();
+  },
+
+  events() {
+    return [{
+      'click .js-select-background'(evt) {
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const newColor = this.currentData().toString();
+        currentBoard.setColor(newColor);
+        evt.preventDefault();
+      },
+    }];
+  },
+}).register('boardChangeColorPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+  },
+
+  allowsSubtasks() {
+    return this.currentBoard.allowsSubtasks;
+  },
+
+  isBoardSelected() {
+    return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id;
+  },
+
+  isNullBoardSelected() {
+    return (this.currentBoard.subtasksDefaultBoardId === null) || (this.currentBoard.subtasksDefaultBoardId === undefined);
+  },
+
+  boards() {
+    return Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+    }, {
+      sort: ['title'],
+    });
+  },
+
+  lists() {
+    return Lists.find({
+      boardId: this.currentBoard._id,
+      archived: false,
+    }, {
+      sort: ['title'],
+    });
+  },
+
+  hasLists() {
+    return this.lists().count() > 0;
+  },
+
+  isListSelected() {
+    return this.currentBoard.subtasksDefaultBoardId === this.currentData()._id;
+  },
+
+  presentParentTask() {
+    let result = this.currentBoard.presentParentTask;
+    if ((result === null) || (result === undefined)) {
+      result = 'no-parent';
+    }
+    return result;
+  },
+
+  events() {
+    return [{
+      'click .js-field-has-subtasks'(evt) {
+        evt.preventDefault();
+        this.currentBoard.allowsSubtasks = !this.currentBoard.allowsSubtasks;
+        this.currentBoard.setAllowsSubtasks(this.currentBoard.allowsSubtasks);
+        $('.js-field-has-subtasks .materialCheckBox').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
+        $('.js-field-has-subtasks').toggleClass('is-checked', this.currentBoard.allowsSubtasks);
+        $('.js-field-deposit-board').prop('disabled', !this.currentBoard.allowsSubtasks);
+      },
+      'change .js-field-deposit-board'(evt) {
+        let value = evt.target.value;
+        if (value === 'null') {
+          value = null;
+        }
+        this.currentBoard.setSubtasksDefaultBoardId(value);
+        evt.preventDefault();
+      },
+      'change .js-field-deposit-list'(evt) {
+        this.currentBoard.setSubtasksDefaultListId(evt.target.value);
+        evt.preventDefault();
+      },
+      'click .js-field-show-parent-in-minicard'(evt) {
+        const value = evt.target.id || $(evt.target).parent()[0].id ||  $(evt.target).parent()[0].parent()[0].id;
+        const options = [
+          'prefix-with-full-path',
+          'prefix-with-parent',
+          'subtext-with-full-path',
+          'subtext-with-parent',
+          'no-parent'];
+        options.forEach(function(element) {
+          if (element !== value) {
+            $(`#${element} .materialCheckBox`).toggleClass('is-checked', false);
+            $(`#${element}`).toggleClass('is-checked', false);
+          }
+        });
+        $(`#${value} .materialCheckBox`).toggleClass('is-checked', true);
+        $(`#${value}`).toggleClass('is-checked', true);
+        this.currentBoard.setPresentParentTask(value);
+        evt.preventDefault();
+      },
+    }];
+  },
+}).register('boardSubtaskSettingsPopup');
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.error = new ReactiveVar('');
@@ -1,38 +1,56 @@
 template(name="archivesSidebar")
-  +basicTabs(tabs=tabs)
-
-   +tabContent(slug="cards")
-    each archivedCards
-      .minicard-wrapper.js-minicard
-        +minicard(this)
-      if currentUser.isBoardMember
+  if isArchiveReady.get
+    +basicTabs(tabs=tabs)
+      +tabContent(slug="cards")
        p.quiet
-          a.js-restore-card {{_ 'restore'}}
+          a.js-restore-all-cards {{_ 'restore-all'}}
          | -
-          a.js-delete-card {{_ 'delete'}}
-        if cardIsInArchivedList
-          p.quiet.small ({{_ 'warn-list-archived'}})
-    else
-      p.no-items-message {{_ 'no-archived-cards'}}
-
-   +tabContent(slug="lists")
-    ul.archived-lists
-      each archivedLists
-        li.archived-lists-item
+          a.js-delete-all-cards {{_ 'delete-all'}}
+        each archivedCards
+          .minicard-wrapper.js-minicard
+            +minicard(this)
          if currentUser.isBoardMember
-            button.js-restore-list
-              i.fa.fa-undo
-          = title
-      else
-        li.no-items-message {{_ 'no-archived-lists'}}
+            p.quiet
+              a.js-restore-card {{_ 'restore'}}
+              | -
+              a.js-delete-card {{_ 'delete'}}
+            if cardIsInArchivedList
+              p.quiet.small ({{_ 'warn-list-archived'}})
+        else
+          p.no-items-message {{_ 'no-archived-cards'}}

-   +tabContent(slug="swimlanes")
-    ul.archived-lists
-      each archivedSwimlanes
-        li.archived-lists-item
-          if currentUser.isBoardMember
-            button.js-restore-swimlane
-              i.fa.fa-undo
-          = title
-      else
-        li.no-items-message {{_ 'no-archived-swimlanes'}}
+      +tabContent(slug="lists")
+        p.quiet
+          a.js-restore-all-lists {{_ 'restore-all'}}
+          | -
+          a.js-delete-all-lists {{_ 'delete-all'}}
+        ul.archived-lists
+          each archivedLists
+            li.archived-lists-item
+              = title
+              if currentUser.isBoardMember
+                p.quiet
+                  a.js-restore-list {{_ 'restore'}}
+                  | -
+                  a.js-delete-list {{_ 'delete'}}
+          else
+            li.no-items-message {{_ 'no-archived-lists'}}
+
+      +tabContent(slug="swimlanes")
+        p.quiet
+          a.js-restore-all-swimlanes {{_ 'restore-all'}}
+          | -
+          a.js-delete-all-swimlanes {{_ 'delete-all'}}
+        ul.archived-lists
+          each archivedSwimlanes
+            li.archived-lists-item
+              = title
+              if currentUser.isBoardMember
+                p.quiet
+                  a.js-restore-swimlane {{_ 'restore'}}
+                  | -
+                  a.js-delete-swimlane {{_ 'delete'}}
+          else
+            li.no-items-message {{_ 'no-archived-swimlanes'}}
+  else
+    +spinner
@@ -1,4 +1,26 @@
+const subManager = new SubsManager();
+
 BlazeComponent.extendComponent({
+  onCreated() {
+    this.isArchiveReady = new ReactiveVar(false);
+
+    // The pattern we use to manually handle data loading is described here:
+    // https://kadira.io/academy/meteor-routing-guide/content/subscriptions-and-data-management/using-subs-manager
+    // XXX The boardId should be readed from some sort the component "props",
+    // unfortunatly, Blaze doesn't have this notion.
+    this.autorun(() => {
+      const currentBoardId = Session.get('currentBoard');
+      if (!currentBoardId)
+        return;
+      const handle = subManager.subscribe('board', currentBoardId, true);
+      Tracker.nonreactive(() => {
+        Tracker.autorun(() => {
+          this.isArchiveReady.set( handle.ready() );
+        });
+      });
+    });
+  },
+
  tabs() {
    return [
      { name: TAPi18n.__('cards'), slug: 'cards' },
@@ -44,19 +66,67 @@ BlazeComponent.extendComponent({
          card.restore();
        }
      },
+      'click .js-restore-all-cards'() {
+        this.archivedCards().forEach((card) => {
+          if(card.canBeRestored()){
+            card.restore();
+          }
+        });
+      },
+
      'click .js-delete-card': Popup.afterConfirm('cardDelete', function() {
        const cardId = this._id;
        Cards.remove(cardId);
        Popup.close();
      }),
+      'click .js-delete-all-cards': Popup.afterConfirm('cardDelete', () => {
+        this.archivedCards().forEach((card) => {
+          Cards.remove(card._id);
+        });
+        Popup.close();
+      }),
+
      'click .js-restore-list'() {
        const list = this.currentData();
        list.restore();
      },
+      'click .js-restore-all-lists'() {
+        this.archivedLists().forEach((list) => {
+          list.restore();
+        });
+      },
+
+      'click .js-delete-list': Popup.afterConfirm('listDelete', function() {
+        this.remove();
+        Popup.close();
+      }),
+      'click .js-delete-all-lists': Popup.afterConfirm('listDelete', () => {
+        this.archivedLists().forEach((list) => {
+          list.remove();
+        });
+        Popup.close();
+      }),
+
      'click .js-restore-swimlane'() {
        const swimlane = this.currentData();
        swimlane.restore();
      },
+      'click .js-restore-all-swimlanes'() {
+        this.archivedSwimlanes().forEach((swimlane) => {
+          swimlane.restore();
+        });
+      },
+
+      'click .js-delete-swimlane': Popup.afterConfirm('swimlaneDelete', function() {
+        this.remove();
+        Popup.close();
+      }),
+      'click .js-delete-all-swimlanes': Popup.afterConfirm('swimlaneDelete', () => {
+        this.archivedSwimlanes().forEach((swimlane) => {
+          swimlane.remove();
+        });
+        Popup.close();
+      }),
    }];
  },
 }).register('archivesSidebar');
@@ -6,7 +6,9 @@ template(name="customFieldsSidebar")
                    div.minicard
                        a.fa.fa-pencil.js-edit-custom-field.minicard-edit-button
                        div.minicard-title
-                            | {{ name }} ({{ type }})
+                          +viewer
+                            =name
+                          | ({{ type }})

    if currentUser.isBoardMember
        hr
@@ -2,7 +2,7 @@ BlazeComponent.extendComponent({

  customFields() {
    return CustomFields.find({
-      boardId: Session.get('currentBoard'),
+      boardIds: {$in: [Session.get('currentBoard')]},
    });
  },

@@ -103,7 +103,6 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
        evt.preventDefault();

        const data = {
-          boardId: Session.get('currentBoard'),
          name: this.find('.js-field-name').value.trim(),
          type: this.type.get(),
          settings: this.getSettings(),
@@ -114,6 +113,7 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({

        // insert or update
        if (!this.data()._id) {
+          data.boardIds = [Session.get('currentBoard')];
          CustomFields.insert(data);
        } else {
          CustomFields.update(this.data()._id, {$set: data});
@@ -122,8 +122,16 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
        Popup.back();
      },
      'click .js-delete-custom-field': Popup.afterConfirm('deleteCustomField', function() {
-        const customFieldId = this._id;
-        CustomFields.remove(customFieldId);
+        const customField = CustomFields.findOne(this._id);
+        if (customField.boardIds.length > 1) {
+          CustomFields.update(customField._id, {
+            $pull: {
+              boardIds: Session.get('currentBoard'),
+            },
+          });
+        } else {
+          CustomFields.remove(customField._id);
+        }
        Popup.close();
      }),
    }];
@@ -1,6 +1,6 @@
 template(name="searchSidebar")
  form.js-search-term-form
-    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus)
+    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
  .list-body.js-perfect-scrollbar
    .minicards.clearfix.js-minicards
      each (results)
@@ -0,0 +1,8 @@
+template(name="miniswimlane")
+  .minicard(
+    class="minicard-{{colorClass}}")
+    .minicard-title
+      .handle
+        .fa.fa-arrows
+      +viewer
+        = title
@@ -1,14 +1,21 @@
 template(name="swimlaneHeader")
-  .swimlane-header-wrap.js-swimlane-header
-    +inlinedForm
-      +editSwimlaneTitleForm
+  .swimlane-header-wrap.js-swimlane-header(class='{{#if colorClass}}swimlane-{{colorClass}}{{/if}}')
+    if this.isTemplateContainer
+        +swimlaneFixedHeader(this)
    else
-      .swimlane-header(
-        class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
-        = title
-      .swimlane-header-menu
-        unless currentUser.isCommentOnly
-          a.fa.fa-navicon.js-open-swimlane-menu
+      +inlinedForm
+        +editSwimlaneTitleForm
+      else
+        +swimlaneFixedHeader(this)
+
+template(name="swimlaneFixedHeader")
+  .swimlane-header(
+    class="{{#if currentUser.isBoardMember}}js-open-inlined-form is-editable{{/if}}")
+    = 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

 template(name="editSwimlaneTitleForm")
  .list-composer
@@ -20,4 +27,34 @@ template(name="editSwimlaneTitleForm")
 template(name="swimlaneActionPopup")
  unless currentUser.isCommentOnly
    ul.pop-over-list
-      li: a.js-close-swimlane {{_ 'archive-swimlane'}}
+       li: a.js-set-swimlane-color {{_ 'select-color'}}
+    unless this.isTemplateContainer
+      hr
+      ul.pop-over-list
+        li: a.js-close-swimlane {{_ 'archive-swimlane'}}
+
+template(name="swimlaneAddPopup")
+  unless currentUser.isCommentOnly
+    form
+      input.swimlane-name-input.full-line(type="text" placeholder="{{_ 'add-swimlane'}}"
+        autocomplete="off" autofocus)
+      .edit-controls.clearfix
+        button.primary.confirm(type="submit") {{_ 'add'}}
+        unless currentBoard.isTemplatesBoard
+          unless currentBoard.isTemplateBoard
+            span.quiet
+              | {{_ 'or'}}
+              a.js-swimlane-template {{_ 'template'}}
+
+template(name="setSwimlaneColorPopup")
+  form.edit-label
+    .palette-colors: each colors
+      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'}}
+    button.js-remove-color.negate.wide.right {{_ 'unset-color'}}
+
+template(name="swimlaneDeletePopup")
+  p {{_ "swimlane-delete-pop"}}
+  button.js-confirm.negate.full(type="submit") {{_ 'delete'}}
@@ -1,3 +1,10 @@
+const { calculateIndexData } = Utils;
+
+let swimlaneColors;
+Meteor.startup(() => {
+  swimlaneColors = Swimlanes.simpleSchema()._schema.color.allowedValues;
+});
+
 BlazeComponent.extendComponent({
  editTitle(evt) {
    evt.preventDefault();
@@ -11,15 +18,85 @@ BlazeComponent.extendComponent({
  events() {
    return [{
      'click .js-open-swimlane-menu': Popup.open('swimlaneAction'),
+      'click .js-open-add-swimlane-menu': Popup.open('swimlaneAdd'),
      submit: this.editTitle,
    }];
  },
 }).register('swimlaneHeader');

 Template.swimlaneActionPopup.events({
+  'click .js-set-swimlane-color': Popup.open('setSwimlaneColor'),
  'click .js-close-swimlane' (evt) {
    evt.preventDefault();
    this.archive();
    Popup.close();
  },
 });
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentSwimlane = this.currentData();
+  },
+
+  events() {
+    return [{
+      submit(evt) {
+        evt.preventDefault();
+        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const nextSwimlane = currentBoard.nextSwimlane(this.currentSwimlane);
+        const titleInput = this.find('.swimlane-name-input');
+        const title = titleInput.value.trim();
+        const sortValue = calculateIndexData(this.currentSwimlane, nextSwimlane, 1);
+        const swimlaneType = (currentBoard.isTemplatesBoard())?'template-swimlane':'swimlane';
+
+        if (title) {
+          Swimlanes.insert({
+            title,
+            boardId: Session.get('currentBoard'),
+            sort: sortValue.base,
+            type: swimlaneType,
+          });
+
+          titleInput.value = '';
+          titleInput.focus();
+        }
+        // XXX ideally, we should move the popup to the newly
+        // created swimlane so a user can add more than one swimlane
+        // with a minimum of interactions
+        Popup.close();
+      },
+      'click .js-swimlane-template': Popup.open('searchElement'),
+    }];
+  },
+}).register('swimlaneAddPopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentSwimlane = this.currentData();
+    this.currentColor = new ReactiveVar(this.currentSwimlane.color);
+  },
+
+  colors() {
+    return swimlaneColors.map((color) => ({ color, name: '' }));
+  },
+
+  isSelected(color) {
+    return this.currentColor.get() === color;
+  },
+
+  events() {
+    return [{
+      'click .js-palette-color'() {
+        this.currentColor.set(this.currentData().color);
+      },
+      'click .js-submit' () {
+        this.currentSwimlane.setColor(this.currentColor.get());
+        Popup.close();
+      },
+      'click .js-remove-color'() {
+        this.currentSwimlane.setColor(null);
+        Popup.close();
+      },
+    }];
+  },
+}).register('setSwimlaneColorPopup');
@@ -1,21 +1,22 @@
 template(name="swimlane")
-  .swimlane.js-lists.js-swimlane
+  .swimlane
    +swimlaneHeader
+  .swimlane.js-lists.js-swimlane
    if isMiniScreen
-      if currentList
+      if currentListIsInThisSwimlane _id
        +list(currentList)
-      else
-        each currentBoard.lists
+      unless currentList
+        each lists
          +miniList(this)
        if currentUser.isBoardMember
          +addListForm
    else
-      each currentBoard.lists
+      each lists
        +list(this)
        if currentCardIsInThisList _id ../_id
          +cardDetails(currentCard)
      if currentUser.isBoardMember
-        +addListAndSwimlaneForm
+        +addListForm

 template(name="listsGroup")
  .swimlane.list-group.js-lists
@@ -23,52 +24,31 @@ template(name="listsGroup")
      if currentList
        +list(currentList)
      else
-        each currentBoard.lists
+        each lists
          +miniList(this)
        if currentUser.isBoardMember
          +addListForm
    else
-      each currentBoard.lists
+      each lists
        +list(this)
        if currentCardIsInThisList _id null
          +cardDetails(currentCard)
      if currentUser.isBoardMember
        +addListForm

-template(name="addListAndSwimlaneForm")
-  .list.list-composer.js-list-composer
-    .list-header
-      +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'}}
-          a.fa.fa-times-thin.js-close-inlined-form
-      else
-        a.open-list-composer.js-open-inlined-form
-          i.fa.fa-plus
-          | {{_ 'add-list'}}
-    .list-header
-      +inlinedForm(autoclose=false)
-        input.swimlane-name-input.full-line(type="text" placeholder="{{_ 'add-swimlane'}}"
-          autocomplete="off" autofocus)
-        .edit-controls.clearfix
-          button.primary.confirm(type="submit") {{_ 'save'}}
-          a.fa.fa-times-thin.js-close-inlined-form
-      else
-        a.open-list-composer.js-open-inlined-form
-          i.fa.fa-plus
-          | {{_ 'add-swimlane'}}
-
 template(name="addListForm")
  .list.list-composer.js-list-composer
-    .list-header
+    .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'}}
-          a.fa.fa-times-thin.js-close-inlined-form
+          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
@@ -1,16 +1,25 @@
 const { calculateIndex, enableClickOnTouch } = Utils;

+function currentListIsInThisSwimlane(swimlaneId) {
+  const currentList = Lists.findOne(Session.get('currentList'));
+  return currentList && (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '');
+}
+
 function currentCardIsInThisList(listId, swimlaneId) {
  const currentCard = Cards.findOne(Session.get('currentCard'));
  const currentUser = Meteor.user();
-  if (currentUser.profile.boardView === 'board-view-lists')
-    return currentCard && currentCard.listId === listId;
-  else if (currentUser.profile.boardView === 'board-view-swimlanes')
+  if (currentUser && currentUser.profile && currentUser.profile.boardView === 'board-view-swimlanes')
    return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
-  else if (currentUser.profile.boardView === 'board-view-cal')
-    return currentCard;
-  else
-    return false;
+  else // Default view: board-view-lists
+    return currentCard && currentCard.listId === listId;
+  // https://github.com/wekan/wekan/issues/1623
+  // https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de
+  // TODO: In public board, if you would like to switch between List/Swimlane view, you could
+  //       1) If there is no view cookie, save to cookie board-view-lists
+  //          board-view-lists / board-view-swimlanes / board-view-cal
+  //       2) If public user changes clicks board-view-lists then change view and
+  //          then change view and save cookie with view value
+  //          without using currentuser above, because currentuser is null.
 }

 function initSortable(boardComponent, $listsDom) {
@@ -110,6 +119,10 @@ BlazeComponent.extendComponent({
    return currentCardIsInThisList(listId, swimlaneId);
  },

+  currentListIsInThisSwimlane(swimlaneId) {
+    return currentListIsInThisSwimlane(swimlaneId);
+  },
+
  events() {
    return [{
      // Click-and-drag action
@@ -149,6 +162,12 @@ BlazeComponent.extendComponent({
 }).register('swimlane');

 BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.isListTemplatesSwimlane = this.currentBoard.isTemplatesBoard() && this.currentData().isListTemplatesSwimlane();
+    this.currentSwimlane = this.currentData();
+  },
+
  // Proxy
  open() {
    this.childComponents('inlinedForm')[0].open();
@@ -165,58 +184,19 @@ BlazeComponent.extendComponent({
            title,
            boardId: Session.get('currentBoard'),
            sort: $('.list').length,
+            type: (this.isListTemplatesSwimlane)?'template-list':'list',
+            swimlaneId: (this.currentBoard.isTemplatesBoard())?this.currentSwimlane._id:'',
          });

          titleInput.value = '';
          titleInput.focus();
        }
      },
+      'click .js-list-template': Popup.open('searchElement'),
    }];
  },
 }).register('addListForm');

-BlazeComponent.extendComponent({
-  // Proxy
-  open() {
-    this.childComponents('inlinedForm')[0].open();
-  },
-
-  events() {
-    return [{
-      submit(evt) {
-        evt.preventDefault();
-        let titleInput = this.find('.list-name-input');
-        if (titleInput) {
-          const title = titleInput.value.trim();
-          if (title) {
-            Lists.insert({
-              title,
-              boardId: Session.get('currentBoard'),
-              sort: $('.list').length,
-            });
-
-            titleInput.value = '';
-            titleInput.focus();
-          }
-        } else {
-          titleInput = this.find('.swimlane-name-input');
-          const title = titleInput.value.trim();
-          if (title) {
-            Swimlanes.insert({
-              title,
-              boardId: Session.get('currentBoard'),
-              sort: $('.swimlane').length,
-            });
-
-            titleInput.value = '';
-            titleInput.focus();
-          }
-        }
-      },
-    }];
-  },
-}).register('addListAndSwimlaneForm');
-
 Template.swimlane.helpers({
  canSeeAddList() {
    return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly();
@@ -7,7 +7,7 @@
  display: flex
  flex-direction: row
  overflow: 0;
-  max-height: 100%
+  max-height: calc(100% - 26px)

  &.placeholder
    background-color: rgba(0, 0, 0, .2)
@@ -27,20 +27,15 @@
  .swimlane-header-wrap
    display: flex;
    flex-direction: row;
-    flex: 0 0 50px;
-    padding-bottom: 30px;
-    border-bottom: 1px solid #CCC
+    flex: 1 0 100%;
+    background-color: #ccc;

    .swimlane-header
-      -ms-writing-mode: tb-rl;
-      writing-mode: vertical-rl;
-      transform: rotate(180deg);
      font-size: 14px;
-      line-height: 50px;
-      margin-top: 50px;
+      padding: 5px 5px
      font-weight: bold;
      min-height: 9px;
-      width: 50px;
+      width: 100%;
      overflow: hidden;
      -o-text-overflow: ellipsis;
      text-overflow: ellipsis;
@@ -49,7 +44,95 @@

    .swimlane-header-menu
      position: absolute
-      padding: 20px 20px
+      padding: 5px 5px
+
+    .swimlane-header-plus-icon
+      margin-left: 5px
+      margin-right: 10px

 .list-group
  height: 100%
+
+.moving-swimlane
+  display: none
+
+swimlane-color(background, color...)
+  background: background !important
+  if color
+    color: color !important //overwrite text for better visibility
+
+.swimlane-white
+  swimlane-color(#ffffff, #4d4d4d) //Black text for better visibility
+  border: 1px solid #eee
+
+.swimlane-green
+  swimlane-color(#3cb500, #ffffff) //White text for better visibility
+
+.swimlane-yellow
+  swimlane-color(#fad900, #4d4d4d) //Black text for better visibility
+
+.swimlane-orange
+  swimlane-color(#ff9f19, #4d4d4d) //Black text for better visibility
+
+.swimlane-red
+  swimlane-color(#eb4646, #ffffff) //White text for better visibility
+
+.swimlane-purple
+  swimlane-color(#a632db, #ffffff) //White text for better visibility
+
+.swimlane-blue
+  swimlane-color(#0079bf, #ffffff) //White text for better visibility
+
+.swimlane-pink
+  swimlane-color(#ff78cb, #4d4d4d) //Black text for better visibility
+
+.swimlane-sky
+  swimlane-color(#00c2e0, #ffffff) //White text for better visibility
+
+.swimlane-black
+  swimlane-color(#4d4d4d, #ffffff) //White text for better visibility
+
+.swimlane-lime
+  swimlane-color(#51e898, #4d4d4d) //Black text for better visibility
+
+.swimlane-silver
+  swimlane-color(unset, #4d4d4d) //Black text for better visibility
+
+.swimlane-peachpuff
+  swimlane-color(#ffdab9, #4d4d4d) //Black text for better visibility
+
+.swimlane-crimson
+  swimlane-color(#dc143c, #ffffff) //White text for better visibility
+
+.swimlane-plum
+  swimlane-color(#dda0dd, #4d4d4d) //Black text for better visibility
+
+.swimlane-darkgreen
+  swimlane-color(#006400, #ffffff) //White text for better visibility
+
+.swimlane-slateblue
+  swimlane-color(#6a5acd, #ffffff) //White text for better visibility
+
+.swimlane-magenta
+  swimlane-color(#ff00ff, #ffffff) //White text for better visibility
+
+.swimlane-gold
+  swimlane-color(#ffd700, #4d4d4d) //Black text for better visibility
+
+.swimlane-navy
+  swimlane-color(#000080, #ffffff) //White text for better visibility
+
+.swimlane-gray
+  swimlane-color(#808080, #ffffff) //White text for better visibility
+
+.swimlane-saddlebrown
+  swimlane-color(#8b4513, #ffffff) //White text for better visibility
+
+.swimlane-paleturquoise
+  swimlane-color(#afeeee, #4d4d4d) //Black text for better visibility
+
+.swimlane-mistyrose
+  swimlane-color(#ffe4e1, #4d4d4d) //Black text for better visibility
+
+.swimlane-indigo
+  swimlane-color(#4b0082, #ffffff) //White text for better visibility
@@ -4,10 +4,11 @@ template(name="headerUserBar")
      .header-user-bar-avatar
        +userAvatar(userId=currentUser._id)
      unless isMiniScreen
-        if currentUser.profile.fullname
-          = currentUser.profile.fullname
-        else
-          = currentUser.username
+        unless isSandstorm
+          if currentUser.profile.fullname
+            = currentUser.profile.fullname
+          else
+            = currentUser.username

 template(name="memberMenuPopup")
  ul.pop-over-list
@@ -15,13 +16,18 @@ template(name="memberMenuPopup")
      li: a.js-edit-profile {{_ 'edit-profile'}}
      li: a.js-change-settings {{_ 'change-settings'}}
      li: a.js-change-avatar {{_ 'edit-avatar'}}
-      li: a.js-change-password {{_ 'changePasswordPopup-title'}}
-      li: a.js-change-language {{_ 'changeLanguagePopup-title'}}
+      unless isSandstorm
+        li: a.js-change-password {{_ 'changePasswordPopup-title'}}
+        li: a.js-change-language {{_ 'changeLanguagePopup-title'}}
    if currentUser.isAdmin
      li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}}
  hr
  ul.pop-over-list
-    li: a.js-logout {{_ 'log-out'}}
+    li: a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") {{_ 'templates'}}
+  unless isSandstorm
+    hr
+    ul.pop-over-list
+      li: a.js-logout {{_ 'log-out'}}

 template(name="editProfilePopup")
  form
@@ -47,7 +53,10 @@ template(name="editProfilePopup")
        input.js-profile-email(type="email" value="{{emails.[0].address}}")
      else
        input.js-profile-email(type="email" value="{{emails.[0].address}}" readonly)
-    input.primary.wide(type="submit" value="{{_ 'save'}}")
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+      div
+      input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")

 template(name="changePasswordPopup")
  +atForm(state='changePwd')
@@ -3,6 +3,15 @@ Template.headerUserBar.events({
  'click .js-change-avatar': Popup.open('changeAvatar'),
 });

+Template.memberMenuPopup.helpers({
+  templatesBoardId() {
+    return Meteor.user().getTemplatesBoardId();
+  },
+  templatesBoardSlug() {
+    return Meteor.user().getTemplatesBoardSlug();
+  },
+});
+
 Template.memberMenuPopup.events({
  'click .js-edit-profile': Popup.open('editProfile'),
  'click .js-change-settings': Popup.open('changeSettings'),
@@ -86,6 +95,11 @@ Template.editProfilePopup.events({
      });
    } else Popup.back();
  },
+  'click #deleteButton'() {
+    Users.remove(Meteor.userId());
+    Popup.close();
+    AccountsTemplates.logout();
+  },
 });

 // XXX For some reason the useraccounts autofocus isnt working in this case.
@@ -105,6 +119,8 @@ Template.changeLanguagePopup.helpers({
        name = 'Brezhoneg';
      } else if (lang.name === 'ig') {
        name = 'Igbo';
+      } else if (lang.name === 'oc') {
+        name = 'Occitan';
      }
      return { tag, name };
    }).sort(function (a, b) {
@@ -135,6 +135,6 @@ $(document).on('click', (evt) => {
  }
 });

-$(document).on('click', 'a[href=#]',  (evt) => {
+$(document).on('click', 'a[href=\\#]',  (evt) => {
  evt.preventDefault();
 });
@@ -184,7 +184,7 @@ window.Popup = new class {
      // positives.
      const title = TAPi18n.__(translationKey);
      // when popup showed as full of small screen, we need a default header to clearly see [X] button
-      const defaultTitle = Utils.isMiniScreen() ? 'Wekan' : false;
+      const defaultTitle = Utils.isMiniScreen() ? '' : false;
      return title !== translationKey ? title : defaultTitle;
    };
  }
@@ -90,8 +90,8 @@ services:
  wekandb:
    #-------------------------------------------------------------------------------------
    # ==== MONGODB AND METEOR VERSION ====
-    # a) CURRENTLY BROKEN: For Wekan Meteor 1.8.x version at meteor-1.8 branch, use mongo 4.x
-    # image: mongo:4.0.4
+    # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch, use mongo 4.x
+    #image: mongo:4.0.4
    # b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
    # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
    image: mongo:3.2.21
@@ -110,12 +110,12 @@ services:
  wekan:
    #-------------------------------------------------------------------------------------
    # ==== MONGODB AND METEOR VERSION ====
-    # a) CURRENTLY BROKEN: For Wekan Meteor 1.8.x version at meteor-1.8 branch,
+    # a) For Wekan Meteor 1.8.x version at meteor-1.8 branch,
    #    using https://quay.io/wekan/wekan automatic builds
-    # image: quay.io/wekan/wekan:meteor-1.8
+    #image: quay.io/wekan/wekan:meteor-1.8
    # b) For Wekan Meteor 1.6.x version at master/devel/edge branches.
    # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x
-    image: quay.io/wekan/wekan
+    image: quay.io/wekan/wekan:master
    # c) 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
@@ -169,8 +169,9 @@ services:
      #   For SSL in email, change smtp:// to smtps://
      # NOTE: Special characters need to be url-encoded in MAIL_URL.
      #       You can encode those characters for example at: https://www.urlencoder.org
-      - MAIL_URL=smtp://user:pass@mailserver.example.com:25/
-      - MAIL_FROM='Example Wekan Support <support@example.com>'
+      #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/
+      - MAIL_URL=smtp://<mail_url>:25/?ignoreTLS=true&tls={rejectUnauthorized:false}
+      - MAIL_FROM=Wekan Notifications <noreply.wekan@mydomain.com>
      #---------------------------------------------------------------
      # ==== OPTIONAL: MONGO OPLOG SETTINGS =====
      # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-378343587
@@ -191,9 +192,12 @@ services:
      # - MONGO_OPLOG_URL=mongodb://<username>:<password>@<mongoDbURL>/local?authSource=admin&replicaSet=rsWekan
      #---------------------------------------------------------------
      # ==== OPTIONAL: KADIRA PERFORMANCE MONITORING FOR METEOR ====
-      # https://github.com/smeijer/kadira
+      # https://github.com/edemaine/kadira-compose
+      # https://github.com/meteor/meteor-apm-agent
      # https://blog.meteor.com/kadira-apm-is-now-open-source-490469ffc85f
-      # - export KADIRA_OPTIONS_ENDPOINT=http://127.0.0.1:11011
+      #- APM_OPTIONS_ENDPOINT=http://<kadira-ip>:11011
+      #- APM_APP_ID=
+      #- APM_APP_SECRET=
      #---------------------------------------------------------------
      # ==== OPTIONAL: LOGS AND STATS ====
      # https://github.com/wekan/wekan/wiki/Logs
@@ -217,25 +221,35 @@ services:
      # https://github.com/wekan/wekan-gogs
      # If you disable Wekan API with false, Export Board does not work.
      - WITH_API=true
+      #---------------------------------------------------------------
+      # ==== PASSWORD BRUTE FORCE PROTECTION ====
+      #https://atmospherejs.com/lucasantoniassi/accounts-lockout
+      #Defaults below. Uncomment to change. wekan/server/accounts-lockout.js
+      #- ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE=3
+      #- ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD=60
+      #- ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW=15
+      #- ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE=3
+      #- ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60
+      #- ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15
+      #---------------------------------------------------------------
+      # ==== EMAIL NOTIFICATION TIMEOUT, ms =====
+      # Defaut: 30000 ms = 30s
+      #- EMAIL_NOTIFICATION_TIMEOUT=30000
      #-----------------------------------------------------------------
      # ==== CORS =====
-      # CORS: Set Access-Control-Allow-Origin header. Example: *
+      # CORS: Set Access-Control-Allow-Origin header.
      #- CORS=*
      #-----------------------------------------------------------------
      # ==== MATOMO INTEGRATION ====
      # Optional: Integration with Matomo https://matomo.org that is installed to your server
      # The address of the server where Matomo is hosted.
-      # example: - MATOMO_ADDRESS=https://example.com/matomo
-      #- MATOMO_ADDRESS=
+      #- MATOMO_ADDRESS=https://example.com/matomo
      # The value of the site ID given in Matomo server for Wekan
-      # example: - MATOMO_SITE_ID=12345
-      #- MATOMO_SITE_ID=
+      #- MATOMO_SITE_ID=1
      # The option do not track which enables users to not be tracked by matomo
-      # example:  - MATOMO_DO_NOT_TRACK=false
-      #- MATOMO_DO_NOT_TRACK=
+      #- MATOMO_DO_NOT_TRACK=true
      # The option that allows matomo to retrieve the username:
-      # example: MATOMO_WITH_USERNAME=true
-      #- MATOMO_WITH_USERNAME=false
+      #- MATOMO_WITH_USERNAME=true
      #-----------------------------------------------------------------
      # ==== BROWSER POLICY AND TRUSTED IFRAME URL ====
      # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
@@ -243,208 +257,233 @@ services:
      # and allows all iframing etc. See wekan/server/policy.js
      - BROWSER_POLICY_ENABLED=true
      # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
-      #- TRUSTED_URL=
+      #- TRUSTED_URL=https://intra.example.com
      #-----------------------------------------------------------------
      # ==== OUTGOING WEBHOOKS ====
      # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
-      # example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
-      #- WEBHOOKS_ATTRIBUTES=
+      #- WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
      #-----------------------------------------------------------------
-      # ==== OAUTH2 ONLY WITH OIDC AND DOORKEEPER AS INDENTITY PROVIDER
+      # ==== Debug OIDC OAuth2 etc ====
+      #- DEBUG=true
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 AZURE ====
+      # https://github.com/wekan/wekan/wiki/Azure
+      # 1) Register the application with Azure. Make sure you capture
+      #    the application ID as well as generate a secret key.
+      # 2) Configure the environment variables. This differs slightly
+      #     by installation type, but make sure you have the following:
+      #- OAUTH2_ENABLED=true
+      # OAuth2 login style: popup or redirect.
+      #- OAUTH2_LOGIN_STYLE=redirect
+      # Application GUID captured during app registration:
+      #- OAUTH2_CLIENT_ID=xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx
+      # Secret key generated during app registration:
+      #- OAUTH2_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+      #- OAUTH2_SERVER_URL=https://login.microsoftonline.com/
+      #- OAUTH2_AUTH_ENDPOINT=/oauth2/v2.0/authorize
+      #- OAUTH2_USERINFO_ENDPOINT=https://graph.microsoft.com/oidc/userinfo
+      #- OAUTH2_TOKEN_ENDPOINT=/oauth2/v2.0/token
+      # The claim name you want to map to the unique ID field:
+      #- OAUTH2_ID_MAP=email
+      # The claim name you want to map to the username field:
+      #- OAUTH2_USERNAME_MAP=email
+      # The claim name you want to map to the full name field:
+      #- OAUTH2_FULLNAME_MAP=name
+      # Tthe claim name you want to map to the email field:
+      #- OAUTH2_EMAIL_MAP=email
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 KEYCLOAK ====
+      # https://github.com/wekan/wekan/wiki/Keycloak  <== MAPPING INFO, REQUIRED
+      #- OAUTH2_ENABLED=true
+      # OAuth2 login style: popup or redirect.
+      #- OAUTH2_LOGIN_STYLE=redirect
+      #- OAUTH2_CLIENT_ID=<Keycloak create Client ID>
+      #- OAUTH2_SERVER_URL=<Keycloak server name>/auth
+      #- OAUTH2_AUTH_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/auth
+      #- OAUTH2_USERINFO_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/userinfo
+      #- OAUTH2_TOKEN_ENDPOINT=/realms/<keycloak realm>/protocol/openid-connect/token
+      #- OAUTH2_SECRET=<keycloak client secret>
+      #-----------------------------------------------------------------
+      # ==== OAUTH2 DOORKEEPER ====
      # https://github.com/wekan/wekan/issues/1874
      # https://github.com/wekan/wekan/wiki/OAuth2
      # Enable the OAuth2 connection
-      # example: OAUTH2_ENABLED=true
-      #- OAUTH2_ENABLED=false
+      #- OAUTH2_ENABLED=true
      # OAuth2 docs: https://github.com/wekan/wekan/wiki/OAuth2
-      # OAuth2 Client ID, for example from Rocket.Chat. Example: abcde12345
-      # example: OAUTH2_CLIENT_ID=abcde12345
-      #- OAUTH2_CLIENT_ID=
-      # OAuth2 Secret, for example from Rocket.Chat: Example: 54321abcde
-      # example: OAUTH2_SECRET=54321abcde
-      #- OAUTH2_SECRET=
-      # OAuth2 Server URL, for example Rocket.Chat. Example: https://chat.example.com
-      # example: OAUTH2_SERVER_URL=https://chat.example.com
-      #- OAUTH2_SERVER_URL=
-      # OAuth2 Authorization Endpoint. Example: /oauth/authorize
-      # example: OAUTH2_AUTH_ENDPOINT=/oauth/authorize
-      #- OAUTH2_AUTH_ENDPOINT=
-      # OAuth2 Userinfo Endpoint. Example: /oauth/userinfo
-      # example: OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
-      #- OAUTH2_USERINFO_ENDPOINT=
-      # OAuth2 Token Endpoint. Example: /oauth/token
-      # example: OAUTH2_TOKEN_ENDPOINT=/oauth/token
-      #- OAUTH2_TOKEN_ENDPOINT=
+      # OAuth2 login style: popup or redirect.
+      #- OAUTH2_LOGIN_STYLE=redirect
+      # OAuth2 Client ID.
+      #- OAUTH2_CLIENT_ID=abcde12345
+      # OAuth2 Secret.
+      #- OAUTH2_SECRET=54321abcde
+      # OAuth2 Server URL.
+      #- OAUTH2_SERVER_URL=https://chat.example.com
+      # OAuth2 Authorization Endpoint.
+      #- OAUTH2_AUTH_ENDPOINT=/oauth/authorize
+      # OAuth2 Userinfo Endpoint.
+      #- OAUTH2_USERINFO_ENDPOINT=/oauth/userinfo
+      # OAuth2 Token Endpoint.
+      #- OAUTH2_TOKEN_ENDPOINT=/oauth/token
+      # OAUTH2 ID Token Whitelist Fields.
+      #- OAUTH2_ID_TOKEN_WHITELIST_FIELDS=[]
+      # OAUTH2 Request Permissions.
+      #- OAUTH2_REQUEST_PERMISSIONS=['openid','profile','email']
+      # OAuth2 ID Mapping
+      #- OAUTH2_ID_MAP=
+      # OAuth2 Username Mapping
+      #- OAUTH2_USERNAME_MAP=
+      # OAuth2 Fullname Mapping
+      #- OAUTH2_FULLNAME_MAP=
+      # OAuth2 Email Mapping
+      #- OAUTH2_EMAIL_MAP=
      #-----------------------------------------------------------------
-      # ==== LDAP ====
+      # ==== LDAP: UNCOMMENT ALL TO ENABLE LDAP ====
      # https://github.com/wekan/wekan/wiki/LDAP
      # For Snap settings see https://github.com/wekan/wekan-snap/wiki/Supported-settings-keys
      # Most settings work both on Snap and Docker below.
      # Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
      #
-      # DEFAULT_AUTHENTICATION_METHOD : The default authentication method used if a user does not exist to create and authenticate. Can be set as ldap.
-      # example : DEFAULT_AUTHENTICATION_METHOD=ldap
-      #- DEFAULT_AUTHENTICATION_METHOD=
+      # The default authentication method used if a user does not exist to create and authenticate. Can be set as ldap.
+      #- DEFAULT_AUTHENTICATION_METHOD=ldap
      #
-      # LDAP_ENABLE : Enable or not the connection by the LDAP
-      # example : LDAP_ENABLE=true
-      #- LDAP_ENABLE=false
+      # Enable or not the connection by the LDAP
+      #- LDAP_ENABLE=true
      #
-      # LDAP_PORT : The port of the LDAP server
-      # example : LDAP_PORT=389
+      # The port of the LDAP server
      #- LDAP_PORT=389
      #
-      # LDAP_HOST : The host server for the LDAP server
-      # example : LDAP_HOST=localhost
-      #- LDAP_HOST=
+      # The host server for the LDAP server
+      #- LDAP_HOST=localhost
      #
-      # LDAP_BASEDN : The base DN for the LDAP Tree
-      # example : LDAP_BASEDN=ou=user,dc=example,dc=org
-      #- LDAP_BASEDN=
+      # The base DN for the LDAP Tree
+      #- LDAP_BASEDN=ou=user,dc=example,dc=org
      #
-      # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
-      # example : LDAP_LOGIN_FALLBACK=true
+      # Fallback on the default authentication method
      #- LDAP_LOGIN_FALLBACK=false
      #
-      # LDAP_RECONNECT : Reconnect to the server if the connection is lost
-      # example : LDAP_RECONNECT=false
+      # Reconnect to the server if the connection is lost
      #- LDAP_RECONNECT=true
      #
-      # LDAP_TIMEOUT : Overall timeout, in milliseconds
-      # example : LDAP_TIMEOUT=12345
+      # Overall timeout, in milliseconds
      #- LDAP_TIMEOUT=10000
      #
-      # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
-      # example : LDAP_IDLE_TIMEOUT=12345
+      # Specifies the timeout for idle LDAP connections in milliseconds
      #- LDAP_IDLE_TIMEOUT=10000
      #
-      # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
-      # example : LDAP_CONNECT_TIMEOUT=12345
+      # Connection timeout, in milliseconds
      #- LDAP_CONNECT_TIMEOUT=10000
      #
-      # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
-      # example : LDAP_AUTHENTIFICATION=true
-      #- LDAP_AUTHENTIFICATION=false
+      # If the LDAP needs a user account to search
+      #- LDAP_AUTHENTIFICATION=true
      #
-      # LDAP_AUTHENTIFICATION_USERDN : The search user DN
-      # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
-      #- LDAP_AUTHENTIFICATION_USERDN=
+      # The search user DN
+      #- LDAP_AUTHENTIFICATION_USERDN=cn=wekan_adm,ou=serviceaccounts,ou=admin,ou=prod,dc=mydomain,dc=com
      #
-      # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
-      # example : AUTHENTIFICATION_PASSWORD=admin
-      #- LDAP_AUTHENTIFICATION_PASSWORD=
+      # The password for the search user
+      #- LDAP_AUTHENTIFICATION_PASSWORD=pwd
      #
-      # LDAP_LOG_ENABLED : Enable logs for the module
-      # example : LDAP_LOG_ENABLED=true
-      #- LDAP_LOG_ENABLED=false
+      # Enable logs for the module
+      #- LDAP_LOG_ENABLED=true
      #
-      # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
-      # example : LDAP_BACKGROUND_SYNC=true
+      # If the sync of the users should be done in the background
      #- LDAP_BACKGROUND_SYNC=false
      #
-      # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
-      # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
+      # At which interval does the background task sync in milliseconds
      #- LDAP_BACKGROUND_SYNC_INTERVAL=100
      #
-      # LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
-      # example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
      #- LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
      #
-      # LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS :
-      # example : LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=true
      #- LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false
      #
-      # LDAP_ENCRYPTION : If using LDAPS
-      # example : LDAP_ENCRYPTION=ssl
+      # If using LDAPS: LDAP_ENCRYPTION=ssl
      #- LDAP_ENCRYPTION=false
      #
-      # LDAP_CA_CERT : The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
-      # example : LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+zCCA+OgAwIBAgIkAhwR/6TVLmdRY6hHxvUFWc0+Enmu/Hu6cj+G2FIdAgIC...-----END CERTIFICATE-----
-      #- LDAP_CA_CERT=
+      # The certification for the LDAPS server. Certificate needs to be included in this docker-compose.yml file.
+      #- LDAP_CA_CERT=-----BEGIN CERTIFICATE-----MIIE+G2FIdAgIC...-----END CERTIFICATE-----
      #
-      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
-      # example : LDAP_REJECT_UNAUTHORIZED=true
+      # Reject Unauthorized Certificate
      #- LDAP_REJECT_UNAUTHORIZED=false
      #
-      # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
-      # example : LDAP_USER_SEARCH_FILTER=
+      # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
+      #- LDAP_USER_AUTHENTICATION="true"
+      #
+      # Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
      #- LDAP_USER_SEARCH_FILTER=
      #
-      # LDAP_USER_SEARCH_SCOPE : base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
-      # example : LDAP_USER_SEARCH_SCOPE=one
-      #- LDAP_USER_SEARCH_SCOPE=
+      # base (search only in the provided DN), one (search only in the provided DN and one level deep), or sub (search the whole subtree)
+      #- LDAP_USER_SEARCH_SCOPE=one
      #
-      # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
-      # example : LDAP_USER_SEARCH_FIELD=uid
-      #- LDAP_USER_SEARCH_FIELD=
+      # Which field is used to find the user, like uid / sAMAccountName
+      #- LDAP_USER_SEARCH_FIELD=sAMAccountName
      #
-      # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
-      # example : LDAP_SEARCH_PAGE_SIZE=12345
+      # Used for pagination (0=unlimited)
      #- LDAP_SEARCH_PAGE_SIZE=0
      #
-      # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
-      # example : LDAP_SEARCH_SIZE_LIMIT=12345
+      # The limit number of entries (0=unlimited)
      #- LDAP_SEARCH_SIZE_LIMIT=0
      #
-      # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
-      # example : LDAP_GROUP_FILTER_ENABLE=true
+      # Enable group filtering
      #- LDAP_GROUP_FILTER_ENABLE=false
      #
-      # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
-      # example : LDAP_GROUP_FILTER_OBJECTCLASS=group
+      # The object class for filtering. Example: group
      #- LDAP_GROUP_FILTER_OBJECTCLASS=
      #
-      # LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE :
-      # example :
      #- LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE=
      #
-      # LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE :
-      # example :
      #- LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE=
      #
-      # LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT :
-      # example :
      #- LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT=
      #
-      # LDAP_GROUP_FILTER_GROUP_NAME :
-      # example :
      #- LDAP_GROUP_FILTER_GROUP_NAME=
      #
-      # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier)
-      # example : LDAP_UNIQUE_IDENTIFIER_FIELD=guid
+      # LDAP_UNIQUE_IDENTIFIER_FIELD : This field is sometimes class GUID (Globally Unique Identifier). Example: guid
      #- LDAP_UNIQUE_IDENTIFIER_FIELD=
      #
      # LDAP_UTF8_NAMES_SLUGIFY : Convert the username to utf8
-      # example : LDAP_UTF8_NAMES_SLUGIFY=false
      #- LDAP_UTF8_NAMES_SLUGIFY=true
      #
-      # LDAP_USERNAME_FIELD : Which field contains the ldap username
-      # example : LDAP_USERNAME_FIELD=username
-      #- LDAP_USERNAME_FIELD=
+      # LDAP_USERNAME_FIELD : Which field contains the ldap username. username / sAMAccountName
+      #- LDAP_USERNAME_FIELD=sAMAccountName
      #
-      # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname
-      # example : LDAP_FULLNAME_FIELD=fullname
-      #- LDAP_FULLNAME_FIELD=
+      # LDAP_FULLNAME_FIELD : Which field contains the ldap fullname. fullname / sAMAccountName
+      #- LDAP_FULLNAME_FIELD=fullname
      #
-      # LDAP_MERGE_EXISTING_USERS :
-      # example : LDAP_MERGE_EXISTING_USERS=true
      #- LDAP_MERGE_EXISTING_USERS=false
+      #
+      # Allow existing account matching by e-mail address when username does not match
+      #- LDAP_EMAIL_MATCH_ENABLE=true
+      #
+      # LDAP_EMAIL_MATCH_REQUIRE : require existing account matching by e-mail address when username does match
+      #- LDAP_EMAIL_MATCH_REQUIRE=true
+      #
+      # LDAP_EMAIL_MATCH_VERIFIED : require existing account email address to be verified for matching
+      #- LDAP_EMAIL_MATCH_VERIFIED=true
+      #
+      # LDAP_EMAIL_FIELD : which field contains the LDAP e-mail address
+      #- LDAP_EMAIL_FIELD=mail
      #-----------------------------------------------------------------
-      # LDAP_SYNC_USER_DATA :
-      # example : LDAP_SYNC_USER_DATA=true
      #- LDAP_SYNC_USER_DATA=false
      #
-      # LDAP_SYNC_USER_DATA_FIELDMAP :
-      # example : LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
-      #- LDAP_SYNC_USER_DATA_FIELDMAP=
+      #- LDAP_SYNC_USER_DATA_FIELDMAP={"cn":"name", "mail":"email"}
      #
-      # LDAP_SYNC_GROUP_ROLES :
-      # example :
-      #- LDAP_SYNC_GROUP_ROLES=
+      #- LDAP_SYNC_GROUP_ROLES=''
      #
-      # LDAP_DEFAULT_DOMAIN : The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
+      # The default domain of the ldap it is used to create email if the field is not map correctly with the LDAP_SYNC_USER_DATA_FIELDMAP
      # example :
-      #- LDAP_DEFAULT_DOMAIN=
+      #- LDAP_DEFAULT_DOMAIN=mydomain.com
+      #
+      # Enable/Disable syncing of admin status based on ldap groups:
+      #- LDAP_SYNC_ADMIN_STATUS=true
+      #
+      # Comma separated list of admin group names to sync.
+      #- LDAP_SYNC_ADMIN_GROUPS=group1,group2
+      #---------------------------------------------------------------------
+      # Login to LDAP automatically with HTTP header.
+      # In below example for siteminder, at right side of = is header name.
+      #- HEADER_LOGIN_ID=HEADERUID
+      #- HEADER_LOGIN_FIRSTNAME=HEADERFIRSTNAME
+      #- HEADER_LOGIN_LASTNAME=HEADERLASTNAME
+      #- HEADER_LOGIN_EMAIL=HEADEREMAILADDRESS
      #---------------------------------------------------------------------
      # ==== LOGOUT TIMER, probably does not work yet ====
      # LOGOUT_WITH_TIMER : Enables or not the option logout with timer
@@ -506,9 +545,15 @@ services:
 #      - 80:80
 #      - 443:443
 #    volumes:
-#      - ./nginx/ssl:/etc/nginx/ssl/
-#      - ./nginx/nginx.conf:/etc/nginx/nginx.conf
-
+#      - ./nginx/ssl:/etc/nginx/ssl/:ro
+#      - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+## Alternative volume config:
+##   volumes:
+##     - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+##     - ./nginx/ssl/ssl.conf:/etc/nginx/conf.d/ssl/ssl.conf:ro
+##     - ./nginx/ssl/testvm-ehu.crt:/etc/nginx/conf.d/ssl/certs/mycert.crt:ro
+##     - ./nginx/ssl/testvm-ehu.key:/etc/nginx/conf.d/ssl/certs/mykey.key:ro
+##     - ./nginx/ssl/pphrase:/etc/nginx/conf.d/ssl/pphrase:ro

 volumes:
  wekan-db:
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+OWNERS
@@ -0,0 +1,13 @@
+name: wekan
+version: 1.0.0
+appVersion: 2.x.x
+kubeVersion: "^1.8.0-0"
+description: Open Source kanban
+home: https://wekan.github.io/
+icon: https://wekan.github.io/wekan-logo.svg
+sources:
+  - https://github.com/wekan/wekan
+maintainers:
+  - name: technotaff
+    email: github@randall.cc
+engine: gotpl
@@ -0,0 +1,4 @@
+approvers:
+- technotaff
+reviewers:
+- technotaff
@@ -0,0 +1,58 @@
+# Helm Chart for Wekan
+
+## Features
+
+o Uses a MongoDB replica set by default - this allows fault-tolerant
+  and scalable MongoDB deployment (or just set the replicas to 1 for
+  a single server install)
+
+o Optional Horizontal Pod Autoscaler (HPA), so that your Wekan pods
+  will scale automatically with increased CPU load.
+
+## The configurable values (values.yaml)
+
+Scaling Wekan:
+
+```yaml
+## Configuration for wekan component
+##
+
+replicaCount: 1
+```
+**replicaCount** Will set the initial number of replicas for the Wekan pod (and container)
+
+```yaml
+## Configure an horizontal pod autoscaler
+##
+autoscaling:
+  enabled: true
+  config:
+    minReplicas: 1
+    maxReplicas: 16
+    ## Note: when setting this, a `resources.request.cpu` is required. You
+    ## likely want to set it to `1` or some lower value.
+    ##
+    targetCPUUtilizationPercentage: 80
+```
+This section (if *enabled* is set to **true**) will enable the Kubernetes Horizontal Pod Autoscaler (HPA).
+
+**minReplicas:** this is the minimum number of pods to scale down to (We recommend setting this to the same value as **replicaCount**).
+
+**maxReplicas:** this is the maximum number of pods to scale up to.
+
+**targetCPUUtilizationPercentage:** This is the CPU at which the HPA will scale-out the number of Wekan pods.
+
+```yaml
+mongodb-replicaset:
+  enabled: true
+  replicas: 3
+  replicaSetName: rs0
+  securityContext:
+    runAsUser: 1000
+    fsGroup: 1000
+    runAsNonRoot: true
+```
+
+This section controls the scale of the MongoDB redundant Replica Set.
+
+**replicas:** This is the number of MongoDB instances to include in the set. You can set this to 1 for a single server - this will still allow you to scale-up later with a helm upgrade.
@@ -0,0 +1 @@
+
@@ -0,0 +1,5 @@
+dependencies:
+- name: mongodb-replicaset
+  version: 3.6.x
+  repository: "https://kubernetes-charts.storage.googleapis.com/"
+  condition: mongodb-replicaset.enabled
@@ -0,0 +1,19 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range .Values.ingress.hosts }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "wekan.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get svc -w {{ template "wekan.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "wekan.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "wekan.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl port-forward $POD_NAME 8080:8080
+{{- end }}
@@ -0,0 +1,82 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "wekan.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "wekan.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified name for the wekan data app.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "wekan.localdata.fullname" -}}
+{{- if .Values.localdata.fullnameOverride -}}
+{{- .Values.localdata.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- printf "%s-localdata" .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s-localdata" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "wekan.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use for the api component
+*/}}
+{{- define "wekan.serviceAccountName" -}}
+{{- if .Values.serviceAccounts.create -}}
+    {{ default (include "wekan.fullname" .) .Values.serviceAccounts.name }}
+{{- else -}}
+    {{ default "default" .Values.serviceAccounts.name }}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified mongodb-replicaset name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "wekan.mongodb-replicaset.fullname" -}}
+{{- $name := default "mongodb-replicaset" (index .Values "mongodb-replicaset" "nameOverride") -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create the MongoDB URL. If MongoDB is installed as part of this chart, use k8s service discovery,
+else use user-provided URL.
+*/}}
+{{- define "mongodb-replicaset.url" -}}
+{{- if (index .Values "mongodb-replicaset" "enabled") -}}
+{{- $count := (int (index .Values "mongodb-replicaset" "replicas")) -}}
+{{- $release := .Release.Name -}}
+mongodb://{{- range $v := until $count }}{{ $release }}-mongodb-replicaset-{{ $v }}.{{ $release }}-mongodb-replicaset:27017{{ if ne $v (sub $count 1) }},{{- end -}}{{- end -}}?replicaSet={{ index .Values "mongodb-replicaset" "replicaSetName" }}
+{{- else -}}
+{{- index .Values "mongodb-replicaset" "url" -}}
+{{- end -}}
+{{- end -}}
@@ -0,0 +1,58 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "wekan.fullname" . }}
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ template "wekan.name" . }}
+      component: wekan
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      annotations:
+      labels:
+        app: {{ template "wekan.name" . }}
+        component: wekan
+        release: {{ .Release.Name }}
+    spec:
+      serviceAccountName: {{ template "wekan.serviceAccountName" . }}
+      containers:
+        - name: {{ .Chart.Name }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          terminationMessagePolicy: FallbackToLogsOnError
+          ports:
+            - name: http
+              containerPort: 8080
+          env:
+            - name: ROOT_URL
+              value: {{ .Values.root_url | default "https://wekan.local" | quote }}
+            - name: MONGO_URL
+              value: "{{ template "mongodb-replicaset.url" . }}"
+          livenessProbe:
+            httpGet:
+              path: /
+              port: 8080
+            initialDelaySeconds: 60
+          resources:
+{{ toYaml .Values.resources | indent 12 }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
@@ -0,0 +1,18 @@
+{{- if .Values.autoscaling.enabled -}}
+apiVersion: autoscaling/v1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ template "wekan.fullname" . }}
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ template "wekan.fullname" . }}
+{{ toYaml .Values.autoscaling.config | indent 2 }}
+{{- end -}}
@@ -0,0 +1,40 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "wekan.fullname" . -}}
+{{- $servicePort := .Values.service.port -}}
+{{- $ingressPath := .Values.ingress.path -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: http
+  {{- end }}
+{{- end }}
@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ template "wekan.fullname" . }}
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+type: Opaque
+data:
+  accessKey: {{ .Values.credentials.accessKey | b64enc }}
+  secretKey: {{ .Values.credentials.secretKey | b64enc }}
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: Service
+metadata:
+  {{- if .Values.service.annotations }}
+  annotations:
+{{ toYaml .Values.service.annotations | indent 4 }}
+  {{- end }}
+  name: {{ template "wekan.fullname" . }}
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    app: {{ template "wekan.name" . }}
+    component: wekan
+    release: {{ .Release.Name }}
@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccounts.create }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    heritage: {{ .Release.Service }}
+    release: {{ .Release.Name }}
+  name: {{ template "wekan.serviceAccountName" . }}
+{{- end }}
@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ template "wekan.fullname" . }}-test
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+  - name: {{ template "wekan.fullname" . }}-test
+    imagePullPolicy: IfNotPresent
+    image: "docker.io/mesosphere/aws-cli:1.14.5"
+    command:
+      - sh
+      - -c
+      - aws s3 --endpoint-url=http://{{ include "wekan.fullname" . }} --region=us-east-1 ls
+    env:
+      - name: AWS_ACCESS_KEY_ID
+        valueFrom:
+          secretKeyRef:
+            name: {{ template "wekan.fullname" . }}
+            key: accessKey
+      - name: AWS_SECRET_ACCESS_KEY
+        valueFrom:
+          secretKeyRef:
+            name: {{ template "wekan.fullname" . }}
+            key: secretKey
+  restartPolicy: Never
@@ -0,0 +1,110 @@
+# ------------------------------------------------------------------------------
+# Wekan:
+# ------------------------------------------------------------------------------
+
+## Define serviceAccount names to create or use. Defaults to component's fully
+## qualified name.
+##
+serviceAccounts:
+  create: true
+  name: ""
+
+## Wekan image configuration
+##
+image:
+  repository: quay.io/wekan/wekan
+  tag: latest
+  pullPolicy: IfNotPresent
+
+## Configuration for wekan component
+##
+
+replicaCount: 1
+
+## Specify wekan credentials
+##
+credentials:
+  accessKey: access-key
+  secretKey: secret-key
+
+## Specify additional environmental variables for the Deployment
+##
+env: {}
+
+service:
+  type: NodePort
+  port: 80
+  annotations: {}
+    # prometheus.io/scrape: "true"
+    # prometheus.io/port: "8000"
+    # prometheus.io/path: "/_/monitoring/metrics"
+
+## Comma-separated string of allowed virtual hosts for external access.
+## This should match the ingress hosts
+##
+endpoint: wekan.local
+
+ingress:
+  enabled: true
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  path: /*
+  # This must match 'endpoint', unless your client supports different
+  # hostnames.
+  hosts: [ wekan.local ]
+    # - wekan.local
+  tls: []
+  #  - secretName: wekan-example-tls
+  #    hosts:
+  #      - wekan-example.local
+
+resources: 
+  requests:
+    memory: 128Mi
+    cpu: 300m
+  limits:
+    memory: 1Gi
+    cpu: 500m
+
+## Node labels for pod assignment
+## ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+
+## Tolerations for pod assignment
+## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+##
+tolerations: []
+
+## Affinity for pod assignment
+## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}
+
+## Configure an horizontal pod autoscaler
+##
+autoscaling:
+  enabled: true
+  config:
+    minReplicas: 1
+    maxReplicas: 16
+    ## Note: when setting this, a `resources.request.cpu` is required. You
+    ## likely want to set it to `1` or some lower value.
+    ##
+    targetCPUUtilizationPercentage: 80
+
+# ------------------------------------------------------------------------------
+# MongoDB:
+# ------------------------------------------------------------------------------
+
+mongodb-replicaset:
+  enabled: true
+  replicas: 3
+  replicaSetName: rs0
+  securityContext:
+    runAsUser: 1000
+    fsGroup: 1000
+    runAsNonRoot: true
+  #image:
+  #  tag: 3.2.21
@@ -1,38 +1,51 @@
 {
-    "accept": "اقبلboard",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "ربط __attachment__ الى __card__",
-    "act-addSubtask": "added subtask __checklist__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "علق على __comment__ : __card__",
-    "act-createBoard": "احدث __board__",
-    "act-createCard": "اضاف __card__ الى __list__",
-    "act-createCustomField": "created custom field __customField__",
-    "act-createList": "اضاف __list__ الى __board__",
-    "act-addBoardMember": "اضاف __member__ الى __board__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
-    "act-importBoard": "إستورد __board__",
-    "act-importCard": "إستورد __card__",
-    "act-importList": "إستورد __list__",
-    "act-joinMember": "اضاف __member__ الى __card__",
-    "act-moveCard": "حوّل __card__ من __oldList__ إلى __list__",
-    "act-removeBoardMember": "أزال __member__ من __board__",
-    "act-restoredCard": "أعاد __card__ إلى __board__",
-    "act-unjoinMember": "أزال __member__ من __card__",
-    "act-withBoardTitle": "__board__",
+    "accept": "قبول",
+    "act-activity-notify": "اشعارات النشاط",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__لوح__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "الإجراءات",
    "activities": "الأنشطة",
    "activity": "النشاط",
    "activity-added": "تمت إضافة %s ل %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s انتقل الى الارشيف",
    "activity-attached": "إرفاق %s ل %s",
    "activity-created": "أنشأ %s",
-    "activity-customfield-created": "created custom field %s",
+    "activity-customfield-created": "%s احدت حقل مخصص",
    "activity-excluded": "استبعاد %s عن %s",
    "activity-imported": "imported %s into %s from %s",
    "activity-imported-board": "imported %s from %s",
@@ -42,19 +55,19 @@
    "activity-removed": "حذف %s إلى %s",
    "activity-sent": "إرسال %s إلى %s",
    "activity-unjoined": "غادر %s",
-    "activity-subtask-added": "added subtask to %s",
-    "activity-checked-item": "checked %s in checklist %s of %s",
-    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
+    "activity-subtask-added": "تم اضافة مهمة فرعية الى %s",
+    "activity-checked-item": "تحقق %s في قائمة التحقق %s من %s",
+    "activity-unchecked-item": "ازالة تحقق %s من قائمة التحقق %s من %s",
    "activity-checklist-added": "أضاف قائمة تحقق إلى %s",
-    "activity-checklist-removed": "removed a checklist from %s",
-    "activity-checklist-completed": "completed the checklist %s of %s",
-    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
-    "activity-checklist-item-added": "added checklist item to '%s' in %s",
-    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "activity-checklist-removed": "ازالة قائمة التحقق من %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "لم يتم انجاز قائمة التحقق %s من %s",
+    "activity-checklist-item-added": "تم اضافة عنصر قائمة التحقق الى '%s' في %s",
+    "activity-checklist-item-removed": "تم ازالة عنصر قائمة التحقق الى '%s' في %s",
    "add": "أضف",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed the checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "إضافة مرفق",
    "add-board": "إضافة لوحة",
@@ -79,19 +92,21 @@
    "and-n-other-card_plural": "And __count__ other بطاقات",
    "apply": "طبق",
    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
-    "archive": "Move to Archive",
-    "archive-all": "Move All to Archive",
-    "archive-board": "Move Board to Archive",
-    "archive-card": "Move Card to Archive",
-    "archive-list": "Move List to Archive",
-    "archive-swimlane": "Move Swimlane to Archive",
-    "archive-selection": "Move selection to Archive",
-    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archive": "نقل الى الارشيف",
+    "archive-all": "نقل الكل الى الارشيف",
+    "archive-board": "نقل اللوح الى الارشيف",
+    "archive-card": "نقل البطاقة الى الارشيف",
+    "archive-list": "نقل القائمة الى الارشيف",
+    "archive-swimlane": "نقل خط السباحة الى الارشيف",
+    "archive-selection": "نقل التحديد إلى الأرشيف",
+    "archiveBoardPopup-title": "نقل الوح إلى الأرشيف",
    "archived-items": "أرشيف",
-    "archived-boards": "Boards in Archive",
+    "archived-boards": "الالواح في الأرشيف",
    "restore-board": "استعادة اللوحة",
-    "no-archived-boards": "No Boards in Archive.",
+    "no-archived-boards": "لا توجد لوحات في الأرشيف.",
    "archives": "أرشيف",
+    "template": "Template",
+    "templates": "Templates",
    "assign-member": "تعيين عضو",
    "attached": "أُرفق)",
    "attachment": "مرفق",
@@ -110,25 +125,25 @@
    "boardChangeTitlePopup-title": "إعادة تسمية اللوحة",
    "boardChangeVisibilityPopup-title": "تعديل وضوح الرؤية",
    "boardChangeWatchPopup-title": "تغيير المتابعة",
-    "boardMenuPopup-title": "قائمة اللوحة",
+    "boardMenuPopup-title": "Board Settings",
    "boards": "لوحات",
-    "board-view": "Board View",
-    "board-view-cal": "Calendar",
-    "board-view-swimlanes": "Swimlanes",
+    "board-view": "عرض اللوحات",
+    "board-view-cal": "التقويم",
+    "board-view-swimlanes": "خطوط السباحة",
    "board-view-lists": "القائمات",
    "bucket-example": "مثل « todo list » على سبيل المثال",
    "cancel": "إلغاء",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "البطاقة منقولة الى الارشيف",
+    "board-archived": "اللوحات منقولة الى الارشيف",
    "card-comments-title": "%s تعليقات لهذه البطاقة",
    "card-delete-notice": "هذا حذف أبديّ . سوف تفقد كل الإجراءات المنوطة بهذه البطاقة",
    "card-delete-pop": "سيتم إزالة جميع الإجراءات من تبعات النشاط، وأنك لن تكون قادرا على إعادة فتح البطاقة. لا يوجد التراجع.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "يمكنك نقل بطاقة إلى الأرشيف لإزالتها من اللوحة والمحافظة على النشاط.",
    "card-due": "مستحق",
    "card-due-on": "مستحق في",
-    "card-spent": "Spent Time",
+    "card-spent": "امضى وقتا",
    "card-edit-attachments": "تعديل المرفقات",
-    "card-edit-custom-fields": "Edit custom fields",
+    "card-edit-custom-fields": "تعديل الحقل المعدل",
    "card-edit-labels": "تعديل العلامات",
    "card-edit-members": "تعديل الأعضاء",
    "card-labels-title": "تعديل علامات البطاقة.",
@@ -136,18 +151,19 @@
    "card-start": "بداية",
    "card-start-on": "يبدأ في",
    "cardAttachmentsPopup-title": "إرفاق من",
-    "cardCustomField-datePopup-title": "Change date",
-    "cardCustomFieldsPopup-title": "Edit custom fields",
+    "cardCustomField-datePopup-title": "تغير التاريخ",
+    "cardCustomFieldsPopup-title": "تعديل الحقل المعدل",
    "cardDeletePopup-title": "حذف البطاقة ?",
    "cardDetailsActionsPopup-title": "إجراءات على البطاقة",
    "cardLabelsPopup-title": "علامات",
    "cardMembersPopup-title": "أعضاء",
    "cardMorePopup-title": "المزيد",
+    "cardTemplatePopup-title": "Create template",
    "cards": "بطاقات",
    "cards-count": "بطاقات",
-    "casSignIn": "Sign In with CAS",
-    "cardType-card": "Card",
-    "cardType-linkedCard": "Linked Card",
+    "casSignIn": "تسجيل الدخول مع  CAS",
+    "cardType-card": "بطاقة",
+    "cardType-linkedCard": "البطاقة المرتبطة",
    "cardType-linkedBoard": "Linked Board",
    "change": "Change",
    "change-avatar": "تعديل الصورة الشخصية",
@@ -169,14 +185,30 @@
    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
    "color-black": "black",
    "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
    "color-green": "green",
+    "color-indigo": "indigo",
    "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
    "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
    "color-pink": "pink",
+    "color-plum": "plum",
    "color-purple": "purple",
    "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
    "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
    "color-yellow": "yellow",
+    "unset-color": "Unset",
    "comment": "تعليق",
    "comment-placeholder": "أكتب تعليق",
    "comment-only": "التعليق فقط",
@@ -187,8 +219,8 @@
    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "نسخ رابط البطاقة إلى الحافظة",
-    "linkCardPopup-title": "Link Card",
-    "searchCardPopup-title": "Search Card",
+    "linkCardPopup-title": "ربط البطاقة",
+    "searchElementPopup-title": "بحث",
    "copyCardPopup-title": "نسخ البطاقة",
    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -319,15 +351,17 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "نقل بطاقات هذه القائمة",
    "list-select-cards": "تحديد بطاقات هذه القائمة",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "قائمة الإجراءات",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "المزيد",
    "link-list": "رابط إلى هذه القائمة",
    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
    "lists": "القائمات",
-    "swimlanes": "Swimlanes",
+    "swimlanes": "خطوط السباحة",
    "log-out": "تسجيل الخروج",
    "log-in": "تسجيل الدخول",
    "loginPopup-title": "تسجيل الدخول",
@@ -435,6 +469,9 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "المبادئ",
    "welcome-list2": "متقدم",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
    "what-to-do": "ماذا تريد أن تنجز?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -480,6 +517,7 @@
    "OS_Totalmem": "الذاكرة الكلية لنظام التشغيل",
    "OS_Type": "نوع نظام التشغيل",
    "OS_Uptime": "مدة تشغيل نظام التشغيل",
+    "days": "days",
    "hours": "الساعات",
    "minutes": "الدقائق",
    "seconds": "الثواني",
@@ -500,6 +538,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -529,6 +571,8 @@
    "activity-added-label-card": "added label '%s'",
    "activity-removed-label-card": "removed label '%s'",
    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
    "r-rule": "Rule",
    "r-add-trigger": "Add trigger",
    "r-add-action": "Add action",
@@ -570,7 +614,7 @@
    "r-top-of": "Top of",
    "r-bottom-of": "Bottom of",
    "r-its-list": "its list",
-    "r-archive": "Move to Archive",
+    "r-archive": "نقل الى الارشيف",
    "r-unarchive": "Restore from Archive",
    "r-card": "card",
    "r-add": "أضف",
@@ -578,6 +622,7 @@
    "r-label": "label",
    "r-member": "member",
    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
    "r-checklist": "checklist",
    "r-check-all": "Check all",
    "r-uncheck-all": "Uncheck all",
@@ -635,5 +680,14 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -1,35 +1,48 @@
 {
    "accept": "Приемам",
    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "прикачи __attachment__ към __card__",
-    "act-addSubtask": "добави задача __checklist__ към __card__",
-    "act-addChecklist": "добави списък със задачи __checklist__ към __card__",
-    "act-addChecklistItem": "добави __checklistItem__ към списък със задачи __checklist__ в __card__",
-    "act-addComment": "Коментира в __card__: __comment__",
-    "act-createBoard": "създаде __board__",
-    "act-createCard": "добави __card__ към __list__",
-    "act-createCustomField": "създаде собствено поле __customField__",
-    "act-createList": "добави __list__ към __board__",
-    "act-addBoardMember": "добави __member__ към __board__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
-    "act-importBoard": "импортира __board__",
-    "act-importCard": "импортира __card__",
-    "act-importList": "импортира __list__",
-    "act-joinMember": "добави __member__ към __card__",
-    "act-moveCard": "премести __card__ от __oldList__ в __list__",
-    "act-removeBoardMember": "премахна __member__ от __board__",
-    "act-restoredCard": "възстанови __card__ в __board__",
-    "act-unjoinMember": "премахна __member__ от __card__",
-    "act-withBoardTitle": "__board__",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__    ",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Действия",
    "activities": "Действия",
    "activity": "Дейности",
    "activity-added": "добави %s към %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s е преместена в Архива",
    "activity-attached": "прикачи %s към %s",
    "activity-created": "създаде %s",
    "activity-customfield-created": "създаде собствено поле %s",
@@ -47,15 +60,15 @@
    "activity-unchecked-item": "размаркира %s от списък със задачи %s на %s",
    "activity-checklist-added": "добави списък със задачи към %s",
    "activity-checklist-removed": "премахна списък със задачи от %s",
-    "activity-checklist-completed": "завърши списък със задачи %s на %s",
-    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "\"отзавърши\" чеклистта %s в %s",
    "activity-checklist-item-added": "добави точка към '%s' в/във %s",
-    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "activity-checklist-item-removed": "премахна точка от '%s' в %s",
    "add": "Добави",
-    "activity-checked-item-card": "checked %s in checklist %s",
-    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed the checklist %s",
-    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "activity-checked-item-card": "отбеляза %s в чеклист %s",
+    "activity-unchecked-item-card": "размаркира %s в чеклист %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "\"отзавърши\" чеклистта %s",
    "add-attachment": "Добави прикачен файл",
    "add-board": "Добави Табло",
    "add-card": "Добави карта",
@@ -79,19 +92,21 @@
    "and-n-other-card_plural": "И __count__ други карти",
    "apply": "Приложи",
    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
-    "archive": "Move to Archive",
-    "archive-all": "Move All to Archive",
-    "archive-board": "Move Board to Archive",
-    "archive-card": "Move Card to Archive",
-    "archive-list": "Move List to Archive",
-    "archive-swimlane": "Move Swimlane to Archive",
-    "archive-selection": "Move selection to Archive",
-    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archive": "Премести в Архива",
+    "archive-all": "Премести всички в Архива",
+    "archive-board": "Премести Таблото в Архива",
+    "archive-card": "Премести Картата в Архива",
+    "archive-list": "Премести Списъка в Архива",
+    "archive-swimlane": "Премести Коридора в Архива",
+    "archive-selection": "Премести избраното в Архива",
+    "archiveBoardPopup-title": "Да преместя ли Таблото в Архива?",
    "archived-items": "Архив",
-    "archived-boards": "Boards in Archive",
+    "archived-boards": "Табла в Архива",
    "restore-board": "Възстанови Таблото",
-    "no-archived-boards": "No Boards in Archive.",
+    "no-archived-boards": "Няма Табла в Архива.",
    "archives": "Архив",
+    "template": "Template",
+    "templates": "Templates",
    "assign-member": "Възложи на член от екипа",
    "attached": "прикачен",
    "attachment": "Прикаченн файл",
@@ -110,7 +125,7 @@
    "boardChangeTitlePopup-title": "Промени името на Таблото",
    "boardChangeVisibilityPopup-title": "Change Visibility",
    "boardChangeWatchPopup-title": "Промени наблюдаването",
-    "boardMenuPopup-title": "Меню на Таблото",
+    "boardMenuPopup-title": "Board Settings",
    "boards": "Табла",
    "board-view": "Board View",
    "board-view-cal": "Календар",
@@ -118,12 +133,12 @@
    "board-view-lists": "Списъци",
    "bucket-example": "Like “Bucket List” for example",
    "cancel": "Cancel",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "Тази карта е преместена в Архива.",
+    "board-archived": "Това табло е преместено в Архива.",
    "card-comments-title": "Тази карта има %s коментар.",
    "card-delete-notice": "Deleting is permanent. You will lose all actions associated with this card.",
    "card-delete-pop": "All actions will be removed from the activity feed and you won't be able to re-open the card. There is no undo.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "Можете да преместите картата в Архива, за да я премахнете от Таблото и така да запазите активността в него.",
    "card-due": "Готова за",
    "card-due-on": "Готова за",
    "card-spent": "Изработено време",
@@ -143,6 +158,7 @@
    "cardLabelsPopup-title": "Етикети",
    "cardMembersPopup-title": "Членове",
    "cardMorePopup-title": "Още",
+    "cardTemplatePopup-title": "Create template",
    "cards": "Карти",
    "cards-count": "Карти",
    "casSignIn": "Sign In with CAS",
@@ -166,17 +182,33 @@
    "clipboard": "Клипборда или с драг & дроп",
    "close": "Затвори",
    "close-board": "Затвори Таблото",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "Ще можете да възстановите Таблото като натиснете на бутона \"Архив\" в началото на хедъра.",
    "color-black": "черно",
    "color-blue": "синьо",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
    "color-green": "зелено",
+    "color-indigo": "indigo",
    "color-lime": "лайм",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
    "color-orange": "оранжево",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
    "color-pink": "розово",
+    "color-plum": "plum",
    "color-purple": "пурпурно",
    "color-red": "червено",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
    "color-sky": "светло синьо",
+    "color-slateblue": "slateblue",
+    "color-white": "бяло",
    "color-yellow": "жълто",
+    "unset-color": "Unset",
    "comment": "Коментирай",
    "comment-placeholder": "Напиши коментар",
    "comment-only": "Само коментар",
@@ -188,7 +220,7 @@
    "confirm-checklist-delete-dialog": "Сигурни ли сте, че искате да изтриете този чеклист?",
    "copy-card-link-to-clipboard": "Копирай връзката на картата в клипборда",
    "linkCardPopup-title": "Свържи картата",
-    "searchCardPopup-title": "Търсене на карта",
+    "searchElementPopup-title": "Търсене",
    "copyCardPopup-title": "Копирай картата",
    "copyChecklistToManyCardsPopup-title": "Копирай чеклисти в други карти",
    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -315,17 +347,19 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "Leave Board ?",
    "link-card": "Връзка към тази карта",
-    "list-archive-cards": "Move all cards in this list to Archive",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-archive-cards": "Премести всички карти от този списък в Архива",
+    "list-archive-cards-pop": "Това ще премахне всички карти от този Списък от Таблото. За да видите картите в Архива и да ги върнете натиснете на \"Меню\" > \"Архив\".",
    "list-move-cards": "Премести всички карти в този списък",
    "list-select-cards": "Избери всички карти в този списък",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Импорт на карта от Trello",
    "listMorePopup-title": "Още",
    "link-list": "Връзка към този списък",
    "list-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the list. There is no undo.",
-    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "Можете да преместите списъка в Архива, за да го премахнете от Таблото и така да запазите активността в него.",
    "lists": "Списъци",
    "swimlanes": "Коридори",
    "log-out": "Изход",
@@ -345,9 +379,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "Моите табла",
    "name": "Име",
-    "no-archived-cards": "No cards in Archive.",
-    "no-archived-lists": "No lists in Archive.",
-    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-archived-cards": "Няма карти в Архива.",
+    "no-archived-lists": "Няма списъци в Архива.",
+    "no-archived-swimlanes": "Няма коридори в Архива.",
    "no-results": "No results",
    "normal": "Normal",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -427,7 +461,7 @@
    "uploaded-avatar": "Качихте аватар",
    "username": "Потребителско име",
    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "внимание: тази карта е в списък в Архива",
    "watch": "Наблюдавай",
    "watching": "Наблюдава",
    "watching-info": "You will be notified of any change in this board",
@@ -435,6 +469,9 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Basics",
    "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
    "what-to-do": "What do you want to do?",
    "wipLimitErrorPopup-title": "Невалиден WIP лимит",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -446,7 +483,7 @@
    "disable-self-registration": "Disable Self-Registration",
    "invite": "Покани",
    "invite-people": "Покани хора",
-    "to-boards": "To board(s)",
+    "to-boards": "в табло/а",
    "email-addresses": "Имейл адреси",
    "smtp-host-description": "Адресът на SMTP сървъра, който обслужва Вашите имейли.",
    "smtp-port-description": "Портът, който Вашият SMTP сървър използва за изходящи имейли.",
@@ -480,6 +517,7 @@
    "OS_Totalmem": "ОС Общо памет",
    "OS_Type": "Тип ОС",
    "OS_Uptime": "OS Ъптайм",
+    "days": "дни",
    "hours": "часа",
    "minutes": "минути",
    "seconds": "секунди",
@@ -500,15 +538,19 @@
    "card-end-on": "Завършена на",
    "editCardReceivedDatePopup-title": "Промени датата на получаване",
    "editCardEndDatePopup-title": "Промени датата на завършване",
-    "assigned-by": "Assigned By",
-    "requested-by": "Requested By",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Разпределена от",
+    "requested-by": "Поискан от",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
-    "boardDeletePopup-title": "Delete Board?",
-    "delete-board": "Delete Board",
+    "boardDeletePopup-title": "Изтриване на Таблото?",
+    "delete-board": "Изтрий таблото",
    "default-subtasks-board": "Подзадачи за табло __board__",
    "default": "по подразбиране",
-    "queue": "Queue",
+    "queue": "Опашка",
    "subtask-settings": "Настройки на Подзадачите",
    "boardSubtaskSettingsPopup-title": "Настройки за Подзадачите за това Табло",
    "show-subtasks-field": "Картата може да има подзадачи",
@@ -523,40 +565,42 @@
    "parent-card": "Карта-източник",
    "source-board": "Source board",
    "no-parent": "Не показвай източника",
-    "activity-added-label": "added label '%s' to %s",
-    "activity-removed-label": "removed label '%s' from %s",
-    "activity-delete-attach": "deleted an attachment from %s",
-    "activity-added-label-card": "added label '%s'",
-    "activity-removed-label-card": "removed label '%s'",
-    "activity-delete-attach-card": "deleted an attachment",
+    "activity-added-label": "добави етикет '%s' към %s",
+    "activity-removed-label": "премахна етикет '%s' от %s",
+    "activity-delete-attach": "изтри прикачен файл от %s",
+    "activity-added-label-card": "добави етикет '%s'",
+    "activity-removed-label-card": "премахна етикет '%s'",
+    "activity-delete-attach-card": "изтри прикачения файл",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
    "r-rule": "Правило",
-    "r-add-trigger": "Add trigger",
-    "r-add-action": "Add action",
+    "r-add-trigger": "Добави спусък",
+    "r-add-action": "Добави действие",
    "r-board-rules": "Правила за таблото",
    "r-add-rule": "Добави правилото",
    "r-view-rule": "Виж правилото",
    "r-delete-rule": "Изтрий правилото",
    "r-new-rule-name": "Заглавие за новото правило",
    "r-no-rules": "Няма правила",
-    "r-when-a-card": "When a card",
-    "r-is": "is",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
-    "r-removed-from": "Removed from",
-    "r-the-board": "the board",
-    "r-list": "list",
+    "r-when-a-card": "Когато карта",
+    "r-is": "е",
+    "r-is-moved": "преместена",
+    "r-added-to": "добавена в",
+    "r-removed-from": "премахната от",
+    "r-the-board": "таблото",
+    "r-list": "списък",
    "set-filter": "Set Filter",
    "r-moved-to": "Moved to",
    "r-moved-from": "Moved from",
-    "r-archived": "Moved to Archive",
-    "r-unarchived": "Restored from Archive",
-    "r-a-card": "a card",
+    "r-archived": "Преместено в Архива",
+    "r-unarchived": "Възстановено от Архива",
+    "r-a-card": "карта",
    "r-when-a-label-is": "When a label is",
    "r-when-the-label-is": "When the label is",
    "r-list-name": "list name",
    "r-when-a-member": "When a member is",
    "r-when-the-member": "When the member",
-    "r-name": "name",
+    "r-name": "име",
    "r-when-a-attach": "When an attachment",
    "r-when-a-checklist": "When a checklist is",
    "r-when-the-checklist": "When the checklist",
@@ -566,18 +610,19 @@
    "r-when-the-item": "When the checklist item",
    "r-checked": "Checked",
    "r-unchecked": "Unchecked",
-    "r-move-card-to": "Move card to",
-    "r-top-of": "Top of",
-    "r-bottom-of": "Bottom of",
-    "r-its-list": "its list",
-    "r-archive": "Move to Archive",
-    "r-unarchive": "Restore from Archive",
-    "r-card": "card",
+    "r-move-card-to": "Премести картата в",
+    "r-top-of": "началото на",
+    "r-bottom-of": "края на",
+    "r-its-list": "списъка й",
+    "r-archive": "Премести в Архива",
+    "r-unarchive": "Възстанови от Архива",
+    "r-card": "карта",
    "r-add": "Добави",
    "r-remove": "Remove",
    "r-label": "label",
    "r-member": "member",
    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
    "r-checklist": "checklist",
    "r-check-all": "Check all",
    "r-uncheck-all": "Uncheck all",
@@ -598,8 +643,8 @@
    "r-d-send-email-to": "to",
    "r-d-send-email-subject": "subject",
    "r-d-send-email-message": "message",
-    "r-d-archive": "Move card to Archive",
-    "r-d-unarchive": "Restore card from Archive",
+    "r-d-archive": "Премести картата в Архива",
+    "r-d-unarchive": "Възстанови картата от Архива",
    "r-d-add-label": "Add label",
    "r-d-remove-label": "Remove label",
    "r-create-card": "Create new card",
@@ -613,14 +658,14 @@
    "r-d-check-one": "Check item",
    "r-d-uncheck-one": "Uncheck item",
    "r-d-check-of-list": "of checklist",
-    "r-d-add-checklist": "Add checklist",
-    "r-d-remove-checklist": "Remove checklist",
+    "r-d-add-checklist": "Добави чеклист",
+    "r-d-remove-checklist": "Премахни чеклист",
    "r-by": "by",
-    "r-add-checklist": "Add checklist",
-    "r-with-items": "with items",
-    "r-items-list": "item1,item2,item3",
-    "r-add-swimlane": "Add swimlane",
-    "r-swimlane-name": "swimlane name",
+    "r-add-checklist": "Добави чеклист",
+    "r-with-items": "с точки",
+    "r-items-list": "точка1,точка2,точка3",
+    "r-add-swimlane": "Добави коридор",
+    "r-swimlane-name": "име на коридора",
    "r-board-note": "Note: leave a field empty to match every possible value.",
    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
    "r-when-a-card-is-moved": "When a card is moved to another list",
@@ -635,5 +680,14 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -1,28 +1,41 @@
 {
    "accept": "Asantiñ",
    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "attached __attachment__ to __card__",
-    "act-addSubtask": "added subtask __checklist__ to __card__",
-    "act-addChecklist": "added checklist __checklist__ to __card__",
-    "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__",
-    "act-addComment": "commented on __card__: __comment__",
-    "act-createBoard": "created __board__",
-    "act-createCard": "added __card__ to __list__",
-    "act-createCustomField": "created custom field __customField__",
-    "act-createList": "added __list__ to __board__",
-    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
-    "act-importBoard": "imported __board__",
-    "act-importCard": "imported __card__",
-    "act-importList": "imported __list__",
-    "act-joinMember": "added __member__ to __card__",
-    "act-moveCard": "moved __card__ from __oldList__ to __list__",
-    "act-removeBoardMember": "removed __member__ from __board__",
-    "act-restoredCard": "restored __card__ to __board__",
-    "act-unjoinMember": "removed __member__ from __card__",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
    "act-withBoardTitle": "__board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Oberoù",
@@ -47,14 +60,14 @@
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
    "activity-checklist-added": "added checklist to %s",
    "activity-checklist-removed": "removed a checklist from %s",
-    "activity-checklist-completed": "completed the checklist %s of %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
    "activity-checklist-item-added": "added checklist item to '%s' in %s",
    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "Ouzhpenn",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed the checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Add Attachment",
    "add-board": "Add Board",
@@ -92,6 +105,8 @@
    "restore-board": "Restore Board",
    "no-archived-boards": "No Boards in Archive.",
    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
    "assign-member": "Assign member",
    "attached": "attached",
    "attachment": "Attachment",
@@ -110,7 +125,7 @@
    "boardChangeTitlePopup-title": "Rename Board",
    "boardChangeVisibilityPopup-title": "Change Visibility",
    "boardChangeWatchPopup-title": "Change Watch",
-    "boardMenuPopup-title": "Board Menu",
+    "boardMenuPopup-title": "Board Settings",
    "boards": "Boards",
    "board-view": "Board View",
    "board-view-cal": "Calendar",
@@ -143,6 +158,7 @@
    "cardLabelsPopup-title": "Labels",
    "cardMembersPopup-title": "Izili",
    "cardMorePopup-title": "Muioc’h",
+    "cardTemplatePopup-title": "Create template",
    "cards": "Kartennoù",
    "cards-count": "Kartennoù",
    "casSignIn": "Sign In with CAS",
@@ -169,14 +185,30 @@
    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
    "color-black": "du",
    "color-blue": "glas",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
    "color-green": "gwer",
+    "color-indigo": "indigo",
    "color-lime": "melen sitroñs",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
    "color-orange": "orañjez",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
    "color-pink": "roz",
+    "color-plum": "plum",
    "color-purple": "mouk",
    "color-red": "ruz",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
    "color-sky": "pers",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
    "color-yellow": "melen",
+    "unset-color": "Unset",
    "comment": "Comment",
    "comment-placeholder": "Write Comment",
    "comment-only": "Comment only",
@@ -188,7 +220,7 @@
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copy card link to clipboard",
    "linkCardPopup-title": "Link Card",
-    "searchCardPopup-title": "Search Card",
+    "searchElementPopup-title": "Search",
    "copyCardPopup-title": "Copy Card",
    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -319,8 +351,10 @@
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "List Actions",
    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "Import a Trello card",
    "listMorePopup-title": "Muioc’h",
    "link-list": "Link to this list",
@@ -435,6 +469,9 @@
    "welcome-swimlane": "Milestone 1",
    "welcome-list1": "Basics",
    "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
    "what-to-do": "What do you want to do?",
    "wipLimitErrorPopup-title": "Invalid WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -480,6 +517,7 @@
    "OS_Totalmem": "OS Total Memory",
    "OS_Type": "OS Type",
    "OS_Uptime": "OS Uptime",
+    "days": "days",
    "hours": "hours",
    "minutes": "minutes",
    "seconds": "seconds",
@@ -500,6 +538,10 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
    "assigned-by": "Assigned By",
    "requested-by": "Requested By",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
@@ -529,6 +571,8 @@
    "activity-added-label-card": "added label '%s'",
    "activity-removed-label-card": "removed label '%s'",
    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
    "r-rule": "Rule",
    "r-add-trigger": "Add trigger",
    "r-add-action": "Add action",
@@ -578,6 +622,7 @@
    "r-label": "label",
    "r-member": "member",
    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
    "r-checklist": "checklist",
    "r-check-all": "Check all",
    "r-uncheck-all": "Uncheck all",
@@ -635,5 +680,14 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -1,38 +1,51 @@
 {
    "accept": "Accepta",
-    "act-activity-notify": "Activity Notification",
-    "act-addAttachment": "adjuntat __attachment__ a __card__",
-    "act-addSubtask": "added subtask __checklist__ to __card__",
-    "act-addChecklist": "afegida la checklist _checklist__ a __card__",
-    "act-addChecklistItem": "afegit __checklistItem__ a la checklist __checklist__ on __card__",
-    "act-addComment": "comentat a __card__: __comment__",
-    "act-createBoard": "creat __board__",
-    "act-createCard": "afegit/da __card__ a __list__",
-    "act-createCustomField": "created custom field __customField__",
-    "act-createList": "afegit/da __list__ a __board__",
-    "act-addBoardMember": "afegit/da __member__ a __board__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
-    "act-importBoard": "__board__ importat",
-    "act-importCard": "__card__ importat",
-    "act-importList": "__list__ importat",
-    "act-joinMember": "afegit/da __member__ a __card__",
-    "act-moveCard": "mou __card__ de __oldList__ a __list__",
-    "act-removeBoardMember": "elimina __member__ de __board__",
-    "act-restoredCard": "recupera __card__ a __board__",
-    "act-unjoinMember": "elimina __member__ de __card__",
-    "act-withBoardTitle": "__board__",
-    "act-withCardTitle": "[__board__] __card__",
+    "act-activity-notify": "Notificació d'activitat",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__tauler__",
+    "act-withCardTitle": "[__tauler__] __fitxa__",
    "actions": "Accions",
    "activities": "Activitats",
    "activity": "Activitat",
    "activity-added": "ha afegit %s a %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s mogut al Arxiu",
    "activity-attached": "ha adjuntat %s a %s",
    "activity-created": "ha creat %s",
-    "activity-customfield-created": "created custom field %s",
+    "activity-customfield-created": "camp personalitzat creat %s",
    "activity-excluded": "ha exclòs %s de %s",
    "activity-imported": "importat %s dins %s des de %s",
    "activity-imported-board": "importat %s des de %s",
@@ -47,22 +60,22 @@
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
    "activity-checklist-added": "Checklist afegida a %s",
    "activity-checklist-removed": "removed a checklist from %s",
-    "activity-checklist-completed": "completed the checklist %s of %s",
+    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
    "activity-checklist-item-added": "afegida entrada de checklist de '%s' a %s",
    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
    "add": "Afegeix",
    "activity-checked-item-card": "checked %s in checklist %s",
    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "completed the checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Afegeix adjunt",
    "add-board": "Afegeix Tauler",
-    "add-card": "Afegeix fitxa",
+    "add-card": "Afegeix Fitxa",
    "add-swimlane": "Afegix Carril de Natació",
-    "add-subtask": "Add Subtask",
+    "add-subtask": "Afegir Subtasca",
    "add-checklist": "Afegeix checklist",
-    "add-checklist-item": "Afegeix un ítem",
+    "add-checklist-item": "Afegeix un ítem al checklist",
    "add-cover": "Afegeix coberta",
    "add-label": "Afegeix etiqueta",
    "add-list": "Afegeix llista",
@@ -70,56 +83,58 @@
    "added": "Afegit",
    "addMemberPopup-title": "Membres",
    "admin": "Administrador",
-    "admin-desc": "Pots veure i editar fitxes, eliminar membres, i canviar la configuració del tauler",
-    "admin-announcement": "Bàndol",
-    "admin-announcement-active": "Activar bàndol del Sistema",
-    "admin-announcement-title": "Bàndol de l'administració",
+    "admin-desc": "Pots veure i editar fitxes, eliminar usuaris, i canviar la configuració del tauler.",
+    "admin-announcement": "Alertes",
+    "admin-announcement-active": "Activar alertes del Sistema",
+    "admin-announcement-title": "Alertes d'administració",
    "all-boards": "Tots els taulers",
    "and-n-other-card": "And __count__ other card",
    "and-n-other-card_plural": "And __count__ other cards",
    "apply": "Aplica",
    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
-    "archive": "Move to Archive",
-    "archive-all": "Move All to Archive",
-    "archive-board": "Move Board to Archive",
-    "archive-card": "Move Card to Archive",
-    "archive-list": "Move List to Archive",
+    "archive": "Moure al arxiu",
+    "archive-all": "Moure tot al arxiu",
+    "archive-board": "Moure Tauler al Arxiu",
+    "archive-card": "Moure Fitxa al Arxiu",
+    "archive-list": "Moure Llista al Arxiu",
    "archive-swimlane": "Move Swimlane to Archive",
-    "archive-selection": "Move selection to Archive",
-    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archive-selection": "Moure selecció al Arxiu",
+    "archiveBoardPopup-title": "Moure el Tauler al Arxiu?",
    "archived-items": "Desa",
-    "archived-boards": "Boards in Archive",
+    "archived-boards": "Taulers al Arxiu",
    "restore-board": "Restaura Tauler",
-    "no-archived-boards": "No Boards in Archive.",
+    "no-archived-boards": "No hi han Taulers al Arxiu.",
    "archives": "Desa",
+    "template": "Template",
+    "templates": "Templates",
    "assign-member": "Assignar membre",
    "attached": "adjuntat",
    "attachment": "Adjunt",
    "attachment-delete-pop": "L'esborrat d'un arxiu adjunt és permanent. No es pot desfer.",
    "attachmentDeletePopup-title": "Esborrar adjunt?",
    "attachments": "Adjunts",
-    "auto-watch": "Automàticament segueix el taulers quan són creats",
+    "auto-watch": "Segueix automàticament el taulers quan són creats",
    "avatar-too-big": "L'avatar es massa gran (70KM max)",
    "back": "Enrere",
    "board-change-color": "Canvia el color",
    "board-nb-stars": "%s estrelles",
    "board-not-found": "No s'ha trobat el tauler",
-    "board-private-info": "Aquest tauler serà <strong> privat </ strong>.",
-    "board-public-info": "Aquest tauler serà <strong> públic </ strong>.",
-    "boardChangeColorPopup-title": "Canvia fons",
+    "board-private-info": "Aquest tauler serà <strong> privat.",
+    "board-public-info": "Aquest tauler serà <strong> públic.",
+    "boardChangeColorPopup-title": "Canvia fons del tauler",
    "boardChangeTitlePopup-title": "Canvia el nom tauler",
    "boardChangeVisibilityPopup-title": "Canvia visibilitat",
    "boardChangeWatchPopup-title": "Canvia seguiment",
-    "boardMenuPopup-title": "Menú del tauler",
+    "boardMenuPopup-title": "Board Settings",
    "boards": "Taulers",
    "board-view": "Visió del tauler",
-    "board-view-cal": "Calendar",
+    "board-view-cal": "Calendari",
    "board-view-swimlanes": "Carrils de Natació",
    "board-view-lists": "Llistes",
    "bucket-example": "Igual que “Bucket List”,  per exemple",
    "cancel": "Cancel·la",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "Aquesta fitxa ha estat moguda al Arxiu.",
+    "board-archived": "Aquest tauler s'ha mogut al arxiu",
    "card-comments-title": "Aquesta fitxa té %s comentaris.",
    "card-delete-notice": "L'esborrat és permanent. Perdreu totes les accions associades a aquesta fitxa.",
    "card-delete-pop": "Totes les accions s'eliminaran de l'activitat i no podreu tornar a obrir la fitxa. No es pot desfer.",
@@ -128,7 +143,7 @@
    "card-due-on": "Finalitza a",
    "card-spent": "Temps Dedicat",
    "card-edit-attachments": "Edita arxius adjunts",
-    "card-edit-custom-fields": "Edit custom fields",
+    "card-edit-custom-fields": "Editar camps personalitzats",
    "card-edit-labels": "Edita etiquetes",
    "card-edit-members": "Edita membres",
    "card-labels-title": "Canvia les etiquetes de la fitxa",
@@ -136,17 +151,18 @@
    "card-start": "Comença",
    "card-start-on": "Comença a",
    "cardAttachmentsPopup-title": "Adjunta des de",
-    "cardCustomField-datePopup-title": "Change date",
-    "cardCustomFieldsPopup-title": "Edit custom fields",
+    "cardCustomField-datePopup-title": "Canviar data",
+    "cardCustomFieldsPopup-title": "Editar camps personalitzats",
    "cardDeletePopup-title": "Esborrar fitxa?",
    "cardDetailsActionsPopup-title": "Accions de fitxes",
    "cardLabelsPopup-title": "Etiquetes",
    "cardMembersPopup-title": "Membres",
    "cardMorePopup-title": "Més",
+    "cardTemplatePopup-title": "Create template",
    "cards": "Fitxes",
    "cards-count": "Fitxes",
    "casSignIn": "Sign In with CAS",
-    "cardType-card": "Card",
+    "cardType-card": "Fitxa",
    "cardType-linkedCard": "Linked Card",
    "cardType-linkedBoard": "Linked Board",
    "change": "Canvia",
@@ -159,7 +175,7 @@
    "changePasswordPopup-title": "Canvia la contrasenya",
    "changePermissionsPopup-title": "Canvia permisos",
    "changeSettingsPopup-title": "Canvia configuració",
-    "subtasks": "Subtasks",
+    "subtasks": "Subtasca",
    "checklists": "Checklists",
    "click-to-star": "Fes clic per destacar aquest tauler.",
    "click-to-unstar": "Fes clic per deixar de destacar aquest tauler.",
@@ -169,26 +185,42 @@
    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
    "color-black": "negre",
    "color-blue": "blau",
+    "color-crimson": "carmesí",
+    "color-darkgreen": "verd fosc",
+    "color-gold": "daurat",
+    "color-gray": "gris",
    "color-green": "verd",
+    "color-indigo": "índigo",
    "color-lime": "llima",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "marina",
    "color-orange": "taronja",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
    "color-pink": "rosa",
+    "color-plum": "pruna",
    "color-purple": "púrpura",
    "color-red": "vermell",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "plata",
    "color-sky": "cel",
+    "color-slateblue": "slateblue",
+    "color-white": "blanc",
    "color-yellow": "groc",
+    "unset-color": "Unset",
    "comment": "Comentari",
    "comment-placeholder": "Escriu un comentari",
    "comment-only": "Només comentaris",
    "comment-only-desc": "Només pots fer comentaris a les fitxes",
-    "no-comments": "No comments",
+    "no-comments": "Sense comentaris",
    "no-comments-desc": "Can not see comments and activities.",
    "computer": "Ordinador",
-    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
+    "confirm-subtask-delete-dialog": "Esteu segur que voleu eliminar la subtasca?",
    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
    "copy-card-link-to-clipboard": "Copia l'enllaç de la ftixa al porta-retalls",
    "linkCardPopup-title": "Link Card",
-    "searchCardPopup-title": "Search Card",
+    "searchElementPopup-title": "Cerca",
    "copyCardPopup-title": "Copia la fitxa",
    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
    "copyChecklistToManyCardsPopup-instructions": "Títols de fitxa i Descripcions de destí en aquest format JSON",
@@ -197,20 +229,20 @@
    "createBoardPopup-title": "Crea tauler",
    "chooseBoardSourcePopup-title": "Importa Tauler",
    "createLabelPopup-title": "Crea etiqueta",
-    "createCustomField": "Create Field",
-    "createCustomFieldPopup-title": "Create Field",
+    "createCustomField": "Crear camp",
+    "createCustomFieldPopup-title": "Crear camp",
    "current": "Actual",
    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
    "custom-field-checkbox": "Checkbox",
    "custom-field-date": "Data",
    "custom-field-dropdown": "Dropdown List",
    "custom-field-dropdown-none": "(none)",
-    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options": "Llista d'opcions",
    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
    "custom-field-dropdown-unknown": "(unknown)",
    "custom-field-number": "Number",
    "custom-field-text": "Text",
-    "custom-fields": "Custom Fields",
+    "custom-fields": "Camps Personalitzats",
    "date": "Data",
    "decline": "Declina",
    "default-avatar": "Avatar per defecte",
@@ -230,7 +262,7 @@
    "soft-wip-limit": "Soft WIP Limit",
    "editCardStartDatePopup-title": "Canvia data d'inici",
    "editCardDueDatePopup-title": "Canvia data de finalització",
-    "editCustomFieldPopup-title": "Edit Field",
+    "editCustomFieldPopup-title": "Modificar camp",
    "editCardSpentTimePopup-title": "Canvia temps dedicat",
    "editLabelPopup-title": "Canvia etiqueta",
    "editNotificationPopup-title": "Edita la notificació",
@@ -271,7 +303,7 @@
    "filter-on": "Filtra per",
    "filter-on-desc": "Estau filtrant fitxes en aquest tauler. Feu clic aquí per editar el filtre.",
    "filter-to-selection": "Filtra selecció",
-    "advanced-filter-label": "Advanced Filter",
+    "advanced-filter-label": "Filtre avançat",
    "advanced-filter-description": "Advanced Filter allows to write a string containing following operators: == != <= >= && || ( ) A space is used as a separator between the Operators. You can filter for all Custom Fields by typing their names and values. For Example: Field1 == Value1. Note: If fields or values contains spaces, you need to encapsulate them into single quotes. For Example: 'Field 1' == 'Value 1'. For single control characters (' \\/) to be skipped, you can use \\. For example: Field1 == I\\'m. Also you can combine multiple conditions. For Example: F1 == V1 || F1 == V2. Normally all operators are interpreted from left to right. You can change the order by placing brackets. For Example: F1 == V1 && ( F2 == V2 || F2 == V3 ). Also you can search text fields using regex: F1 == /Tes.*/i",
    "fullname": "Nom complet",
    "header-logo-title": "Torna a la teva pàgina de taulers",
@@ -279,7 +311,7 @@
    "headerBarCreateBoardPopup-title": "Crea tauler",
    "home": "Inici",
    "import": "importa",
-    "link": "Link",
+    "link": "Enllaç",
    "import-board": "Importa tauler",
    "import-board-c": "Importa tauler",
    "import-board-title-trello": "Importa tauler des de Trello",
@@ -296,7 +328,7 @@
    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
    "import-show-user-mapping": "Revisa l'assignació de membres",
    "import-user-select": "Pick your existing user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select member",
+    "importMapMembersAddPopup-title": "Selecciona un usuari",
    "info": "Versió",
    "initials": "Inicials",
    "invalid-date": "Data invàlida",
@@ -315,12 +347,14 @@
    "leave-board-pop": "De debò voleu abandonar __boardTitle__? Se us eliminarà de totes les fitxes d'aquest tauler.",
    "leaveBoardPopup-title": "Abandonar Tauler?",
    "link-card": "Enllaç a aquesta fitxa",
-    "list-archive-cards": "Move all cards in this list to Archive",
+    "list-archive-cards": "Moure totes les fitxes en aquesta llista al Arxiu",
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "Mou totes les fitxes d'aquesta llista",
    "list-select-cards": "Selecciona totes les fitxes d'aquesta llista",
+    "set-color-list": "Set Color",
    "listActionPopup-title": "Accions de la llista",
    "swimlaneActionPopup-title": "Accions de Carril de Natació",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
    "listImportCardPopup-title": "importa una fitxa de Trello",
    "listMorePopup-title": "Més",
    "link-list": "Enllaça a aquesta llista",
@@ -345,8 +379,8 @@
    "muted-info": "No seràs notificat dels canvis en aquest tauler",
    "my-boards": "Els meus taulers",
    "name": "Nom",
-    "no-archived-cards": "No cards in Archive.",
-    "no-archived-lists": "No lists in Archive.",
+    "no-archived-cards": "No hi ha fitxes a l'arxiu.",
+    "no-archived-lists": "No hi ha llistes al arxiu.",
    "no-archived-swimlanes": "No swimlanes in Archive.",
    "no-results": "Sense resultats",
    "normal": "Normal",
@@ -383,7 +417,7 @@
    "restore": "Restaura",
    "save": "Desa",
    "search": "Cerca",
-    "rules": "Rules",
+    "rules": "Regles",
    "search-cards": "Cerca títols de fitxa i descripcions en aquest tauler",
    "search-example": "Text que cercar?",
    "select-color": "Selecciona color",
@@ -418,7 +452,7 @@
    "title": "Títol",
    "tracking": "En seguiment",
    "tracking-info": "Seràs notificat per cada canvi a aquelles fitxes de les que n'eres creador o membre",
-    "type": "Type",
+    "type": "Tipus",
    "unassign-member": "Desassignar membre",
    "unsaved-description": "Tens una descripció sense desar.",
    "unwatch": "Suprimeix observació",
@@ -435,6 +469,9 @@
    "welcome-swimlane": "Objectiu 1",
    "welcome-list1": "Bàsics",
    "welcome-list2": "Avançades",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
    "what-to-do": "Què vols fer?",
    "wipLimitErrorPopup-title": "Límit de Treball en Progrès invàlid",
    "wipLimitErrorPopup-dialog-pt1": "El nombre de tasques en esta llista és superior al límit de Treball en Progrès que heu definit.",
@@ -453,7 +490,7 @@
    "smtp-tls-description": "Activa suport TLS pel servidor SMTP",
    "smtp-host": "Servidor SMTP",
    "smtp-port": "Port SMTP",
-    "smtp-username": "Nom d'Usuari",
+    "smtp-username": "Nom d'usuari",
    "smtp-password": "Contrasenya",
    "smtp-tls": "Suport TLS",
    "send-from": "De",
@@ -480,6 +517,7 @@
    "OS_Totalmem": "Memòria total",
    "OS_Type": "Tipus de SO",
    "OS_Uptime": "Temps d'activitat",
+    "days": "days",
    "hours": "hores",
    "minutes": "minuts",
    "seconds": "segons",
@@ -500,8 +538,12 @@
    "card-end-on": "Ends on",
    "editCardReceivedDatePopup-title": "Change received date",
    "editCardEndDatePopup-title": "Change end date",
-    "assigned-by": "Assigned By",
-    "requested-by": "Requested By",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assignat Per",
+    "requested-by": "Demanat Per",
    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
    "delete-board-confirm-popup": "All lists, cards, labels, and activities will be deleted and you won't be able to recover the board contents. There is no undo.",
    "boardDeletePopup-title": "Delete Board?",
@@ -529,15 +571,17 @@
    "activity-added-label-card": "added label '%s'",
    "activity-removed-label-card": "removed label '%s'",
    "activity-delete-attach-card": "deleted an attachment",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
    "r-rule": "Rule",
    "r-add-trigger": "Add trigger",
    "r-add-action": "Add action",
-    "r-board-rules": "Board rules",
+    "r-board-rules": "Regles del tauler",
    "r-add-rule": "Add rule",
    "r-view-rule": "View rule",
    "r-delete-rule": "Delete rule",
    "r-new-rule-name": "New rule title",
-    "r-no-rules": "No rules",
+    "r-no-rules": "No hi han regles",
    "r-when-a-card": "When a card",
    "r-is": "is",
    "r-is-moved": "is moved",
@@ -570,7 +614,7 @@
    "r-top-of": "Top of",
    "r-bottom-of": "Bottom of",
    "r-its-list": "its list",
-    "r-archive": "Move to Archive",
+    "r-archive": "Moure al arxiu",
    "r-unarchive": "Restore from Archive",
    "r-card": "card",
    "r-add": "Afegeix",
@@ -578,6 +622,7 @@
    "r-label": "label",
    "r-member": "member",
    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
    "r-checklist": "checklist",
    "r-check-all": "Check all",
    "r-uncheck-all": "Uncheck all",
@@ -635,5 +680,14 @@
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -1,35 +1,48 @@
 {
    "accept": "Přijmout",
    "act-activity-notify": "Notifikace aktivit",
-    "act-addAttachment": "přiložen __attachment__ do __card__",
-    "act-addSubtask": "added subtask __checklist__ to __card__",
-    "act-addChecklist": "přidán checklist __checklist__ do __card__",
-    "act-addChecklistItem": "přidán __checklistItem__ do checklistu __checklist__ v __card__",
-    "act-addComment": "komentář k __card__: __comment__",
-    "act-createBoard": "přidání __board__",
-    "act-createCard": "přidání __card__ do __list__",
-    "act-createCustomField": "vytvořeno vlastní pole __customField__",
-    "act-createList": "přidání __list__ do __board__",
-    "act-addBoardMember": "přidání __member__ do __board__",
-    "act-archivedBoard": "__board__ moved to Archive",
-    "act-archivedCard": "__card__ moved to Archive",
-    "act-archivedList": "__list__ moved to Archive",
-    "act-archivedSwimlane": "__swimlane__ moved to Archive",
-    "act-importBoard": "import __board__",
-    "act-importCard": "import __card__",
-    "act-importList": "import __list__",
-    "act-joinMember": "přidání __member__ do __card__",
-    "act-moveCard": "přesun __card__ z __oldList__ do __list__",
-    "act-removeBoardMember": "odstranění __member__ z __board__",
-    "act-restoredCard": "obnovení __card__ do __board__",
-    "act-unjoinMember": "odstranění __member__ z __card__",
+    "act-addAttachment": "přidal(a) přílohu __attachment__ na kartu __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-deleteAttachment": "smazal(a) přílohu __attachment__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addSubtask": "přidal(a) podúkol __subtask__ na kartu __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addLabel": "Přídán štítek __label__ na kartu __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addedLabel": "Přídán štítek __label__ na kartu __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-removeLabel": "Odstraněn štítek __label__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-removedLabel": "Odstraněn štítek __label__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addChecklist": "přidal(a) zaškrtávací seznam __checklist__ na kartu __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addChecklistItem": "přidal(a) položku zaškrtávacího seznamu __checklistItem__ do zaškrtávacího seznamu __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-removeChecklist": "smazal(a) zaškrtávací seznam __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-removeChecklistItem": "smazal(a) položku zaškrtávacího seznamu __checklistItem__ ze zaškrtávacího seznamu __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-checkedItem": "zaškrtl(a) __checklistItem__ na zaškrtávacím seznamu __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-uncheckedItem": "zrušil(a) zaškrtnutí __checklistItem__ na zaškrtávacím seznamu __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-completeChecklist": "dokončil(a) zaškrtávací seznam __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-uncompleteChecklist": "zrušil(a) dokončení zaškrtávacího seznamu __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-addComment": "přidal(a) komentář na kartě __card__: __comment__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-createBoard": "přidal(a) tablo __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "přidal(a) kartu __card__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-createCustomField": "vytvořil(a) vlastní pole __customField__  na kartu __card__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-createList": "přidal(a) sloupec __list__ do tabla __board__",
+    "act-addBoardMember": "přidal(a) člena __member__ do tabla __board__",
+    "act-archivedBoard": "Tablo __board__ přesunuto do Archivu",
+    "act-archivedCard": "Karta __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__ přesunuta do Archivu",
+    "act-archivedList": "Sloupec __list__ ve swimlane __swimlane__ na tablu __board__ přesunut do Archivu",
+    "act-archivedSwimlane": "Swimlane __swimlane__ na tablu __board__ přesunut do Archivu",
+    "act-importBoard": "importoval(a) tablo __board__",
+    "act-importCard": "importoval(a) karta __card__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-importList": "importoval(a) sloupec __list__ do swimlane __swimlane__ na tablu __board__",
+    "act-joinMember": "přidal(a) člena __member__ na kartu __card__ v seznamu __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "přesunul(a) kartu __card__ ze sloupce __oldList__ ve swimlane __oldSwimlane__ na tablu __oldBoard__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-removeBoardMember": "odstranil(a) člena __member__ z tabla __board__",
+    "act-restoredCard": "obnovil(a) kartu __card__ do sloupce __list__ ve swimlane __swimlane__ na tablu __board__",
+    "act-unjoinMember": "odstranil(a) člena __member__ z karty __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
    "act-withBoardTitle": "__board__",
    "act-withCardTitle": "[__board__] __card__",
    "actions": "Akce",
    "activities": "Aktivity",
    "activity": "Aktivita",
    "activity-added": "%s přidáno k %s",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%s bylo přesunuto do archivu",
    "activity-attached": "přiloženo %s k %s",
    "activity-created": "%s vytvořeno",
    "activity-customfield-created": "vytvořeno vlastní pole %s",
@@ -42,20 +55,20 @@
    "activity-removed": "odstraněn %s z %s",
    "activity-sent": "%s posláno na %s",
    "activity-unjoined": "odpojen %s",
-    "activity-subtask-added": "added subtask to %s",
-    "activity-checked-item": "checked %s in checklist %s of %s",
-    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
+    "activity-subtask-added": "podúkol přidán do %s",
+    "activity-checked-item": "dokončen %s v seznamu %s z %s",
+    "activity-unchecked-item": "nedokončen %s v seznamu %s z %s",
    "activity-checklist-added": "přidán checklist do %s",
    "activity-checklist-removed": "odstraněn checklist z %s",
-    "activity-checklist-completed": "completed the checklist %s of %s",
-    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-completed": "dokončil(a) zaškrtávací seznam __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "activity-checklist-uncompleted": "nedokončen seznam %s z %s",
    "activity-checklist-item-added": "přidána položka checklist do '%s' v %s",
-    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "activity-checklist-item-removed": "odstraněna položka seznamu do '%s' v %s",
    "add": "Přidat",
-    "activity-checked-item-card": "checked %s in checklist %s",
-    "activity-unchecked-item-card": "unchecked %s in checklist %s",
-    "activity-checklist-completed-card": "dokončen checklist %s",
-    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "activity-checked-item-card": "dokončen %s v seznamu %s",
+    "activity-unchecked-item-card": "nedokončen %s v seznamu %s",
+    "activity-checklist-completed-card": "dokončil(a) zaškrtávací seznam __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__",
+    "activity-checklist-uncompleted-card": "nedokončený seznam %s",
    "add-attachment": "Přidat přílohu",
    "add-board": "Přidat tablo",
    "add-card": "Přidat kartu",
@@ -79,19 +92,21 @@
    "and-n-other-card_plural": "A __count__ dalších karet",
    "apply": "Použít",
    "app-is-offline": "Načítá se, prosím čekejte. Obnovení stránky způsobí ztrátu dat. Pokud se načítání nedaří, zkontrolujte prosím server.",
-    "archive": "Move to Archive",
-    "archive-all": "Move All to Archive",
-    "archive-board": "Move Board to Archive",
-    "archive-card": "Move Card to Archive",
-    "archive-list": "Move List to Archive",
-    "archive-swimlane": "Move Swimlane to Archive",
-    "archive-selection": "Move selection to Archive",
-    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archive": "Přesunout do archivu",
+    "archive-all": "Přesunout vše do archivu",
+    "archive-board": "Přesunout tablo do archivu",
+    "archive-card": "Přesunout kartu do archivu",
+    "archive-list": "Přesunout seznam do archivu",
+    "archive-swimlane": "Přesunout swimlane do archivu",
+    "archive-selection": "Přesunout výběr do archivu",
+    "archiveBoardPopup-title": "Přesunout tablo do archivu?",
    "archived-items": "Archiv",
-    "archived-boards": "Boards in Archive",
+    "archived-boards": "Tabla v archivu",
    "restore-board": "Obnovit tablo",
-    "no-archived-boards": "No Boards in Archive.",
+    "no-archived-boards": "V archivu nejsou žádná tabla.",
    "archives": "Archiv",
+    "template": "Šablona",
+    "templates": "Šablony",
    "assign-member": "Přiřadit člena",
    "attached": "přiloženo",
    "attachment": "Příloha",
@@ -110,7 +125,7 @@
    "boardChangeTitlePopup-title": "Přejmenovat tablo",
    "boardChangeVisibilityPopup-title": "Upravit viditelnost",
    "boardChangeWatchPopup-title": "Změnit sledování",
-    "boardMenuPopup-title": "Menu tabla",
+    "boardMenuPopup-title": "Nastavení Tabla",
    "boards": "Tabla",
    "board-view": "Náhled tabla",
    "board-view-cal": "Kalendář",
@@ -118,12 +133,12 @@
    "board-view-lists": "Sloupce",
    "bucket-example": "Například \"O čem sním\"",
    "cancel": "Zrušit",
-    "card-archived": "This card is moved to Archive.",
-    "board-archived": "This board is moved to Archive.",
+    "card-archived": "Karta byla přesunuta do archivu.",
+    "board-archived": "Toto tablo je přesunuto do archivu.",
    "card-comments-title": "Tato karta má %s komentářů.",
    "card-delete-notice": "Smazání je trvalé. Přijdete o všechny akce asociované s touto kartou.",
    "card-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu obnovit. Toto nelze vrátit zpět.",
-    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "Můžete přesunout kartu do archivu pro odstranění z tabla a zachovat aktivitu.",
    "card-due": "Termín",
    "card-due-on": "Do",
    "card-spent": "Strávený čas",
@@ -143,9 +158,10 @@
    "cardLabelsPopup-title": "Štítky",
    "cardMembersPopup-title": "Členové",
    "cardMorePopup-title": "Více",
+    "cardTemplatePopup-title": "Vytvořit šablonu",
    "cards": "Karty",
    "cards-count": "Karty",
-    "casSignIn": "Sign In with CAS",
+    "casSignIn": "Přihlásit pomocí CAS",
    "cardType-card": "Karta",
    "cardType-linkedCard": "Propojená karta",
    "cardType-linkedBoard": "Propojené tablo",
@@ -159,36 +175,52 @@
    "changePasswordPopup-title": "Změnit heslo",
    "changePermissionsPopup-title": "Změnit oprávnění",
    "changeSettingsPopup-title": "Změnit nastavení",
-    "subtasks": "Subtasks",
+    "subtasks": "Podúkol",
    "checklists": "Checklisty",
    "click-to-star": "Kliknutím přidat hvězdičku tomuto tablu.",
    "click-to-unstar": "Kliknutím odebrat hvězdičku tomuto tablu.",
    "clipboard": "Schránka nebo potáhnout a pustit",
    "close": "Zavřít",
    "close-board": "Zavřít tablo",
-    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
+    "close-board-pop": "Budete moci obnovit tablo kliknutím na tlačítko \"Archiv\" v hlavním menu.",
    "color-black": "černá",
    "color-blue": "modrá",
+    "color-crimson": "karmínová",
+    "color-darkgreen": "tmavě zelená",
+    "color-gold": "zlatá",
+    "color-gray": "šedá",
    "color-green": "zelená",
+    "color-indigo": "indigo",
    "color-lime": "světlezelená",
+    "color-magenta": "purpurová",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "tmavě modrá",
    "color-orange": "oranžová",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
    "color-pink": "růžová",
+    "color-plum": "švestková",
    "color-purple": "fialová",
    "color-red": "červená",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "stříbrná",
    "color-sky": "nebeská",
+    "color-slateblue": "slateblue",
+    "color-white": "bílá",
    "color-yellow": "žlutá",
+    "unset-color": "Nenastaveno",
    "comment": "Komentář",
    "comment-placeholder": "Text komentáře",
    "comment-only": "Pouze komentáře",
    "comment-only-desc": "Může přidávat komentáře pouze do karet.",
    "no-comments": "Žádné komentáře",
-    "no-comments-desc": "Can not see comments and activities.",
+    "no-comments-desc": "Nemůže vidět komentáře a aktivity",
    "computer": "Počítač",
    "confirm-subtask-delete-dialog": "Opravdu chcete smazat tento podúkol?",
    "confirm-checklist-delete-dialog": "Opravdu chcete smazat tento checklist?",
    "copy-card-link-to-clipboard": "Kopírovat adresu karty do mezipaměti",
    "linkCardPopup-title": "Propojit kartu",
-    "searchCardPopup-title": "Hledat Kartu",
+    "searchElementPopup-title": "Hledat",
    "copyCardPopup-title": "Kopírovat kartu",
    "copyChecklistToManyCardsPopup-title": "Kopírovat checklist do více karet",
    "copyChecklistToManyCardsPopup-instructions": "Názvy a popisy cílové karty v tomto formátu JSON",
@@ -284,13 +316,13 @@
    "import-board-c": "Importovat tablo",
    "import-board-title-trello": "Import board from Trello",
    "import-board-title-wekan": "Importovat tablo z předchozího exportu",
-    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-backup-warning": "Nemažte data, která importujete z původního exportovaného tabla nebo Trello předtím, nežli zkontrolujete, jestli lze tuto část zavřít a znovu otevřít nebo jestli se Vám nezobrazuje chyba tabla, což znamená ztrátu dat.",
    "import-sandstorm-warning": "Importované tablo spaže všechny existující data v tablu a nahradí je importovaným tablem.",
    "from-trello": "Z Trella",
    "from-wekan": "Z předchozího exportu",
    "import-board-instruction-trello": "Na svém Trello tablu, otevři 'Menu', pak 'More', 'Print and Export', 'Export JSON', a zkopíruj výsledný text",
    "import-board-instruction-wekan": "Ve vašem tablu jděte do 'Menu', klikněte na 'Exportovat tablo' a zkopírujte text ze staženého souboru.",
-    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-board-instruction-about-errors": "Někdy import funguje i přestože dostáváte chyby při importování tabla, které se zobrazí na stránce Všechna tabla.",
    "import-json-placeholder": "Sem vlož validní JSON data",
    "import-map-members": "Mapovat členy",
    "import-members-map": "Toto importované tablo obsahuje několik osob. Prosím namapujte osoby z importu na místní uživatelské účty.",
@@ -315,17 +347,19 @@
    "leave-board-pop": "Opravdu chcete opustit tablo __boardTitle__? Odstraníte se tím i ze všech karet v tomto tablu.",
    "leaveBoardPopup-title": "Opustit tablo?",
    "link-card": "Odkázat na tuto kartu",
-    "list-archive-cards": "Move all cards in this list to Archive",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
+    "list-archive-cards": "Přesunout všechny karty v tomto seznamu do archivu.",
+    "list-archive-cards-pop": "Toto odstraní z tabla všechny karty z tohoto seznamu. Pro zobrazení karet v Archivu a jejich opětovné obnovení, klikni v \"Menu\" > \"Archiv\".",
    "list-move-cards": "Přesunout všechny karty v tomto sloupci",
    "list-select-cards": "Vybrat všechny karty v tomto sloupci",
+    "set-color-list": "Nastavit barvu",
    "listActionPopup-title": "Vypsat akce",
    "swimlaneActionPopup-title": "Akce swimlane",
+    "swimlaneAddPopup-title": "Přidat swimlane dolů",
    "listImportCardPopup-title": "Importovat Trello kartu",
    "listMorePopup-title": "Více",
    "link-list": "Odkaz na tento sloupec",
    "list-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné sloupec obnovit. Toto nelze vrátit zpět.",
-    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "Seznam můžete přesunout do archivu, abyste jej odstranili z tabla a zachovali si svou aktivitu.",
    "lists": "Sloupce",
    "swimlanes": "Swimlanes",
    "log-out": "Odhlásit",
@@ -345,9 +379,9 @@
    "muted-info": "Nikdy nedostanete oznámení o změně v tomto tablu.",
    "my-boards": "Moje tabla",
    "name": "Jméno",
-    "no-archived-cards": "No cards in Archive.",
-    "no-archived-lists": "No lists in Archive.",
-    "no-archived-swimlanes": "No swimlanes in Archive.",
+    "no-archived-cards": "V archivu nejsou žádné karty.",
+    "no-archived-lists": "V archivu nejsou žádné seznamy.",
+    "no-archived-swimlanes": "V archivu nejsou žádné swimlanes.",
    "no-results": "Žádné výsledky",
    "normal": "Normální",
    "normal-desc": "Může zobrazovat a upravovat karty. Nemůže měnit nastavení.",
@@ -427,7 +461,7 @@
    "uploaded-avatar": "Avatar nahrán",
    "username": "Uživatelské jméno",
    "view-it": "Zobrazit",
-    "warn-list-archived": "warning: this card is in an list at Archive",
+    "warn-list-archived": "varování: tato karta je v seznamu v Archivu",
    "watch": "Sledovat",
    "watching": "Sledující",
    "watching-info": "Bude vám oznámena každá změna v tomto tablu",
@@ -435,6 +469,9 @@
    "welcome-swimlane": "Milník 1",
    "welcome-list1": "Základní",
    "welcome-list2": "Pokročilé",
+    "card-templates-swimlane": "Šablony Karty",
+    "list-templates-swimlane": "Šablony Sloupce",
+    "board-templates-swimlane": "Šablony Tabla",
    "what-to-do": "Co chcete dělat?",
    "wipLimitErrorPopup-title": "Neplatný WIP Limit",
    "wipLimitErrorPopup-dialog-pt1": "Počet úkolů v tomto sloupci je vyšší než definovaný WIP limit.",
@@ -461,13 +498,13 @@
    "invitation-code": "Kód pozvánky",
    "email-invite-register-subject": "__inviter__ odeslal pozvánku",
    "email-invite-register-text": "Ahoj __user__,\n\n__inviter__ tě přizval do kanban boardu ke spolupráci.\n\nNásleduj prosím odkaz níže:\n\n__url__\n\nKód Tvé pozvánky je: __icode__\n\nDěkujeme.",
-    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-subject": "E-mail testující SMTP",
    "email-smtp-test-text": "Email byl úspěšně odeslán",
    "error-invitation-code-not-exist": "Kód pozvánky neexistuje.",
    "error-notAuthorized": "Nejste autorizován k prohlížení této stránky.",
    "outgoing-webhooks": "Odchozí Webhooky",
    "outgoingWebhooksPopup-title": "Odchozí Webhooky",
-    "boardCardTitlePopup-title": "Card Title Filter",
+    "boardCardTitlePopup-title": "Filtr názvů karet",
    "new-outgoing-webhook": "Nové odchozí Webhooky",
    "no-name": "(Neznámé)",
    "Node_version": "Node verze",
@@ -480,12 +517,13 @@
    "OS_Totalmem": "OS Celková paměť",
    "OS_Type": "Typ OS",
    "OS_Uptime": "OS Doba běhu systému",
+    "days": "dní",
    "hours": "hodin",
    "minutes": "minut",
    "seconds": "sekund",
    "show-field-on-card": "Ukázat toto pole na kartě",
-    "automatically-field-on-card": "Auto create field to all cards",
-    "showLabel-field-on-card": "Show field label on minicard",
+    "automatically-field-on-card": "Automaticky vytvořit pole na všech kartách",
+    "showLabel-field-on-card": "Ukázat štítek pole na minikartě",
    "yes": "Ano",
    "no": "Ne",
    "accounts": "Účty",
@@ -500,6 +538,10 @@
    "card-end-on": "Končí v",
    "editCardReceivedDatePopup-title": "Změnit datum přijetí",
    "editCardEndDatePopup-title": "Změnit datum konce",
+    "setCardColorPopup-title": "Nastav barvu",
+    "setCardActionsColorPopup-title": "Vyber barvu",
+    "setSwimlaneColorPopup-title": "Vyber barvu",
+    "setListColorPopup-title": "Vyber barvu",
    "assigned-by": "Přidělil(a)",
    "requested-by": "Vyžádal(a)",
    "board-delete-notice": "Smazání je trvalé. Přijdete o všechny sloupce, karty a akce spojené s tímto tablem.",
@@ -508,88 +550,91 @@
    "delete-board": "Smazat tablo",
    "default-subtasks-board": "Podúkoly pro tablo __board__",
    "default": "Výchozí",
-    "queue": "Queue",
+    "queue": "Fronta",
    "subtask-settings": "Nastavení podúkolů",
    "boardSubtaskSettingsPopup-title": "Nastavení podúkolů tabla",
    "show-subtasks-field": "Karty mohou mít podúkoly",
-    "deposit-subtasks-board": "Deposit subtasks to this board:",
+    "deposit-subtasks-board": "Vložit podúkoly do tohoto tabla",
    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
-    "show-parent-in-minicard": "Show parent in minicard:",
-    "prefix-with-full-path": "Prefix with full path",
-    "prefix-with-parent": "Prefix with parent",
-    "subtext-with-full-path": "Subtext with full path",
-    "subtext-with-parent": "Subtext with parent",
-    "change-card-parent": "Change card's parent",
-    "parent-card": "Parent card",
+    "show-parent-in-minicard": "Ukázat předka na minikartě",
+    "prefix-with-full-path": "Prefix s celou cestou",
+    "prefix-with-parent": "Prefix s předkem",
+    "subtext-with-full-path": "Podtext s celou cestou",
+    "subtext-with-parent": "Podtext s předkem",
+    "change-card-parent": "Změnit rodiče karty",
+    "parent-card": "Rodičovská karta",
    "source-board": "Zdrojové tablo",
-    "no-parent": "Don't show parent",
+    "no-parent": "Nezobrazovat rodiče",
    "activity-added-label": "added label '%s' to %s",
    "activity-removed-label": "removed label '%s' from %s",
    "activity-delete-attach": "deleted an attachment from %s",
-    "activity-added-label-card": "added label '%s'",
-    "activity-removed-label-card": "removed label '%s'",
-    "activity-delete-attach-card": "deleted an attachment",
+    "activity-added-label-card": "přidán štítek '%s'",
+    "activity-removed-label-card": "odstraněn štítek '%s'",
+    "activity-delete-attach-card": "odstraněna příloha",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
    "r-rule": "Pravidlo",
-    "r-add-trigger": "Add trigger",
+    "r-add-trigger": "Přidat spoštěč",
    "r-add-action": "Přidat akci",
    "r-board-rules": "Pravidla Tabla",
    "r-add-rule": "Přidat pravidlo",
    "r-view-rule": "Zobrazit pravidlo",
    "r-delete-rule": "Smazat pravidlo",
-    "r-new-rule-name": "New rule title",
+    "r-new-rule-name": "Nový název pravidla",
    "r-no-rules": "Žádná pravidla",
-    "r-when-a-card": "When a card",
+    "r-when-a-card": "Pokud karta",
    "r-is": "je",
-    "r-is-moved": "is moved",
-    "r-added-to": "added to",
+    "r-is-moved": "je přesunuto",
+    "r-added-to": "přidáno do",
    "r-removed-from": "Odstraněno z",
-    "r-the-board": "the board",
+    "r-the-board": "tablo",
    "r-list": "sloupce",
-    "set-filter": "Set Filter",
+    "set-filter": "Nastavit filtr",
    "r-moved-to": "Přesunuto do",
    "r-moved-from": "Přesunuto z",
-    "r-archived": "Moved to Archive",
-    "r-unarchived": "Restored from Archive",
+    "r-archived": "Přesunuto do archivu",
+    "r-unarchived": "Obnoveno z archivu",
    "r-a-card": "karta",
-    "r-when-a-label-is": "When a label is",
-    "r-when-the-label-is": "When the label is",
-    "r-list-name": "list name",
-    "r-when-a-member": "When a member is",
-    "r-when-the-member": "When the member",
-    "r-name": "name",
-    "r-when-a-attach": "When an attachment",
+    "r-when-a-label-is": "Pokud nějaký štítek je",
+    "r-when-the-label-is": "Pokud tento štítek je",
+    "r-list-name": "název seznamu",
+    "r-when-a-member": "Pokud nějaký člen je",
+    "r-when-the-member": "Pokud tento člen je",
+    "r-name": "jméno",
+    "r-when-a-attach": "Pokud je nějaká příloha",
    "r-when-a-checklist": "Když zaškrtávací seznam je",
    "r-when-the-checklist": "Když zaškrtávací seznam",
    "r-completed": "Dokončeno",
-    "r-made-incomplete": "Made incomplete",
+    "r-made-incomplete": "Vytvořeno nehotové",
    "r-when-a-item": "Když položka zaškrtávacího seznamu je",
    "r-when-the-item": "Když položka zaškrtávacího seznamu",
    "r-checked": "Zaškrtnuto",
    "r-unchecked": "Odškrtnuto",
-    "r-move-card-to": "Move card to",
-    "r-top-of": "Top of",
-    "r-bottom-of": "Bottom of",
+    "r-move-card-to": "Přesunout kartu do",
+    "r-top-of": "Začátek",
+    "r-bottom-of": "Spodek",
    "r-its-list": "toho sloupce",
-    "r-archive": "Move to Archive",
-    "r-unarchive": "Restore from Archive",
+    "r-archive": "Přesunout do archivu",
+    "r-unarchive": "Obnovit z archivu",
    "r-card": "karta",
    "r-add": "Přidat",
    "r-remove": "Odstranit",
-    "r-label": "label",
+    "r-label": "štítek",
    "r-member": "člen",
-    "r-remove-all": "Remove all members from the card",
+    "r-remove-all": "Odstranit všechny členy z této karty",
+    "r-set-color": "Nastav barvu na",
    "r-checklist": "zaškrtávací seznam",
    "r-check-all": "Zaškrtnout vše",
    "r-uncheck-all": "Odškrtnout vše",
    "r-items-check": "položky zaškrtávacího seznamu",
-    "r-check": "Check",
-    "r-uncheck": "Uncheck",
-    "r-item": "item",
+    "r-check": "Označit",
+    "r-uncheck": "Odznačit",
+    "r-item": "Položka",
    "r-of-checklist": "ze zaškrtávacího seznamu",
-    "r-send-email": "Send an email",
+    "r-send-email": "Odeslat e-mail",
    "r-to": "komu",
    "r-subject": "předmět",
-    "r-rule-details": "Rule details",
+    "r-rule-details": "Podrobnosti pravidla",
    "r-d-move-to-top-gen": "Přesunout kartu na začátek toho sloupce",
    "r-d-move-to-top-spec": "Přesunout kartu na začátek sloupce",
    "r-d-move-to-bottom-gen": "Přesunout kartu na konec sloupce",
@@ -598,29 +643,29 @@
    "r-d-send-email-to": "komu",
    "r-d-send-email-subject": "předmět",
    "r-d-send-email-message": "zpráva",
-    "r-d-archive": "Move card to Archive",
-    "r-d-unarchive": "Restore card from Archive",
+    "r-d-archive": "Přesunout kartu do archivu",
+    "r-d-unarchive": "Obnovit kartu z archivu",
    "r-d-add-label": "Přidat štítek",
    "r-d-remove-label": "Odstranit štítek",
-    "r-create-card": "Create new card",
-    "r-in-list": "in list",
-    "r-in-swimlane": "in swimlane",
+    "r-create-card": "Vytvořit novou kartu",
+    "r-in-list": "v seznamu",
+    "r-in-swimlane": "ve swimlane",
    "r-d-add-member": "Přidat člena",
    "r-d-remove-member": "Odstranit člena",
-    "r-d-remove-all-member": "Remove all member",
-    "r-d-check-all": "Check all items of a list",
-    "r-d-uncheck-all": "Uncheck all items of a list",
-    "r-d-check-one": "Check item",
-    "r-d-uncheck-one": "Uncheck item",
+    "r-d-remove-all-member": "Odstranit všechny členy",
+    "r-d-check-all": "Označit všechny položky na seznamu",
+    "r-d-uncheck-all": "Odznačit všechny položky na seznamu",
+    "r-d-check-one": "Označit položku",
+    "r-d-uncheck-one": "Odznačit položku",
    "r-d-check-of-list": "ze zaškrtávacího seznamu",
    "r-d-add-checklist": "Přidat zaškrtávací seznam",
    "r-d-remove-checklist": "Odstranit zaškrtávací seznam",
    "r-by": "by",
    "r-add-checklist": "Přidat zaškrtávací seznam",
-    "r-with-items": "with items",
-    "r-items-list": "item1,item2,item3",
-    "r-add-swimlane": "Add swimlane",
-    "r-swimlane-name": "swimlane name",
+    "r-with-items": "s položkami",
+    "r-items-list": "položka1,položka2,položka3",
+    "r-add-swimlane": "Přidat swimlane",
+    "r-swimlane-name": "Název swimlane",
    "r-board-note": "Note: leave a field empty to match every possible value.",
    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
    "r-when-a-card-is-moved": "Když je karta přesunuta do jiného sloupce",
@@ -629,11 +674,20 @@
    "cas": "CAS",
    "authentication-method": "Metoda autentizace",
    "authentication-type": "Typ autentizace",
-    "custom-product-name": "Custom Product Name",
-    "layout": "Layout",
-    "hide-logo": "Hide Logo",
-    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
-    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
-    "error-undefined": "Something went wrong",
-    "error-ldap-login": "An error occurred while trying to login"
+    "custom-product-name": "Vlastní název produktu",
+    "layout": "Uspořádání",
+    "hide-logo": "Skrýt logo",
+    "add-custom-html-after-body-start": "Přidej vlastní HTML za <body>",
+    "add-custom-html-before-body-end": "Přidej vlastní HTML před </body>",
+    "error-undefined": "Něco se pokazilo",
+    "error-ldap-login": "Během přihlašování nastala chyba",
+    "display-authentication-method": "Zobraz způsob ověřování",
+    "default-authentication-method": "Zobraz způsob ověřování",
+    "duplicate-board": "Duplikovat tablo",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }