v1.78

Update translations.
v1.77
2018-11-20 22:50:44 +02:00 · 2018-11-20 22:49:04 +02:00 · 2018-11-20 22:45:42 +02:00 · 2018-11-20 12:24:38 +02:00 · 2018-11-20 12:19:05 +02:00 · 2018-11-20 12:11:37 +02:00
221 changed files with 17809 additions and 2744 deletions
@@ -14,7 +14,7 @@
  },
  "rules": {
    "strict": 0,
-    "no-undef": 2,
+    "no-undef": 0,
    "accessor-pairs": 2,
    "comma-dangle": [2, "always-multiline"],
    "consistent-return": 2,
@@ -121,7 +121,8 @@
    "allowIsBoardAdmin": true,
    "allowIsBoardMember": true,
    "allowIsBoardMemberByCard": true,
-    "allowIsBoardMemberNonComment": true,
+    "allowIsBoardMemberCommentOnly": true,
+    "allowIsBoardMemberNoComments": true,
    "Emoji": true,
    "Checklists": true,
    "Settings": true,
@@ -1,8 +1,15 @@
 ## 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.
+
 **Server Setup Information**:

 * Did you test in newest Wekan?:
+* For new Wekan install, did you configure root-url correctly https://github.com/wekan/wekan/wiki/Settings ?
 * Wekan version:
 * If this is about old version of Wekan, what upgrade problem you have?:
 * Operating System:
@@ -13,6 +20,9 @@
 * ROOT_URL environment variable http(s)://(subdomain).example.com(/suburl):

 **Problem description**:
- *REQUIRED: Add recorded animated gif about how it works currently, and screenshot mockups how it should work*
+- *REQUIRED: Add recorded animated gif about how it works currently, and screenshot mockups how it should work. Use peek to record animgif in Linux https://github.com/phw/peek*
 - *Explain steps how to reproduce*
- *Attach log files in .zip file)*
+- *In webbrowser, what does show Right Click / Inspect / Console ? Chrome shows more detailed info than Firefox.*
+- *If using Snap, what does show command `sudo snap logs wekan.wekan` ?*
+- *If using Docker, what does show command `sudo docker logs wekan-app` ?*
+- *If logs are very long, attach them in .zip file*
@@ -4,11 +4,11 @@
 *.sublime-workspace
 tmp/
 node_modules/
+npm-debug.log
 .vscode/
 .idea/
 .build/*
-packages/kadira-flow-router/
-packages/meteor-useraccounts-core/
+packages/
 package-lock.json
 **/parts/
 **/stage
@@ -16,3 +16,4 @@ package-lock.json
 **/*.snap
 snap/.snapcraft/
 .idea
+.DS_Store
@@ -6,7 +6,7 @@
 meteor-base@1.2.0

 # Build system
-ecmascript@0.9.0
+ecmascript
 stylus@2.513.13
 standard-minifier-css@1.3.5
 standard-minifier-js@2.2.0
@@ -31,6 +31,7 @@ kenton:accounts-sandstorm
 service-configuration@1.0.11
 useraccounts:unstyled
 useraccounts:flow-routing
+salleman:accounts-oidc

 # Utilities
 check@1.2.5
@@ -49,7 +50,6 @@ kadira:dochead
 meteorhacks:picker
 meteorhacks:subs-manager
 mquandalle:autofocus
-mquandalle:moment
 ongoworks:speakingurl
 raix:handlebar-helpers
 tap:i18n
@@ -81,8 +81,11 @@ staringatlights:fast-render
 mixmax:smart-disconnect
 accounts-password@1.5.0
 cfs:gridfs
-browser-policy
 eluck:accounts-lockout
 rzymek:fullcalendar
 momentjs:moment@2.22.2
-atoy40:accounts-cas
+browser-policy-framing
+mquandalle:moment
+msavin:usercache
+wekan:wekan-ldap
+wekan:accounts-cas
@@ -1,5 +1,6 @@
 3stack:presence@1.1.2
 accounts-base@1.4.0
+accounts-oauth@1.1.15
 accounts-password@1.5.0
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
@@ -9,7 +10,6 @@ aldeed:simple-schema@1.5.3
 alethes:pages@1.8.6
 allow-deny@1.1.0
 arillo:flow-router-helpers@0.5.2
-atoy40:accounts-cas@0.0.2
 audit-argument-checks@1.0.7
 autoupdate@1.3.12
 babel-compiler@6.24.7
@@ -19,9 +19,7 @@ binary-heap@1.0.10
 blaze@2.3.2
 blaze-tools@1.0.10
 boilerplate-generator@1.3.1
-browser-policy@1.1.0
 browser-policy-common@1.0.11
-browser-policy-content@1.1.0
 browser-policy-framing@1.1.0
 caching-compiler@1.1.9
 caching-html-compiler@1.1.2
@@ -119,8 +117,11 @@ mquandalle:jquery-ui-drag-drop-sort@0.2.0
 mquandalle:moment@1.0.1
 mquandalle:mousetrap-bindglobal@0.0.1
 mquandalle:perfect-scrollbar@0.6.5_2
+msavin:usercache@1.0.0
 npm-bcrypt@0.9.3
 npm-mongo@2.2.33
+oauth@1.2.1
+oauth2@1.2.0
 observe-sequence@1.0.16
 ongoworks:speakingurl@1.1.0
 ordered-dict@1.0.9
@@ -142,6 +143,8 @@ 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
@@ -176,4 +179,7 @@ useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
 webapp@1.4.0
 webapp-hashing@1.0.9
+wekan:accounts-cas@0.1.0
+wekan:wekan-ldap@0.0.2
+yasaricli:slugify@0.0.7
 zimme:active-route@2.3.2
@@ -1,3 +1,741 @@
+# v1.78 2018-11-20 Wekan release
+
+- Update translations (de).
+
+# v1.77 2018-11-20 Wekan release
+
+- Update version number. Trying to get Snap automatic review working, so that
+  it would accept new Wekan release.
+
+# v1.76 2018-11-20 Wekan release
+
+This release adds the following new features:
+
+- Add [LDAP_FULLNAME_FIELD](https://github.com/wekan/wekan-ldap/issues/10) to
+  [configs](https://github.com/wekan/wekan/commit/8e3f53021775069dba125efd4b7200d0d70a1ed1)
+  and other options that were not in all config files. Thanks to alkemyst and xet7.
+
+and fixes the following bugs:
+
+- Fix: When saving Custom Layout, save also SMTP settings. Thanks to xet7.
+
+Thanks to above GitHub users for their contributions.
+
+# v1.75 2018-11-20 Wekan release
+
+This release adds the following new features:
+
+- Admin Panel / Layout: Hide Logo: Yes / No. This does hide Wekan logo on Login page and Board page. Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Fix Snap database-list-backups command](https://github.com/wekan/wekan-snap/issues/26). Thanks to WaryWolf.
+
+Thanks to above GitHub users for their contributions.
+
+# v1.74.1 2018-11-18 Wekan Edge release
+
+This release adds the following new features:
+
+- [Full Name from LDAP server via environment variable](https://github.com/wekan/wekan-ldap/pull/18).
+
+Thanks to GitHub user alkemyst for contributions.
+
+# v1.74 2018-11-17 Wekan release
+
+- Update version number to get this released to snap. Thanks to xet7.
+
+# v1.73 2018-11-17 Wekan release
+
+This release fixes the following bugs:
+
+- Revert Improve authentication to [fix Login failure](https://github.com/wekan/wekan/issues/2004).
+
+Thanks to GitHub users Broxxx3 and xet7 for their contributions.
+
+# v1.72 2018-11-17 Wekan release
+
+- Update translations (fi).
+
+# v1.71 2018-11-17 Wekan release
+
+This release adds the following new features and bugfixes:
+
+- Add languages, thanks to translators:
+  - Danish
+  - Swahili / Kiswahili
+- Rename Recycle Bin to Archive. Thanks to xet7.
+- Update readme for clarity. Thanks to xet7.
+- [Improve authentication](https://github.com/wekan/wekan/pull/2003), thanks to Akuket:
+  - Removing the select box: Now it just checks the user.authenticationMethod value to choose the authentication method.
+  - Adding an option to choose the default authentication method with env var.
+  - Bug fix that allowed a user to connect with the password method while his user.authenticationMethod is "ldap" for example.
+  - Adding a server-side method which allows disconnecting a user after a delay defined by env vars.
+- [Improve shell scripts](https://github.com/wekan/wekan/pull/2002). Thanks to warnerjon12.
+
+Thanks to above GitHub users and translators for their contributions.
+
+# v1.70 2018-11-09 Wekan release
+
+This release adds the following new features:
+
+- [Auto create Custom Field to all cards. Show Custom Field Label on
+   minicard](https://github.com/wekan/wekan/pull/1987).
+
+and fixes the following bugs:
+
+- Some fixes to Wekan import, thanks to xet7:
+  - isCommentOnly and isNoComments are now optional
+  - Turn off import error checking, so something is imported anyway, and import does not stop at error.
+  - Now most of Sandstorm export do import to Standalone Wekan, but some of imported cards, dates etc are missing.
+  - Sandstorm Import Wekan board warning messages are now translateable. But bug "Board not found" still exists.
+- LDAP: Added INTERNAL_LOG_LEVEL. Fix lint and ldap group filter options. Thanks to Akuket.
+
+Thanks to above mentioned GitHub users for their contributions.
+
+# v1.69 2018-11-03 Wekan release
+
+- Update translations.
+
+# v1.68 2018-11-03 Wekan release
+
+- Update translations.
+
+# v1.67 2018-11-03 Wekan release
+
+This release adds the following new features to all Wekan platforms:
+
+- Add Hindi language. Thanks to saurabharch.
+
+and hides the following features at Sandstorm:
+
+- Hide Linked Card and Linked Board on Sandstorm, because they are only
+  useful when having multiple boards, and at Sandstorm
+  there is only one board per grain. Thanks to ocdtrekkie and xet7. Closes #1982 
+
+Thanks to above mentioned GitHub users for their contributions.
+
+# v1.66 2018-10-31 Wekan release
+
+This release fixes the following bugs:
+
+- docker-compose.yml and docker-compose-build.yml, thanks to xet7:
+  - Remove single quotes, because settings are quoted automatically.
+  - Comment out most settings that have default values.
+- Fix typos in CHANGELOG.md, thanks to Hillside502 and loginKing.
+- [Fix typo about ldaps](https://github.com/wekan/wekan/pull/1980).
+  Documentation said to set LDAP_ENCRYPTION to true if we want to use
+  ldaps, but the code in wekan-ldap does not check if it is set to true,
+  but if the value equals to 'ssl' instead. Thanks to imkwx.
+
+Thanks to above mentioned GitHub users for their contributions.
+
+# v1.65 2018-10-25 Wekan release
+
+This release adds the [following new features](https://github.com/wekan/wekan/pull/1967), with Apache I-CLA:
+
+- UI: list headers: show the card count smaller in grey color below list name
+- UI: lists: only output the number of cards for each swimlane
+
+Thanks to GitHub user bentiss for contributions.
+
+# v1.64.2 2018-10-25 Wekan Edge release
+
+This release fixes the following bugs:
+
+- Additional fix to [Impossible to connect to LDAP if UserDN contain space(s)](https://github.com/wekan/wekan/issues/1970).
+
+Thanks to GitHub users Akuket and xet7 for their contributions.
+
+# v1.64.1 2018-10-25 Wekan Edge release
+
+This release fixes the following bugs:
+
+- [Impossible to connect to LDAP if UserDN contain space(s)](https://github.com/wekan/wekan/issues/1970).
+
+Thanks to GitHub users Akuket and xet7 for their contributions.
+
+# v1.64 2018-10-24 Wekan release
+
+- Update translations.
+
+# v1.63 2018-10-24 Wekan release
+
+This release adds the following new features:
+
+REST API: [Allow to remove the full list of labels/members through the API](https://github.com/wekan/wekan/pull/1968), with Apache I-CLA:
+
+- [Models: Cards: an empty string in members or label deletes the list](https://github.com/wekan/wekan/commit/e5949504b7ed42ad59742d2a0aa001fe6c762873).
+  There is currently no way to remove all members or all labels attached
+  to a card. If an empty string is provided, we can consider as a hint to
+  remove the list from the card.
+- [Models: Cards: allow singletons to be assigned to members and labelIds](https://github.com/wekan/wekan/commit/2ce1ba37a1d0a09f8b3d2a1db4c8a11d1f98caa0).
+  If we need to set only one member or one label, the data provided will
+  not give us an array, but the only element as a string.
+  We need to detect that and convert the parameter into an array.
+
+Thanks to GitHub user bentiss for contributions.
+
+# v1.62 2018-20-24 Wekan release
+
+- Fix missing dropdown arrow on Chrome. Thanks to xet7. Closes #1964
+
+# v1.61 2018-20-24 Wekan release
+
+- Fix lint error. Thanks to xet7.
+
+# v1.60 2018-10-24 Wekan release
+
+- Update translations.
+
+# v1.59 2018-10-24 Wekan release
+
+This release adds the beginning of following new features:
+
+- Custom Product Name in Admin Panel / Layout. In Progress, setting does not affect change UI yet. Thanks to xet7.
+
+and fixes the following bugs:
+
+- Fix LDAP User Search Scope. Thanks to Vnimos and Akuket. Related #119
+- Fix Save Admin Panel SMTP password. Thanks to saurabharch and xet7. Closes #1856
+
+Thanks to above mentioned GitHub users for contributions.
+
+# v1.58 2018-10-23 Wekan release
+
+This release adds the [following new features and fixes](https://github.com/wekan/wekan/pull/1962), with Apache I-CLA:
+
+- Also export the cards created with an older wekan instance (without linked cards) (related to #1873);
+- Fix the GET customFields API that was failing;
+- Allow to directly overwrite the members of cards and boards with a PUT call (this avoids to do multiple calls to add and remove users);
+- Allow to change the swimlane of a card from the API.
+
+Thanks to GitHub user bentiss for contributions.
+
+# v1.57 2018-10-23 Wekan release
+
+This release adds the following new features:
+
+- Merge edge into stable. This brings LDAP, Rules, Role "No Comments", etc.
+- Go back to Meteor 1.6.x and MongoDB 3.2.21 that works in Snap etc.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.55.1 2018-10-16 Wekan Edge release
+
+This release adds the following new features:
+
+- [Automatically close the sidebar](https://github.com/wekan/wekan/pull/1954).
+
+and fixes the following bugs:
+
+- [LDAP: Include missing LDAP PR so that LDAP works](https://github.com/wekan/wekan-ldap/pull/6);
+- [Improve notifications](https://github.com/wekan/wekan/pull/1948);
+- [Fix deleting Custom Fields, removing broken references](https://github.com/wekan/wekan/issues/1872);
+- [Fix vertical text for swimlanes in IE11](https://github.com/wekan/wekan/issues/1798);
+- [Update broke the ability to mute notifications](https://github.com/wekan/wekan/pull/1954).
+
+Thanks to GitHub users Akuket, Clement87 and tomodwyer for their contributions.
+
+# v1.53.9 2018-10-11 Wekan Edge release
+
+This release adds the following new features:
+
+- docker-compose.yml in this Edge branch now works with Wekan Edge + Meteor 1.8.1-beta.0 + MongoDB 4.0.3;
+- [Snap is still broken](https://forum.snapcraft.io/t/how-to-connect-to-localhost-mongodb-in-snap-apparmor-prevents/7793/2). Please use latest Snap release on Edge branch, until this is fixed.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.8 2018-10-10 Wekan Edge release
+
+This release tries to fix the following bugs:
+
+- Try to fix Docker.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.7 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- Try MongoDB 4.0.3
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.6 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- [Add LDAP to Snap Help](https://github.com/wekan/wekan/commit/809c8f64f69721d51b7d963248a77585867fac53).
+
+and tries to fix the following bugs:
+
+- Try to fix snap.
+
+Thanks to GitHub users Akuket and xet7 for their contributions.
+    
+# v1.53.5 2018-10-10 Wekan Edge relase
+
+This release tries to fix the following bugs:
+
+- Try to fix snap.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.4 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- [Upgrade Hoek](https://github.com/wekan/wekan/commit/0b971b6ddb1ffc4adad6b6b09ae7f42dd376fe2c).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.3 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- [Upgrade](https://github.com/wekan/wekan/issues/1522) to [Meteor](https://blog.meteor.com/meteor-1-8-erases-the-debts-of-1-7-77af4c931fe3) [1.8.1-beta.0](https://github.com/meteor/meteor/issues/10216).
+  with [these](https://github.com/wekan/wekan/commit/079e45eb52a0f62ddb6051bf2ea80fac8860d3d5)
+  [commits](https://github.com/wekan/wekan/commit/dd47d46f4341a8c4ced05749633f783e88623e1b). So now it's possible to use MongoDB 2.6 - 4.0.
+  
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.2 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- [Add LDAP package to Docker and Snap](https://github.com/wekan/wekan/commit/f599391419bc7422a6ead52cdefc7d380e787897).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.53.1 2018-10-10 Wekan Edge release
+
+This release adds the following new features:
+
+- [LDAP](https://github.com/wekan/wekan/commit/288800eafc91d07f859c4f59588e0b646137ccb9).
+  Please test and [add info about bugs](https://github.com/wekan/wekan/issues/119);
+- [Add LDAP support and authentications dropdown menu on login page](https://github.com/wekan/wekan/pull/1943);
+- [REST API: Get cards by swimlane id](https://github.com/wekan/wekan/pull/1944). Please [add docs](https://github.com/wekan/wekan/wiki/REST-API-Swimlanes).
+
+and fixes the following bugs:
+
+- [OpenShift: Drop default namespace value and duplicate WEKAN_SERVICE_NAME parameter.commit](https://github.com/wekan/wekan/commit/fcc3560df4dbcc418c63470776376238af4f6ddc);
+- [Fix Card URL](https://github.com/wekan/wekan/pull/1932);
+- [Add info about root-url to GitHub issue template](https://github.com/wekan/wekan/commit/4c0eb7dcc19ca9ae8c5d2d0276e0d024269de236);
+- [Feature rules: fixes and enhancements](https://github.com/wekan/wekan/pull/1936).
+
+Thanks to GitHub users Akuket, Angtrim, dcmcand, lberk, maximest-pierre, InfoSec812, schulz and xet7 for their contributions.
+    
+# v1.52.1 2018-10-02 Wekan Edge release
+
+This release adds the following new features:
+
+- REST API: [Add member with role to board. Remove member from board](https://github.com/wekan/wekan/commit/33caf1809a459b136b671f7061f08eb5e8d5e920).
+  [Docs](https://github.com/wekan/wekan/wiki/REST-API-Role). Related to [role issue](https://github.com/wekan/wekan/issues/1861).
+
+and reverts previous change:
+
+- OAuth2: [Revert Oidc preferred_username back to username](https://github.com/wekan/wekan/commit/33caf1809a459b136b671f7061f08eb5e8d5e920).
+  This [does not fix or break anything](https://github.com/wekan/wekan/issues/1874#issuecomment-425179291),
+  Oidc already works with [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper-provider-app).
+
+Thanks to GitHub user xet7 for contributions.
+    
+# v1.51.2 2018-09-30 Wekan Edge release
+
+This release adds the following new features:
+
+- [REST API: Change role of board member](https://github.com/wekan/wekan/commit/51ac6c839ecf2226b2a81b0d4f985d3b942f0938).
+  Docs: https://github.com/wekan/wekan/wiki/REST-API-Role
+
+Thanks to GitHub users entrptaher and xet7 for their contributions.
+
+# v1.51.1 2018-09-28 Wekan Edge release
+
+This release adds the following new features:
+
+- [Add CAS with attributes](https://github.com/wekan/wekan/commit/bd6e4a351b984b032e17c57793a70923eb17d8f5);
+- [Move Add Board button to top left, so there is no need to scroll to bottom when there is a lot of boards](https://github.com/wekan/wekan/commit/fb46a88a0f01f7f74ae6b941dd6f2060e020f09d).
+
+Thanks to GitHub users ppoulard and xet7 for their contributions.
+
+# v1.50.3 2018-09-23 Wekan Edge release
+
+This release tries to fix the following bugs:
+
+- [Remove "Fix Cannot setup mail server via snap variables"](https://github.com/wekan/wekan/commit/6d88baebc7e297ffdbbd5bb6971190b18f79d21f)
+  to see does Wekan Snap start correctly after removing it.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.50.2 2018-09-23 Wekan Edge release
+
+This release tries to fix the following bugs:
+
+- Build Wekan and release again, to see does it work.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.50.1 2018-09-22 Wekan Edge release
+
+This release adds the following new features:
+
+- [Change from Node v8.12.0 prerelease to use official Node v8.12.0](https://github.com/wekan/wekan/commit/7ec7a5f27c381e90f3da6bddc3773ed87b1c1a1f).
+
+and fixes the following bugs:
+
+- [Fix Dockerfile Meteor install by changing tar to bsdtar](https://github.com/wekan/wekan/commit/1bad81ca86ca87c02148764cc03a3070882a8a33);
+- Add [npm-debug.log and .DS_Store](https://github.com/wekan/wekan/commit/44f4a1c3bf8033b6b658703a0ccaed5fdb183ab4) to .gitignore;
+- [Add more debug log requirements to GitHub issue template](https://github.com/wekan/wekan/commit/1c4ce56b0f18e00e01b54c7059cbbf8d3e196154);
+- [Add default Wekan Snap MongoDB bind IP 127.0.0.1](https://github.com/wekan/wekan/commit/6ac726e198933ee41c129d22a7118fcfbf4ca9a2);
+- [Fix Feature Rules](https://github.com/wekan/wekan/pull/1909);
+- [Fix Cannot setup mail server via snap variables](https://github.com/wekan/wekan/issues/1906);
+- [Try to fix OAuth2: Change oidc username to preferred_username](https://github.com/wekan/wekan/commit/734e4e5f3ff2c3dabf94c0fbfca561db066c4565).
+
+Thanks to GitHub users Angtrim, maurice-schleussinger, suprovsky and xet7 for their contributions.
+
+# v1.49.1 2018-09-17 Wekan Edge release
+
+This release adds the following new features:
+
+- Change from Node v8.12.0 prerelease to use official Node v8.12.0.
+    
+Thanks to GitHub user xet7 for contributions.
+
+# v1.49 2018-09-17 Wekan release
+
+This release fixes the following bugs:
+
+- Fix lint errors.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.48 2018-09-17 Wekan release
+
+This release removes the following new features:
+
+- Remove IFTTT rules, until they are fixed.
+- Remove OAuth2, until it is fixed.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.47 2018-09-16 Wekan release
+
+This release adds the following new features:
+
+- [IFTTT Rules](https://github.com/wekan/wekan/pull/1896). Useful to automate things like
+  [adding labels, members, moving card, archiving them, checking checklists etc](https://github.com/wekan/wekan/issues/1160).
+  Please test and report bugs. Later colors need to be made translatable.
+
+Thanks to GitHub users Angtrim and xet7 for their contributions.
+
+# v1.46 2018-09-15 Wekan release
+
+This release adds the following new features:
+
+- [Upgrade MongoDB to 3.2.21](https://github.com/wekan/wekan/commit/0cb3aee803781e4241c38a3e1e700703d063035a);
+- [Add source-map-support](https://github.com/wekan/wekan/issues/1889);
+- [Allow Announcement to be markdown](https://github.com/wekan/wekan/issues/1892).
+  Note: xet7 did not yet figure out how to keep announcement on one line
+  when markdown was added, so now Font Awesome icons are above and below.
+
+and fixes the following bugs:
+
+- [Turn of http/2 in Caddyfile](https://github.com/wekan/wekan/commit/f1ab46d5178b6fb7e9c4e43628eec358026d287a)
+  so that Firefox Inspect Console does not [show errors about wss](https://github.com/wekan/wekan/issues/934)
+  websocket config. Chrome web console supports http/2.
+  Note: If you are already using Caddy and have modified your Caddyfile, you need to edit your Caddyfile manually.
+- [Partially fix: Cannot move card from one swimline to the other if moving in the same list](https://github.com/wekan/wekan/issues/1887);
+- [Fix: Linking cards from empty board is possible and makes current board not load anymore](https://github.com/wekan/wekan/issues/1885).
+
+Thanks to GitHub users andresmanelli, HLFH and xet7 for their contributions.
+
+# v1.45 2018-09-09 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix lint error](https://github.com/wekan/wekan/commit/45c0343f45b4cfc06d83cf357ffb50d6fca2f23b).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.44 2018-09-09 Wekan release
+
+This release adds the following new features:
+
+- REST API: [Add startAt/dueAt/endAt etc](https://github.com/wekan/wekan/commit/1e0fdf8abc10130ea3c50b13ae97396223ce7fa9).
+  Docs at https://github.com/wekan/wekan/wiki/REST-API-Cards
+- [Fix cards export and add customFields export](https://github.com/wekan/wekan/pull/1886).
+
+Thanks to GitHub users ymeramees and xet7 for their contributions.
+
+# v1.43 2018-09-06 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix "No Comments" permission on Wekan and Trello import](https://github.com/wekan/wekan/commit/0a001d505d81961e6bd6715d885fffee0adb702d).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.42 2018-09-06 Wekan release
+
+This release adds the following new features:
+
+- REST API: [Create board options to be modifiable](https://github.com/wekan/wekan/commit/9cea76e4efaacaebcb2e9f0690dfeb4ef6d62527),
+  like permissions, public/private board - now private by default,
+  and board background color.
+  Docs at https://github.com/wekan/wekan/wiki/REST-API-Boards
+- [Add swimlaneId in activity. Create default swimlaneId in API](https://github.com/wekan/wekan/pull/1876).
+
+Thanks to GitHub users andresmanelli and xet7 for their contributions.
+
+# v1.41 2018-09-05 Wekan release
+
+This release tries to fix the following bugs:
+
+- [Try to fix Wekan Sandstorm API](https://github.com/wekan/wekan/issues/1279#issuecomment-418440401).
+
+Thanks to GitHub users ocdtrekkie and xet7 for their contributions.
+
+# v1.40 2018-09-04 Wekan release
+
+This release adds the following new features:
+
+- [Add permission "No comments"](https://github.com/wekan/wekan/commit/77efcf71376d3da6c19ad1a4910567263e83c0ca).
+  It is like normal user, but [does not show comments and activities](https://github.com/wekan/wekan/issues/1861).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.39 2018-08-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Only allow ifCanModify users to add dates on cards](https://github.com/wekan/wekan/pull/1867).
+
+Thanks to GitHub user rjevnikar for contributions.
+
+# v1.38 2018-08-29 Wekan release
+
+This release adds the following new features:
+
+- Add [msavin:userCache](https://github.com/msavin/userCache) to speedup Wekan.
+  See [meteor forums post](https://forums.meteor.com/t/introducing-a-new-approach-to-meteor-user-this-simple-trick-can-save-you-millions-of-database-requests/45336/7).
+
+and fixes the following bugs:
+
+- [Fix Delete Board](https://github.com/wekan/wekan/commit/534b20fedac9162d2d316bd74eff743d636f2b3d).
+
+Thanks to GitHub users msavin, rjevnikar and xet7 for their contributions.
+
+# v1.37 2018-08-28 Wekan release
+
+This release fixes the following bugs:
+
+- [Add Missing Index on cards.parentId since Swimlane integration
+  to speedup Wekan](https://github.com/wekan/wekan/issues/1863);
+- [Update OpenShift template to add Route and parameterize](https://github.com/wekan/wekan/pull/1865);
+- [Fix typos in Wekan snap help](https://github.com/wekan/wekan/commit/0c5fc6d7fd899a6bc67a446ab43e53290d8571e4).
+
+Thanks to GitHub users Clement87, InfoSec812 and xet7 for their contributions.
+
+# v1.36 2018-08-25 Wekan release
+
+This release adds the following new features:
+
+- [OAuth2 Login on Standalone Wekan](https://github.com/wekan/wekan/wiki/OAuth2). For example, Rocket.Chat can provide OAuth2 login to Wekan.
+  Also, if you have Rocket.Chat using LDAP/SAML/Google/etc for logging into Rocket.Chat, then same users can login to Wekan when
+  Rocket.Chat is providing OAuth2 login to Wekan.
+
+and fixes the following bugs:
+
+- [Move labels back to original place at minicard](https://github.com/wekan/wekan/issues/1842);
+- [Fix typos in security documentation](https://github.com/wekan/wekan/pull/1857).
+
+Thanks to GitHub users hever, salleman33, tlevine and xet7 for their contributions.
+
+# v1.35 2018-08-23 Wekan release
+
+This release adds the following new features:
+
+Add Caddy plugins:
+- [http.filter](https://caddyserver.com/docs/http.filter) 
+  for changing Wekan UI on the fly, for example custom logo,
+  or changing to all different CSS file to have custom theme;
+- [http.ipfilter](https://caddyserver.com/docs/http.ipfilter) 
+  to block requests by ip address;
+- [http.realip](https://caddyserver.com/docs/http.realip)
+  for showing real X-Forwarded-For IP to behind proxy;
+- Turn off Caddy telemetry.
+
+Add configuring webhooks:
+- [Make the attributes that the webhook sends configurable](https://github.com/wekan/wekan/pull/1852).
+
+Thanks to Caddy contributors, and Github users omarsy and xet7 for their contributions.
+
+# v1.34 2018-08-22 Wekan release
+
+This release add the following new features:
+
+- [Add Favicon for pinned tab on Safari browser](https://github.com/wekan/wekan/issues/1795).
+
+and fixes the following bugs:
+
+- [Restored SMTP settings at Admin Panel, and disabled showing password](https://github.com/wekan/wekan/issues/1790);
+- [Move color labels on minicard to bottom of minicard](https://github.com/wekan/wekan/issues/1842);
+- [Fix and improve linked cards](https://github.com/wekan/wekan/pull/1849);
+- [Allow Sandstorm to serve Wekan HTTP API](https://github.com/wekan/wekan/pull/1851);
+
+Thanks to GitHub users andresmanelli, ocdtrekkie, therampagerado, woodyart and xet7 for their contributions.
+
+# v1.33 2018-08-16 Wekan release
+
+This release fixes the following bugs:
+
+- [Change default value of label ids](https://github.com/wekan/wekan/pull/1837).
+
+Thanks to GitHub user omarsy for contributions.
+
+# v1.32 2018-08-16 Wekan release
+
+This release fixes the following bugs:
+
+- [Content Policy: Allow inline scripts, otherwise there is errors in browser/inspect/console](https://github.com/wekan/wekan/commit/807c6ce09e4b5d49049d343d73bbca24fa84d527);
+- [Use only framing policy, not all of content policy](https://github.com/wekan/wekan/commit/b3005f828dbf69bdf174d4bcd7654310fa9e0968);
+- [Set default matomo settings to disabled](https://github.com/wekan/wekan/commit/807c6ce09e4b5d49049d343d73bbca24fa84d527);
+- Fix [hidden](https://github.com/wekan/wekan/commit/be00465e67931f2a5655ed47f6e075ed1c589f54)
+  [system](https://github.com/wekan/wekan/commit/9fc3de8502919f9aeb18c9f8ea3b0678b66ce176) [messages](https://github.com/wekan/wekan/issues/1830);
+- Fix [Requested By](https://github.com/wekan/wekan/commit/e55d7e4f72a4b425c4aca5ba04a7be1fc642649b) and
+  [Assigned By](https://github.com/wekan/wekan/commit/5c33a8534186920be642be8e2ac17743a54f16db) [fields](https://github.com/wekan/wekan/issues/1830);
+- [Fix Date and Time Formats are only US in every language](https://github.com/wekan/wekan/commit/b3005f828dbf69bdf174d4bcd7654310fa9e0968).
+
+Thanks to GitHub users andresmanelli and xet7 for their contributions.
+
+# v1.31 2018-08-14 Wekan release
+
+This release fixes the following bugs:
+
+- [Export of Board does not work on Docker](https://github.com/wekan/wekan/issues/1820).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.30 2018-08-14 Wekan release
+
+This release add the following new features:
+
+- [When Content Policy is enabled, allow one URL to have iframe that embeds Wekan](https://github.com/wekan/wekan/commit/b9929dc68297539a94d21950995e26e06745a263);
+- [Add option to turn off Content Policy](https://github.com/wekan/wekan/commit/b9929dc68297539a94d21950995e26e06745a263);
+- [Allow always in Wekan markdown `<img src="any-image-url-here">`](https://github.com/wekan/wekan/commit/b9929dc68297539a94d21950995e26e06745a263).
+
+and fixes the following bugs:
+
+- [Fix Import from Trello error 400](https://github.com/wekan/wekan/commit/2f557ae3a558c654cc6f3befff22f5ee4ea6c3d9).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.29 2018-08-12 Wekan release
+
+This release fixes the following bugs:
+
+- [Revert Fix lint errors, that caused breakage](https://github.com/wekan/wekan/commit/b015b5b7240f5fb5a715843dce5d35907345eb4a).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.28 2018-08-12 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix lint errors](https://github.com/wekan/wekan/commit/f5515cb95fc93882e5e1098d6043267b9260b9d7).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.27 2018-08-12 Wekan release
+
+This release add the following new features:
+
+- [Linked Cards and Linked Boards](https://github.com/wekan/wekan/pull/1592).
+
+Thanks to GitHub user andresmanelli for contributions.
+
+# v1.26 2018-08-09 Wekan release
+
+This release fixes the following bugs:
+
+- [Set WITH_API=true setting on Sandstorm, and so that export works](https://github.com/wekan/wekan/commit/a300b73d56750a1a5645767d375be60839314e84);
+- [Set Matomo blank settings on Sandstorm](https://github.com/wekan/wekan/commit/acd105e61b9dca5a78354047bbc23b0a01e71d8c).
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.25 2018-08-09 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix showing only the cards of the current board in calendar view](https://github.com/wekan/wekan/pull/1822).
+
+Thanks to GitHub user Yanonix for contributions.
+
+# v1.24 2018-08-09 Wekan release
+
+This release add the following new features:
+
+- [Update node to v8.12.0 prerelease build](https://github.com/wekan/wekan/commit/04d7c47f4ca990311079be8dd6dc383448ee342f).
+
+and fixes the following bugs:
+
+- [Enable Wekan API by default, so that Export Board to JSON works](https://github.com/wekan/wekan/commit/b2eeff96977592deaeb23a8171fc3b13f8c6c5dc);
+- [Fix the flagging of dates](https://github.com/wekan/wekan/pull/1814);
+- [Use new WITH_API and Matomo env variables at Dockerfile](https://github.com/wekan/wekan/issues/1820);
+- For OpenShift compliance, [change](https://github.com/wekan/wekan/commit/53d545eeef7e796bd910f7cce666686ca05de544)
+  [run user](https://github.com/wekan/wekan/pull/1816)
+  and [Docker internal port to 8080](https://github.com/wekan/wekan/commit/95b21943ee7a9fa5a27efe5276307febc2fbad94).
+
+Thanks to GitHub users rjevnikar, tdemaret, xadagaras and xet7 for their contributions.
+
+# v1.23 2018-07-30 Wekan release
+
+This release tries to fix the following bugs:
+
+- Checking for [existing](https://github.com/wekan/wekan/commit/a48f560a85860451914dbaad8cae6ff5120a0c38)
+  [directories](https://github.com/wekan/wekan/commit/5bfb6c6411c928bfffa7ed6fe829f030e3ea57da) when
+  building snap etc, trying to [get snap to build somehow](https://github.com/wekan/wekan-snap/issues/58).
+  This is just a test, does it build this time correctly.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.22 2018-07-30 Wekan release
+
+This release adds the following new features:
+
+- [Backup script now uses mongodump from snap to
+   do backups](https://github.com/wekan/wekan/wiki/Backup);
+- [Integration of Matomo](https://github.com/wekan/wekan/pull/1806);
+- [Enable/Disable API with env var](https://github.com/wekan/wekan/pull/1799).
+
+Thanks to GitHub user Akuket and xet7 for their contributions.
+
+# v1.21 2018-07-18 Wekan release
+
+This release adds the following new features:
+
+- [Add logo from Wekan website to login logo](https://github.com/wekan/wekan/commit/4eed23afe06d5fab8d45ba3decc7c1d3b85efbd8).
+
+and fixes the following bugs:
+
+- [Allow to resend invites](https://github.com/wekan/wekan/pull/1785).
+
+Thanks to GitHub users Akuket and xet7 for their contributions.
+
+# v1.20 2018-07-18 Wekan release
+
+This release fixes the following bugs:
+
+- [Remove SMTP settings from Admin Panel, because they are set in environment
+   variable settings like source/snap/docker already, and password was
+   exposed in plain text](https://github.com/wekan/wekan/issues/1783);
+- [Added info how to limit snap to root
+   user](https://github.com/wekan/wekan-snap/wiki/Limit-snap-to-root-user-only);
+- [Add scrolling to long cards](https://github.com/wekan/wekan/pull/1782).
+
+Thanks to GitHub users jnso, LyR33x and xet7 for their contributions.
+
 # v1.19 2018-07-16 Wekan release

 This release adds the following new features:
@@ -1,5 +1,5 @@
 FROM debian:buster-slim
-MAINTAINER wekan
+LABEL maintainer="wekan"

 # Declare Arguments
 ARG NODE_VERSION
@@ -10,33 +10,149 @@ 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

 # 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 gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7"
-ENV NODE_VERSION ${NODE_VERSION:-v8.11.3}
-ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1}
-ENV USE_EDGE ${USE_EDGE:-false}
-ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17}
-ENV NPM_VERSION ${NPM_VERSION:-latest}
-ENV FIBERS_VERSION ${FIBERS_VERSION:-2.0.0}
-ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64}
-ENV SRC_PATH ${SRC_PATH:-./}
+ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \
+    NODE_VERSION=v8.12.0 \
+    METEOR_RELEASE=1.6.0.1 \
+    USE_EDGE=false \
+    METEOR_EDGE=1.5-beta.17 \
+    NPM_VERSION=latest \
+    FIBERS_VERSION=2.0.0 \
+    ARCHITECTURE=linux-x64 \
+    SRC_PATH=./ \
+    WITH_API=true \
+    MATOMO_ADDRESS="" \
+    MATOMO_SITE_ID="" \
+    MATOMO_DO_NOT_TRACK=true \
+    MATOMO_WITH_USERNAME=false \
+    BROWSER_POLICY_ENABLED=true \
+    TRUSTED_URL="" \
+    WEBHOOKS_ATTRIBUTES="" \
+    OAUTH2_ENABLED=false \
+    OAUTH2_CLIENT_ID="" \
+    OAUTH2_SECRET="" \
+    OAUTH2_SERVER_URL="" \
+    OAUTH2_AUTH_ENDPOINT="" \
+    OAUTH2_USERINFO_ENDPOINT="" \
+    OAUTH2_TOKEN_ENDPOINT="" \
+    LDAP_ENABLE=false \
+    LDAP_PORT=389 \
+    LDAP_HOST="" \
+    LDAP_BASEDN="" \
+    LDAP_LOGIN_FALLBACK=false \
+    LDAP_RECONNECT=true \
+    LDAP_TIMEOUT=10000 \
+    LDAP_IDLE_TIMEOUT=10000 \
+    LDAP_CONNECT_TIMEOUT=10000 \
+    LDAP_AUTHENTIFICATION=false \
+    LDAP_AUTHENTIFICATION_USERDN="" \
+    LDAP_AUTHENTIFICATION_PASSWORD="" \
+    LDAP_LOG_ENABLED=false \
+    LDAP_BACKGROUND_SYNC=false \
+    LDAP_BACKGROUND_SYNC_INTERVAL=100 \
+    LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false \
+    LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS=false \
+    LDAP_ENCRYPTION=false \
+    LDAP_CA_CERT="" \
+    LDAP_REJECT_UNAUTHORIZED=false \
+    LDAP_USER_SEARCH_FILTER="" \
+    LDAP_USER_SEARCH_SCOPE="" \
+    LDAP_USER_SEARCH_FIELD="" \
+    LDAP_SEARCH_PAGE_SIZE=0 \
+    LDAP_SEARCH_SIZE_LIMIT=0 \
+    LDAP_GROUP_FILTER_ENABLE=false \
+    LDAP_GROUP_FILTER_OBJECTCLASS="" \
+    LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE="" \
+    LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE="" \
+    LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT="" \
+    LDAP_GROUP_FILTER_GROUP_NAME="" \
+    LDAP_UNIQUE_IDENTIFIER_FIELD="" \
+    LDAP_UTF8_NAMES_SLUGIFY=true \
+    LDAP_USERNAME_FIELD="" \
+    LDAP_FULLNAME_FIELD="" \
+    LDAP_MERGE_EXISTING_USERS=false \
+    LDAP_SYNC_USER_DATA=false \
+    LDAP_SYNC_USER_DATA_FIELDMAP="" \
+    LDAP_SYNC_GROUP_ROLES="" \
+    LDAP_DEFAULT_DOMAIN=""

 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app

 RUN \
+    set -o xtrace && \
    # Add non-root user wekan
    useradd --user-group --system --home-dir /home/wekan wekan && \
    \
    # OS dependencies
    apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \
    \
+    # Meteor installer doesn't work with the default tar binary, so using bsdtar while installing.
+    # https://github.com/coreos/bugs/issues/1095#issuecomment-350574389
+    cp $(which tar) $(which tar)~ && \
+    ln -sf $(which bsdtar) $(which tar) && \
+    \
    # Download nodejs
-    #wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
-    #wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
+    wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \
    #---------------------------------------------------------------------------------------------
    # Node Fibers 100% CPU usage issue:
    # https://github.com/wekan/wekan-mongodb/issues/2#issuecomment-381453161
@@ -45,10 +161,10 @@ RUN \
    # Also see beginning of wekan/server/authentication.js
    #   import Fiber from "fibers";
    #   Fiber.poolSize = 1e9;
-    # Download node version 8.11.1 that has fix included, node binary copied from Sandstorm
+    # OLD: Download node version 8.12.0 prerelease that has fix included, => Official 8.12.0 has been released
    # Description at https://releases.wekan.team/node.txt
-    wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
-    echo "40e7990489c13a1ed1173d8fe03af258c6ed964b92a4bd59a0927ac5931054aa  node-v8.11.3-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \
+    #wget https://releases.wekan.team/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \
+    #echo "1ed54adb8497ad8967075a0b5d03dd5d0a502be43d4a4d84e5af489c613d7795  node-v8.12.0-linux-x64.tar.gz" >> SHASUMS256.txt.asc && \
    \
    # Verify nodejs authenticity
    grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \
@@ -95,8 +211,11 @@ RUN \
    # Change user to wekan and install meteor
    cd /home/wekan/ && \
    chown wekan:wekan --recursive /home/wekan && \
-    curl https://install.meteor.com -o /home/wekan/install_meteor.sh && \
-    sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \
+    curl "https://install.meteor.com" -o /home/wekan/install_meteor.sh && \
+    #curl "https://install.meteor.com/?release=${METEOR_RELEASE}" -o /home/wekan/install_meteor.sh && \
+    # OLD: sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \
+    # Install Meteor forcing its progress
+    sed -i 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' ./install_meteor.sh && \
    echo "Starting meteor ${METEOR_RELEASE} installation...   \n" && \
    chown wekan:wekan /home/wekan/install_meteor.sh && \
    \
@@ -113,6 +232,8 @@ RUN \
    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 && \
    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; \
@@ -135,6 +256,9 @@ RUN \
    #gosu wekan:wekan npm install bcrypt && \
    mv /home/wekan/app_build/bundle /build && \
    \
+    # Put back the original tar
+    mv $(which tar)~ $(which tar) && \
+    \
    # Cleanup
    apt-get remove --purge -y ${BUILD_DEPS} && \
    apt-get autoremove -y && \
@@ -144,7 +268,8 @@ RUN \
    rm -R /home/wekan/app_build && \
    rm /home/wekan/install_meteor.sh

-ENV PORT=80
+ENV PORT=8080
 EXPOSE $PORT
+USER wekan

 CMD ["node", "/build/main.js"]
@@ -1,9 +1,4 @@
-# Wekan
-
-[![Translate Wekan at Transifex](https://img.shields.io/badge/Translate%20Wekan-at%20Transifex-brightgreen.svg "Freenode IRC")](https://transifex.com/wekan/wekan)
-
-[![Wekan Vanila Chat][vanila_badge]][vanila_chat] 
-[![IRC #wekan](https://img.shields.io/badge/IRC%20%23wekan-on%20Freenode-brightgreen.svg "Freenode IRC")](http://webchat.freenode.net?channels=%23wekan&uio=d4)
+# Wekan - Open Source kanban

 [![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors)
 [![Docker Repository on Quay](https://quay.io/repository/wekan/wekan/status "Docker Repository on Quay")](https://quay.io/repository/wekan/wekan)
@@ -15,53 +10,62 @@
 [![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)

-Please read [FAQ](https://github.com/wekan/wekan/wiki/FAQ).
-Please don't feed the trolls and spammers that are mentioned in the FAQ :)
+## [Translate Wekan at Transifex](https://transifex.com/wekan/wekan)
+
+Translations to non-English languages are accepted only at [Transifex](https://transifex.com/wekan/wekan) using webbrowser.
+New English strings of new features can be added as PRs to edge branch file wekan/i18n/en.i18n.json .
+
+## [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues)
+
+Please add most of your questions as GitHub issue: [Wekan feature requests and bugs](https://github.com/wekan/wekan/issues).
+It's better than at chat where details get lost when chat scrolls up.
+
+## Chat
+
+[![Wekan 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 IRC FAQ](https://github.com/wekan/wekan/wiki/IRC-FAQ)
+
+## FAQ
+
+**NOTE**: 
+- Please read the [FAQ](https://github.com/wekan/wekan/wiki/FAQ) first
+- Please don't feed the trolls and spammers that are mentioned in the FAQ :)
+
+## About Wekan

 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.

-Wekan has real-time user interface. Not all features are implemented.
+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 supports many [Platforms][platforms], and plan is to add more.
-
-[Integrations][integrations]
-
-[Team](https://github.com/wekan/wekan/wiki/Team)
-
-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.
+- [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.

 ## Roadmap

 [Roadmap](https://github.com/wekan/wekan/wiki/Roadmap)

-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.
+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.

-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.
-We also welcome sponsors for features, although we don't have any yet.
-By working directly with Wekan you get the benefit of active maintenance
-and new features added by growing Wekan developer community.
+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.
+
+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.
+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).

 ## Demo

@@ -73,9 +77,16 @@ bottom of the page for more info.

 [![Screenshot of Wekan][screenshot_wefork]][roadmap_wefork]

-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.
+## Stable
+
+- master+devel branch. At release, devel is merged to master.
+- Receives fixes and features that have been tested at edge that they work.
+- If you want automatic updates, [use Snap](https://github.com/wekan/wekan-snap/wiki/Install).
+- If you want to test before update, [use Docker quay.io release tags](https://github.com/wekan/wekan/wiki/Docker).
+
+## Edge
+
+- edge branch. All new fixes and features are added to here first. [Testing Edge](https://github.com/wekan/wekan-snap/wiki/Snap-Developer-Docs).

 ## License

@@ -1,4 +1,4 @@
-Security is very important to us. If discover any issue regarding security, please disclose
+Security is very important to us. If you discover any issue regarding security, please disclose
 the information responsibly by sending an email to security (at) wekan.team and not by
 creating a GitHub issue. We will respond swiftly to fix verifiable security issues.

@@ -28,8 +28,8 @@ added to the Wekan Hall of Fame.

 ## Which domains are in scope?

-No any public domains, because all those are donated to Wekan Open Source project,
-and we don't have any permissions to do security scans on those donated servers.
+No public domains, because all those are donated to Wekan Open Source project,
+and we don't have any permissions to do security scans on those donated servers

 Please don't perform research that could impact other users. Secondly, please keep
 the reports short and succinct. If we fail to understand the logics of your bug, we will tell you.
@@ -39,7 +39,7 @@ and scan it's vulnerabilities there.

 ## About Wekan versions

-There is only 2 versions of Wekan: Standalone Wekan, and Sandstorm Wekan.
+There are only 2 versions of Wekan: Standalone Wekan, and Sandstorm Wekan.

 ### Standalone Wekan Security

@@ -1,6 +1,6 @@
 {
  "name": "Wekan",
-  "description": "The open-source Trello-like kanban",
+  "description": "The open-source kanban",
  "repository": "https://github.com/wekan/wekan",
  "logo": "https://raw.githubusercontent.com/wekan/wekan/master/meta/icons/wekan-150.png",
  "keywords": ["productivity", "tool", "team", "kanban"],
@@ -14,6 +14,9 @@ template(name="boardActivities")
      p.activity-desc
        +memberName(user=user)

+        if($eq activityType 'deleteAttachment')
+          | {{{_ 'activity-delete-attach' cardLink}}}.
+
        if($eq activityType 'addAttachment')
          | {{{_ 'activity-attached' attachmentLink cardLink}}}.

@@ -31,12 +34,28 @@ template(name="boardActivities")
          .activity-checklist(href="{{ card.absoluteUrl }}")
            +viewer
              = checklist.title
+        if($eq activityType 'removeChecklist')
+          | {{{_ 'activity-checklist-removed' cardLink}}}.
+
+        if($eq activityType 'checkedItem')
+          | {{{_ 'activity-checked-item' checkItem checklist.title cardLink}}}.
+
+        if($eq activityType 'uncheckedItem')
+          | {{{_ 'activity-unchecked-item' checkItem checklist.title cardLink}}}.
+
+        if($eq activityType 'checklistCompleted')
+          | {{{_ 'activity-checklist-completed' checklist.title cardLink}}}.
+
+        if($eq activityType 'checklistUncompleted')
+          | {{{_ 'activity-checklist-uncompleted' checklist.title cardLink}}}.

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

        if($eq activityType 'archivedCard')
          | {{{_ 'activity-archived' cardLink}}}.
@@ -89,6 +108,12 @@ template(name="boardActivities")
        if($eq activityType 'restoredCard')
          | {{{_ 'activity-sent' cardLink boardLabel}}}.

+        if($eq activityType 'addedLabel')
+          | {{{_ 'activity-added-label' lastLabel cardLink}}}.
+
+        if($eq activityType 'removedLabel')
+          | {{{_ 'activity-removed-label' lastLabel cardLink}}}.
+
        if($eq activityType 'unjoinMember')
          if($eq user._id member._id)
            | {{{_ 'activity-unjoined' cardLink}}}.
@@ -119,6 +144,28 @@ template(name="cardActivities")
            | {{{_ 'activity-removed' cardLabel memberLink}}}.
        if($eq activityType 'archivedCard')
          | {{_ 'activity-archived' cardLabel}}.
+
+        if($eq activityType 'addedLabel')
+          | {{{_ 'activity-added-label-card' lastLabel }}}.
+
+        if($eq activityType 'removedLabel')
+          | {{{_ 'activity-removed-label-card' lastLabel }}}.
+
+        if($eq activityType 'removeChecklist')
+          | {{{_ 'activity-checklist-removed' cardLabel}}}.
+
+        if($eq activityType 'checkedItem')
+          | {{{_ 'activity-checked-item-card' checkItem checklist.title }}}.
+
+        if($eq activityType 'uncheckedItem')
+          | {{{_ 'activity-unchecked-item-card' checkItem checklist.title }}}.
+
+        if($eq activityType 'checklistCompleted')
+          | {{{_ 'activity-checklist-completed-card' checklist.title }}}.
+
+        if($eq activityType 'checklistUncompleted')
+          | {{{_ 'activity-checklist-uncompleted-card' checklist.title }}}.
+
        if($eq activityType 'restoredCard')
          | {{_ 'activity-sent' cardLabel boardLabel}}.
        if($eq activityType 'moveCard')
@@ -127,6 +174,10 @@ template(name="cardActivities")
          | {{{_ 'activity-attached' attachmentLink cardLabel}}}.
          if attachment.isImage
            img.attachment-image-preview(src=attachment.url)
+        if($eq activityType 'deleteAttachment')
+          | {{{_ 'activity-delete-attach'  cardLabel}}}.
+        if($eq activityType 'removedChecklist')
+          | {{{_ 'activity-checklist-removed' cardLabel}}}.
        if($eq activityType 'addChecklist')
          | {{{_ 'activity-checklist-added' cardLabel}}}.
          .activity-checklist
@@ -8,16 +8,24 @@ BlazeComponent.extendComponent({
    const sidebar = this.parentComponent(); // XXX for some reason not working
    sidebar.callFirstWith(null, 'resetNextPeak');
    this.autorun(() => {
-      const mode = this.data().mode;
+      let mode = this.data().mode;
      const capitalizedMode = Utils.capitalize(mode);
-      const id = Session.get(`current${capitalizedMode}`);
+      let thisId, searchId;
+      if (mode === 'linkedcard' || mode === 'linkedboard') {
+        thisId = Session.get('currentCard');
+        searchId = Cards.findOne({_id: thisId}).linkedId;
+        mode = mode.replace('linked', '');
+      } else {
+        thisId = Session.get(`current${capitalizedMode}`);
+        searchId = thisId;
+      }
      const limit = this.page.get() * activitiesPerPage;
      const user = Meteor.user();
      const hideSystem = user ? user.hasHiddenSystemMessages() : false;
-      if (id === null)
+      if (searchId === null)
        return;

-      this.subscribe('activities', mode, id, limit, hideSystem, () => {
+      this.subscribe('activities', mode, searchId, limit, hideSystem, () => {
        this.loadNextPageLocked = false;

        // If the sibear peak hasn't increased, that mean that there are no more
@@ -42,6 +50,12 @@ BlazeComponent.extendComponent({
    }
  },

+  checkItem(){
+    const checkItemId = this.currentData().checklistItemId;
+    const checkItem = ChecklistItems.findOne({_id:checkItemId});
+    return checkItem.title;
+  },
+
  boardLabel() {
    return TAPi18n.__('this-board');
  },
@@ -58,6 +72,16 @@ BlazeComponent.extendComponent({
    }, card.title));
  },

+  lastLabel(){
+    const lastLabelId = this.currentData().labelId;
+    const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(lastLabelId);
+    if(lastLabel.name === undefined || lastLabel.name === ''){
+      return lastLabel.color;
+    }else{
+      return lastLabel.name;
+    }
+  },
+
  listLabel() {
    return this.currentData().list().title;
  },
@@ -21,11 +21,18 @@ BlazeComponent.extendComponent({
      'submit .js-new-comment-form'(evt) {
        const input = this.getInput();
        const text = input.val().trim();
+        const card = this.currentData();
+        let boardId = card.boardId;
+        let cardId = card._id;
+        if (card.isLinkedCard()) {
+          boardId = Cards.findOne(card.linkedId).boardId;
+          cardId = card.linkedId;
+        }
        if (text) {
          CardComments.insert({
            text,
-            boardId: this.currentData().boardId,
-            cardId: this.currentData()._id,
+            boardId,
+            cardId,
          });
          resetCommentInput(input);
          Tracker.flush();
@@ -37,8 +37,7 @@ BlazeComponent.extendComponent({
          const currentBoard = Boards.findOne(Session.get('currentBoard'));
          Boards.remove(currentBoard._id);
        }
-        const board = this.currentData();
-        Boards.remove(board._id);
+        Boards.remove(this._id);
        FlowRouter.go('home');
      }),
    }];
@@ -147,6 +147,13 @@ BlazeComponent.extendComponent({
    });
  },

+  scrollTop(position = 0) {
+    const swimlanes = this.$('.js-swimlanes');
+    swimlanes && swimlanes.animate({
+      scrollTop: position,
+    });
+  },
+
 }).register('boardBody');

 BlazeComponent.extendComponent({
@@ -87,6 +87,10 @@ template(name="boardHeaderBar")
        if Filter.isActive
          a.board-header-btn-close.js-filter-reset(title="{{_ 'filter-clear'}}")
            i.fa.fa-times-thin
+      if currentUser.isAdmin
+        a.board-header-btn.js-open-rules-view(title="{{_ 'rules'}}")
+          i.fa.fa-magic
+          span {{_ 'rules'}}

      a.board-header-btn.js-open-search-view(title="{{_ 'search'}}")
        i.fa.fa-search
@@ -290,6 +294,11 @@ template(name="boardChangeTitlePopup")
      textarea.js-board-desc= 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'}}
@@ -108,6 +108,9 @@ BlazeComponent.extendComponent({
      'click .js-open-search-view'() {
        Sidebar.setView('search');
      },
+      'click .js-open-rules-view'() {
+        Modal.openWide('rulesMain');
+      },
      'click .js-multiselection-activate'() {
        const currentCard = Session.get('currentCard');
        MultiSelection.activate();
@@ -1,6 +1,8 @@
 template(name="boardList")
  .wrapper
    ul.board-list.clearfix
+      li.js-add-board
+        a.board-list-item.label {{_ 'add-board'}}
      each boards
        li(class="{{#if isStarred}}starred{{/if}}" class=colorClass)
          if isInvited
@@ -27,9 +29,6 @@ template(name="boardList")
                    title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")

                p.board-list-item-desc= description
-      li.js-add-board
-        a.board-list-item.label {{_ 'add-board'}}
-

 template(name="boardListHeaderBar")
  h1 {{_ 'my-boards'}}
@@ -57,8 +57,13 @@ Template.cardAttachmentsPopup.events({
    const card = this;
    FS.Utility.eachFile(evt, (f) => {
      const file = new FS.File(f);
-      file.boardId = card.boardId;
-      file.cardId = card._id;
+      if (card.isLinkedCard()) {
+        file.boardId = Cards.findOne(card.linkedId).boardId;
+        file.cardId = card.linkedId;
+      } else {
+        file.boardId = card.boardId;
+        file.cardId = card._id;
+      }
      file.userId = Meteor.userId();

      const attachment = Attachments.insert(file);
@@ -96,7 +96,7 @@ Template.dateBadge.helpers({
 (class extends DatePicker {
  onCreated() {
    super.onCreated();
-    this.data().receivedAt && this.date.set(moment(this.data().receivedAt));
+    this.data().getReceived() && this.date.set(moment(this.data().getReceived()));
  }

  _storeDate(date) {
@@ -104,7 +104,7 @@ Template.dateBadge.helpers({
  }

  _deleteDate() {
-    this.card.unsetReceived();
+    this.card.setReceived(null);
  }
 }).register('editCardReceivedDatePopup');

@@ -113,13 +113,13 @@ Template.dateBadge.helpers({
 (class extends DatePicker {
  onCreated() {
    super.onCreated();
-    this.data().startAt && this.date.set(moment(this.data().startAt));
+    this.data().getStart() && this.date.set(moment(this.data().getStart()));
  }

  onRendered() {
    super.onRendered();
-    if (moment.isDate(this.card.receivedAt)) {
-      this.$('.js-datepicker').datepicker('setStartDate', this.card.receivedAt);
+    if (moment.isDate(this.card.getReceived())) {
+      this.$('.js-datepicker').datepicker('setStartDate', this.card.getReceived());
    }
  }

@@ -128,7 +128,7 @@ Template.dateBadge.helpers({
  }

  _deleteDate() {
-    this.card.unsetStart();
+    this.card.setStart(null);
  }
 }).register('editCardStartDatePopup');

@@ -136,13 +136,13 @@ Template.dateBadge.helpers({
 (class extends DatePicker {
  onCreated() {
    super.onCreated();
-    this.data().dueAt && this.date.set(moment(this.data().dueAt));
+    this.data().getDue() && this.date.set(moment(this.data().getDue()));
  }

  onRendered() {
    super.onRendered();
-    if (moment.isDate(this.card.startAt)) {
-      this.$('.js-datepicker').datepicker('setStartDate', this.card.startAt);
+    if (moment.isDate(this.card.getStart())) {
+      this.$('.js-datepicker').datepicker('setStartDate', this.card.getStart());
    }
  }

@@ -151,7 +151,7 @@ Template.dateBadge.helpers({
  }

  _deleteDate() {
-    this.card.unsetDue();
+    this.card.setDue(null);
  }
 }).register('editCardDueDatePopup');

@@ -159,13 +159,13 @@ Template.dateBadge.helpers({
 (class extends DatePicker {
  onCreated() {
    super.onCreated();
-    this.data().endAt && this.date.set(moment(this.data().endAt));
+    this.data().getEnd() && this.date.set(moment(this.data().getEnd()));
  }

  onRendered() {
    super.onRendered();
-    if (moment.isDate(this.card.startAt)) {
-      this.$('.js-datepicker').datepicker('setStartDate', this.card.startAt);
+    if (moment.isDate(this.card.getStart())) {
+      this.$('.js-datepicker').datepicker('setStartDate', this.card.getStart());
    }
  }

@@ -174,7 +174,7 @@ Template.dateBadge.helpers({
  }

  _deleteDate() {
-    this.card.unsetEnd();
+    this.card.setEnd(null);
  }
 }).register('editCardEndDatePopup');

@@ -213,19 +213,23 @@ class CardReceivedDate extends CardDate {
    super.onCreated();
    const self = this;
    self.autorun(() => {
-      self.date.set(moment(self.data().receivedAt));
+      self.date.set(moment(self.data().getReceived()));
    });
  }

  classes() {
    let classes = 'received-date ';
-    const dueAt = this.data().dueAt;
-    if (dueAt) {
-      if (this.date.get().isBefore(this.now.get(), 'minute') &&
-          this.now.get().isBefore(dueAt)) {
-        classes += 'current';
-      }
-    }
+    const dueAt = this.data().getDue();
+    const endAt = this.data().getEnd();
+    const startAt = this.data().getStart();
+    const theDate = this.date.get();
+    // if dueAt, endAt and startAt exist & are > receivedAt, receivedAt doesn't need to be flagged
+    if (((startAt) && (theDate.isAfter(dueAt))) ||
+       ((endAt) && (theDate.isAfter(endAt))) ||
+       ((dueAt) && (theDate.isAfter(dueAt))))
+      classes += 'long-overdue';
+    else
+      classes += 'current';
    return classes;
  }

@@ -246,19 +250,24 @@ class CardStartDate extends CardDate {
    super.onCreated();
    const self = this;
    self.autorun(() => {
-      self.date.set(moment(self.data().startAt));
+      self.date.set(moment(self.data().getStart()));
    });
  }

  classes() {
    let classes = 'start-date' + ' ';
-    const dueAt = this.data().dueAt;
-    if (dueAt) {
-      if (this.date.get().isBefore(this.now.get(), 'minute') &&
-          this.now.get().isBefore(dueAt)) {
-        classes += 'current';
-      }
-    }
+    const dueAt = this.data().getDue();
+    const endAt = this.data().getEnd();
+    const theDate = this.date.get();
+    const now = this.now.get();
+    // if dueAt or endAt exist & are > startAt, startAt doesn't need to be flagged
+    if (((endAt) && (theDate.isAfter(endAt))) ||
+       ((dueAt) && (theDate.isAfter(dueAt))))
+      classes += 'long-overdue';
+    else if (theDate.isBefore(now, 'minute'))
+      classes += 'almost-due';
+    else
+      classes += 'current';
    return classes;
  }

@@ -279,24 +288,21 @@ class CardDueDate extends CardDate {
    super.onCreated();
    const self = this;
    self.autorun(() => {
-      self.date.set(moment(self.data().dueAt));
+      self.date.set(moment(self.data().getDue()));
    });
  }

  classes() {
    let classes = 'due-date' + ' ';
-
-    // if endAt exists & is < dueAt, dueAt doesn't need to be flagged
-    const endAt = this.data().endAt;
+    const endAt = this.data().getEnd();
    const theDate = this.date.get();
    const now = this.now.get();
-
-    if ((endAt !== 0) &&
-       (endAt !== null) &&
-       (endAt !== '') &&
-       (endAt !== undefined) &&
-       (theDate.isBefore(endAt)))
+    // if the due date is after the end date, green - done early
+    if ((endAt) && (theDate.isAfter(endAt)))
      classes += 'current';
+    // if there is an end date, don't need to flag the due date
+    else if (endAt)
+      classes += '';
    else if (now.diff(theDate, 'days') >= 2)
      classes += 'long-overdue';
    else if (now.diff(theDate, 'minute') >= 0)
@@ -323,22 +329,20 @@ class CardEndDate extends CardDate {
    super.onCreated();
    const self = this;
    self.autorun(() => {
-      self.date.set(moment(self.data().endAt));
+      self.date.set(moment(self.data().getEnd()));
    });
  }

  classes() {
    let classes = 'end-date' + ' ';
-    const dueAt = this.data.dueAt;
-    if (dueAt) {
-      const diff = dueAt.diff(this.date.get(), 'days');
-      if (diff >= 2)
-        classes += 'long-overdue';
-      else if (diff > 0)
-        classes += 'due';
-      else if (diff <= 0)
-        classes += 'current';
-    }
+    const dueAt = this.data().getDue();
+    const theDate = this.date.get();
+    if (theDate.diff(dueAt, 'days') >= 2)
+      classes += 'long-overdue';
+    else if (theDate.diff(dueAt, 'days') >= 0)
+      classes += 'due';
+    else if (theDate.diff(dueAt, 'days') >= -2)
+      classes += 'almost-due';
    return classes;
  }

@@ -43,12 +43,12 @@
  &.start-date
    time
      &::before
-        content: "\f08b"  // symbol: fa-sign-out
+        content: "\f251"  // symbol: fa-hourglass-start

  &.received-date
    time
      &::before
-        content: "\f251"  // symbol: fa-hourglass-start
+        content: "\f08b"  // symbol: fa-sign-out

  time
    &::before
@@ -10,7 +10,7 @@ template(name="cardDetails")
        h2.card-details-title.js-card-title(
          class="{{#if canModifyCard}}js-open-inlined-form is-editable{{/if}}")
            +viewer
-              = title
+              = getTitle
              if isWatching
                i.fa.fa-eye.card-details-watch
        .card-details-path
@@ -19,43 +19,56 @@ 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 archived
-      p.warning {{_ 'card-archived'}}
+    if getArchived
+      if isLinkedBoard
+        unless isSandstorm
+          p.warning {{_ 'board-archived'}}
+      else
+        p.warning {{_ 'card-archived'}}

    .card-details-items
      .card-details-item.card-details-item-received
        h3.card-details-item-title {{_ 'card-received'}}
-        if receivedAt
+        if getReceived
          +cardReceivedDate
        else
-          a.js-received-date {{_ 'add'}}
+          if canModifyCard
+            a.js-received-date {{_ 'add'}}

      .card-details-item.card-details-item-start
        h3.card-details-item-title {{_ 'card-start'}}
-        if startAt
+        if getStart
          +cardStartDate
        else
-          a.js-start-date {{_ 'add'}}
+          if canModifyCard
+            a.js-start-date {{_ 'add'}}

      .card-details-item.card-details-item-due
        h3.card-details-item-title {{_ 'card-due'}}
-        if dueAt
+        if getDue
          +cardDueDate
        else
-          a.js-due-date {{_ 'add'}}
+          if canModifyCard
+            a.js-due-date {{_ 'add'}}

      .card-details-item.card-details-item-end
        h3.card-details-item-title {{_ 'card-end'}}
-        if endAt
+        if getEnd
          +cardEndDate
        else
-          a.js-end-date {{_ 'add'}}
+          if canModifyCard
+            a.js-end-date {{_ 'add'}}

    .card-details-items
      .card-details-item.card-details-item-members
        h3.card-details-item-title {{_ 'members'}}
-        each members
+        each getMembers
          +userAvatar(userId=this cardId=../_id)
          | {{! XXX Hack to hide syntaxic coloration /// }}
        if canModifyCard
@@ -79,9 +92,9 @@ template(name="cardDetails")
          +cardCustomField

    .card-details-items
-      if spentTime
+      if getSpentTime
        .card-details-item.card-details-item-spent
-          if isOvertime
+          if getIsOvertime
            h3.card-details-item-title {{_ 'overtime-hours'}}
          else
            h3.card-details-item-title {{_ 'spent-time-hours'}}
@@ -92,15 +105,15 @@ template(name="cardDetails")
      h3.card-details-item-title {{_ 'description'}}
      +inlinedCardDescription(classNames="card-description js-card-description")
        +editor(autofocus=true)
-          | {{getUnsavedValue 'cardDescription' _id description}}
+          | {{getUnsavedValue 'cardDescription' _id getDescription}}
        .edit-controls.clearfix
          button.primary(type="submit") {{_ 'save'}}
          a.fa.fa-times-thin.js-close-inlined-form
      else
        a.js-open-inlined-form
-          if description
+          if getDescription
            +viewer
-              = description
+              = getDescription
          else
            | {{_ 'edit'}}
        if (hasUnsavedValue 'cardDescription' _id)
@@ -109,10 +122,10 @@ template(name="cardDetails")
            a.js-open-inlined-form {{_ 'view-it'}}
            = ' - '
            a.js-close-inlined-form {{_ 'discard'}}
-    else if description
+    else if getDescription
      h3.card-details-item-title {{_ 'description'}}
      +viewer
-        = description
+        = getDescription

    .card-details-items
      .card-details-item.card-details-item-name
@@ -122,14 +135,14 @@ template(name="cardDetails")
            +editCardRequesterForm
          else
            a.js-open-inlined-form
-              if requestedBy
+              if getRequestedBy
                +viewer
-                  = requestedBy
+                  = getRequestedBy
              else
                | {{_ 'add'}}
-        else if requestedBy
+        else if getRequestedBy
          +viewer
-            = requestedBy
+            = getRequestedBy

      .card-details-item.card-details-item-name
        h3.card-details-item-title {{_ 'assigned-by'}}
@@ -138,14 +151,14 @@ template(name="cardDetails")
            +editCardAssignerForm
          else
            a.js-open-inlined-form
-              if assignedBy
+              if getAssignedBy
                +viewer
-                  = assignedBy
+                  = getAssignedBy
              else
                | {{_ 'add'}}
-        else if requestedBy
+        else if getRequestedBy
          +viewer
-            = assignedBy
+            = getAssignedBy

    hr
    +checklists(cardId = _id)
@@ -162,36 +175,46 @@ template(name="cardDetails")
    +attachmentsGalery

    hr
-    .activity-title
-      h3 {{ _ 'activity'}}
-      if currentUser.isBoardMember
-        .material-toggle-switch
-          span.toggle-switch-title {{_ 'hide-system-messages'}}
-          if hiddenSystemMessages
-            input.toggle-switch(type="checkbox" id="toggleButton" checked="checked")
-          else
-            input.toggle-switch(type="checkbox" id="toggleButton")
-          label.toggle-label(for="toggleButton")
+    unless currentUser.isNoComments
+      .activity-title
+        h3 {{ _ 'activity'}}
+        if currentUser.isBoardMember
+          .material-toggle-switch
+            span.toggle-switch-title {{_ 'hide-system-messages'}}
+            if hiddenSystemMessages
+              input.toggle-switch(type="checkbox" id="toggleButton" checked="checked")
+            else
+              input.toggle-switch(type="checkbox" id="toggleButton")
+            label.toggle-label(for="toggleButton")
    if currentUser.isBoardMember
-      +commentForm
-    if isLoaded.get
-      +activities(card=this mode="card")
+      unless currentUser.isNoComments
+        +commentForm
+    unless currentUser.isNoComments
+      if isLoaded.get
+        if isLinkedCard
+          unless isSandstorm
+            +activities(card=this mode="linkedcard")
+        else if isLinkedBoard
+          unless isSandstorm
+            +activities(card=this mode="linkedboard")
+        else
+          +activities(card=this mode="card")

 template(name="editCardTitleForm")
  textarea.js-edit-card-title(rows='1' autofocus)
-    = title
+    = 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=requestedBy)
+  input.js-edit-card-requester(type='text' autofocus value=getRequestedBy)
  .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=assignedBy)
+  input.js-edit-card-assigner(type='text' autofocus value=getAssignedBy)
  .edit-controls.clearfix
    button.primary.confirm.js-submit-edit-card-assigner-form(type="submit") {{_ 'save'}}
    a.fa.fa-times-thin.js-close-inlined-form
@@ -230,7 +253,7 @@ template(name="moveCardPopup")
 template(name="copyCardPopup")
  label(for='copy-card-title') {{_ 'title'}}:
  textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus)
-    = title
+    = getTitle
  +boardsAndLists

 template(name="copyChecklistToManyCardsPopup")
@@ -69,6 +69,20 @@ BlazeComponent.extendComponent({
    if (offset) {
      bodyBoardComponent.scrollLeft(cardContainerScroll + offset);
    }
+
+    //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(topOffset !== false) {
+      bodyBoardComponent.scrollTop(topOffset);
+    }
+
  },

  presentParentTask() {
@@ -96,7 +110,11 @@ BlazeComponent.extendComponent({
  },

  onRendered() {
-    if (!Utils.isMiniScreen()) this.scrollParentContainer();
+    if (!Utils.isMiniScreen()) {
+      Meteor.setTimeout(() => {
+        this.scrollParentContainer();
+      }, 500);
+    }
    const $checklistsDom = this.$('.card-checklist-items');

    $checklistsDom.sortable({
@@ -274,7 +292,7 @@ BlazeComponent.extendComponent({
  close(isReset = false) {
    if (this.isOpen.get() && !isReset) {
      const draft = this.getValue().trim();
-      if (draft !== Cards.findOne(Session.get('currentCard')).description) {
+      if (draft !== Cards.findOne(Session.get('currentCard')).getDescription()) {
        UnsavedEdits.set(this._getUnsavedEditKey(), this.getValue());
      }
    }
@@ -5,7 +5,8 @@
  flex-shrink: 0
  flex-basis: 470px
  will-change: flex-basis
-  overflow: hidden
+  overflow-y: scroll
+  overflow-x: hidden
  background: darken(white, 3%)
  border-radius: bottom 3px
  z-index: 20 !important
@@ -46,6 +47,12 @@
      margin: 7px 0 0
      padding: 0

+    .linked-card-location
+      font-style: italic
+      font-size: 1em
+      margin-bottom: 0
+      & p
+        margin-bottom: 0

    form.inlined-form
      margin-top: 5px
@@ -3,10 +3,10 @@ template(name="editCardSpentTime")
    form.edit-time
      .fields
        label(for="time") {{_ 'time'}}
-        input.js-time-field#time(type="number" step="0.01" name="time" value="{{card.spentTime}}" placeholder=timeFormat autofocus)
+        input.js-time-field#time(type="number" step="0.01" name="time" value="{{card.getSpentTime}}" placeholder=timeFormat autofocus)
        label(for="overtime") {{_ 'overtime'}}
        a.js-toggle-overtime
-          .materialCheckBox#overtime(class="{{#if card.isOvertime}}is-checked{{/if}}" name="overtime")
+          .materialCheckBox#overtime(class="{{#if getIsOvertime}}is-checked{{/if}}" name="overtime")

      if error.get
        .warning {{_ error.get}}
@@ -15,8 +15,8 @@ template(name="editCardSpentTime")

 template(name="timeBadge")
  if canModifyCard
-    a.js-edit-time.card-time(title="{{showTitle}}" class="{{#if isOvertime}}card-label-red{{else}}card-label-green{{/if}}")
+    a.js-edit-time.card-time(title="{{showTitle}}" class="{{#if getIsOvertime}}card-label-red{{else}}card-label-green{{/if}}")
      | {{showTime}}
  else
-    a.card-time(title="{{showTitle}}" class="{{#if isOvertime}}card-label-red{{else}}card-label-green{{/if}}")
+    a.card-time(title="{{showTitle}}" class="{{#if getIsOvertime}}card-label-red{{else}}card-label-green{{/if}}")
      | {{showTime}}
@@ -7,17 +7,17 @@ BlazeComponent.extendComponent({
    this.card = this.data();
  },
  toggleOvertime() {
-    this.card.isOvertime = !this.card.isOvertime;
+    this.card.setIsOvertime(!this.card.getIsOvertime());
    $('#overtime .materialCheckBox').toggleClass('is-checked');

    $('#overtime').toggleClass('is-checked');
  },
  storeTime(spentTime, isOvertime) {
    this.card.setSpentTime(spentTime);
-    this.card.setOvertime(isOvertime);
+    this.card.setIsOvertime(isOvertime);
  },
  deleteTime() {
-    this.card.unsetSpentTime();
+    this.card.setSpentTime(null);
  },
  events() {
    return [{
@@ -26,7 +26,7 @@ BlazeComponent.extendComponent({
        evt.preventDefault();

        const spentTime = parseFloat(evt.target.time.value);
-        const isOvertime = this.card.isOvertime;
+        const isOvertime = this.card.getIsOvertime();

        if (spentTime >= 0) {
          this.storeTime(spentTime, isOvertime);
@@ -55,17 +55,14 @@ BlazeComponent.extendComponent({
    self.time = ReactiveVar();
  },
  showTitle() {
-    if (this.data().isOvertime) {
-      return `${TAPi18n.__('overtime')} ${this.data().spentTime} ${TAPi18n.__('hours')}`;
+    if (this.data().getIsOvertime()) {
+      return `${TAPi18n.__('overtime')} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
    } else {
-      return `${TAPi18n.__('card-spent')} ${this.data().spentTime} ${TAPi18n.__('hours')}`;
+      return `${TAPi18n.__('card-spent')} ${this.data().getSpentTime()} ${TAPi18n.__('hours')}`;
    }
  },
  showTime() {
-    return this.data().spentTime;
-  },
-  isOvertime() {
-    return this.data().isOvertime;
+    return this.data().getSpentTime();
  },
  events() {
    return [{
@@ -74,8 +74,10 @@ BlazeComponent.extendComponent({
    event.preventDefault();
    const textarea = this.find('textarea.js-add-checklist-item');
    const title = textarea.value.trim();
-    const cardId = this.currentData().cardId;
+    let cardId = this.currentData().cardId;
    const card = Cards.findOne(cardId);
+    if (card.isLinked())
+      cardId = card.linkedId;

    if (title) {
      Checklists.insert({
@@ -1,5 +1,7 @@
 template(name="minicard")
-  .minicard
+  .minicard(
+    class="{{#if isLinkedCard}}linked-card{{/if}}"
+    class="{{#if isLinkedBoard}}linked-board{{/if}}")
    if cover
      .minicard-cover(style="background-image: url('{{cover.url}}');")
    if labels
@@ -13,8 +15,16 @@ template(name="minicard")
      if $eq 'prefix-with-parent' currentBoard.presentParentTask
        .parent-prefix
          | {{ parentCardName }}
+      if isLinkedBoard
+        a.js-linked-link
+          span.linked-icon.fa.fa-folder
+      else if isLinkedCard
+        a.js-linked-link
+          span.linked-icon.fa.fa-id-card
+      if getArchived
+        span.linked-icon.linked-archived.fa.fa-archive
      +viewer
-        | {{ title }}
+        = getTitle
      if $eq 'subtext-with-full-path' currentBoard.presentParentTask
        .parent-subtext
          | {{ parentString ' > ' }}
@@ -23,23 +33,19 @@ template(name="minicard")
          | {{ parentCardName }}

    .dates
-      if receivedAt
-        unless startAt
-          unless dueAt
-            unless endAt
+      if getReceived
+        unless getStart
+          unless getDue
+            unless getEnd
              .date
                +minicardReceivedDate
-      if startAt
+      if getStart
        .date
          +minicardStartDate
-      if dueAt
-        unless endAt
-          .date
-            +minicardDueDate
-      if endAt
+      if getDue
        .date
-          +minicardEndDate
-      if spentTime
+          +minicardDueDate
+      if getSpentTime
        .date
          +cardSpentTime

@@ -47,24 +53,26 @@ template(name="minicard")
      each customFieldsWD
        if definition.showOnCard
          .minicard-custom-field
-            .minicard-custom-field-item
-              = definition.name
+            if definition.showLabelOnMiniCard
+              .minicard-custom-field-item
+                = definition.name
            .minicard-custom-field-item
              +viewer
                = trueValue

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

    .badges
-      if comments.count
-        .badge(title="{{_ 'card-comments-title' comments.count }}")
-          span.badge-icon.fa.fa-comment-o.badge-comment
-          span.badge-text= comments.count
-      if description
-        .badge.badge-state-image-only(title=description)
+      unless currentUser.isNoComments
+        if comments.count
+          .badge(title="{{_ 'card-comments-title' comments.count }}")
+            span.badge-icon.fa.fa-comment-o.badge-comment
+            span.badge-text= comments.count
+      if getDescription
+        .badge.badge-state-image-only(title=getDescription)
          span.badge-icon.fa.fa-align-left
      if attachments.count
        .badge
@@ -6,4 +6,15 @@ BlazeComponent.extendComponent({
  template() {
    return 'minicard';
  },
+
+  events() {
+    return [{
+      'click .js-linked-link' () {
+        if (this.data().isLinkedCard())
+          Utils.goCardId(this.data().linkedId);
+        else if (this.data().isLinkedBoard())
+          Utils.goBoardId(this.data().linkedId);
+      },
+    }];
+  },
 }).register('minicard');
@@ -44,6 +44,16 @@
  transition: transform 0.2s,
              border-radius 0.2s

+  &.linked-board
+  &.linked-card
+    .linked-icon
+      display: inline-block
+      margin-right: 11px
+      vertical-align: baseline
+      font-size: 0.9em
+    .linked-archived
+      color: #937760
+
  .is-selected &
    transform: translateX(11px)
    border-bottom-right-radius: 0
@@ -87,6 +97,8 @@
  .minicard-title
    p:last-child
      margin-bottom: 0
+    .viewer
+      display: inline-block
  .dates
    display: flex;
    flex-direction: row;
@@ -29,6 +29,7 @@ BlazeComponent.extendComponent({
        boardId: targetBoard._id,
        sort: sortIndex,
        swimlaneId,
+        type: 'cardType-card',
      });

      // In case the filter is active we need to add the newly inserted card in
@@ -1,10 +1,10 @@
@import 'nib'

+select,
 textarea,
 input:not([type=file]),
 button
  box-sizing: border-box
-  -webkit-appearance: none
  background-color: #ebebeb
  border: 1px solid #ccc
  border-radius: 3px
@@ -225,9 +225,12 @@ textarea

 .edit-controls,
 .add-controls
+  display: flex
+  align-items: baseline
  margin-top: 0

  button[type=submit]
+  input[type=button]
    float: left
    height: 32px
    margin-top: -2px
@@ -12,11 +12,11 @@ template(name="import")

 template(name="importTextarea")
  form
-    p: label(for='import-textarea') {{_ instruction}}
+    p: label(for='import-textarea') {{_ instruction}} {{_ 'import-board-instruction-about-errors'}}
    textarea.js-import-json(placeholder="{{_ 'import-json-placeholder'}}" autofocus)
      | {{jsonText}}
    if isSandstorm
-      h1.warning DANGER !!! THIS DESTROYS YOUR IMPORTED DATA, CAUSES BOARD NOT FOUND ERROR WHEN YOU OPEN THIS GRAIN AGAIN https://github.com/wekan/wekan/issues/1430
+      h1.warning {{_ 'import-sandstorm-backup-warning'}}
      p.warning {{_ 'import-sandstorm-warning'}}
    input.primary.wide(type="submit" value="{{_ 'import'}}")

@@ -47,6 +47,7 @@ BlazeComponent.extendComponent({
      items: itemsSelector,
      placeholder: 'minicard-wrapper placeholder',
      start(evt, ui) {
+        ui.helper.css('z-index', 1000);
        ui.placeholder.height(ui.helper.height());
        EscapeActions.executeUpTo('popup-close');
        boardComponent.setIsDragging(true);
@@ -187,3 +187,14 @@
      padding: 7px
      top: -@padding
      right: 17px
+
+.link-board-wrapper
+  display: flex
+  align-items: baseline
+
+  .js-link-board
+    margin-left: 15px
+
+.search-card-results
+  max-height: 250px
+  overflow: hidden
@@ -34,8 +34,62 @@ template(name="addCardForm")

  .add-controls.clearfix
    button.primary.confirm(type="submit") {{_ 'add'}}
-    a.fa.fa-times-thin.js-close-inlined-form
+    unless isSandstorm
+      span.quiet
+        | {{_ 'or'}}
+        a.js-link {{_ 'link'}}
+      span.quiet
+        | &nbsp;
+        | /
+        a.js-search {{_ 'search'}}

 template(name="autocompleteLabelLine")
  .minicard-label(class="card-label-{{colorName}}" title=labelName)
  span(class="{{#if hasNoName}}quiet{{/if}}")= labelName
+
+template(name="linkCardPopup")
+  label {{_ 'boards'}}:
+  .link-board-wrapper
+    select.js-select-boards
+      each boards
+        if $eq _id currentBoard._id
+          option(value="{{_id}}" selected) {{_ 'current'}}
+        else
+          option(value="{{_id}}") {{title}}
+    input.primary.confirm.js-link-board(type="button" value="{{_ 'link'}}")
+
+  label {{_ 'swimlanes'}}:
+  select.js-select-swimlanes
+    each swimlanes
+      option(value="{{_id}}") {{title}}
+
+  label {{_ 'lists'}}:
+  select.js-select-lists
+    each lists
+      option(value="{{_id}}") {{title}}
+
+  label {{_ 'cards'}}:
+  select.js-select-cards
+    each cards
+      option(value="{{getId}}") {{getTitle}}
+
+  .edit-controls.clearfix
+    unless isSandstorm
+      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
+          option(value="{{_id}}") {{title}}
+  form.js-search-term-form
+    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus)
+  .list-body.js-perfect-scrollbar.search-card-results
+    .minicards.clearfix.js-minicards
+      each results
+        a.minicard-wrapper.js-minicard
+          +minicard(this)
@@ -1,3 +1,5 @@
+const subManager = new SubsManager();
+
 BlazeComponent.extendComponent({
  mixins() {
    return [Mixins.PerfectScrollbar];
@@ -55,7 +57,10 @@ BlazeComponent.extendComponent({
        boardId: boardId._id,
        sort: sortIndex,
        swimlaneId,
+        type: 'cardType-card',
      });
+
+
      // 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.
@@ -149,6 +154,14 @@ BlazeComponent.extendComponent({
    this.labels = new ReactiveVar([]);
    this.members = new ReactiveVar([]);
    this.customFields = new ReactiveVar([]);
+
+    const currentBoardId = Session.get('currentBoard');
+    arr = [];
+    _.forEach(Boards.findOne(currentBoardId).customFields().fetch(), function(field){
+      if(field.automaticallyOnCard)
+        arr.push({_id: field._id, value: null});
+    });
+    this.customFields.set(arr);
  },

  reset() {
@@ -197,6 +210,8 @@ BlazeComponent.extendComponent({
  events() {
    return [{
      keydown: this.pressKey,
+      'click .js-link': Popup.open('linkCard'),
+      'click .js-search': Popup.open('searchCard'),
    }];
  },

@@ -268,3 +283,226 @@ BlazeComponent.extendComponent({
    });
  },
 }).register('addCardForm');
+
+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.selectedSwimlaneId = new ReactiveVar('');
+    this.selectedListId = new ReactiveVar('');
+
+    this.boardId = Session.get('currentBoard');
+    // In order to get current board info
+    subManager.subscribe('board', this.boardId);
+    this.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 = '';
+    const boardView = Meteor.user().profile.boardView;
+    if (boardView === 'board-view-swimlanes')
+      this.swimlaneId = Blaze.getData(swimlane[0])._id;
+    else if (boardView === 'board-view-lists')
+      this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
+  },
+
+  boards() {
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+    }, {
+      sort: ['title'],
+    });
+    return boards;
+  },
+
+  swimlanes() {
+    if (!this.selectedBoardId) {
+      return [];
+    }
+    const swimlanes = Swimlanes.find({boardId: this.selectedBoardId.get()});
+    if (swimlanes.count())
+      this.selectedSwimlaneId.set(swimlanes.fetch()[0]._id);
+    return swimlanes;
+  },
+
+  lists() {
+    if (!this.selectedBoardId) {
+      return [];
+    }
+    const lists = Lists.find({boardId: this.selectedBoardId.get()});
+    if (lists.count())
+      this.selectedListId.set(lists.fetch()[0]._id);
+    return lists;
+  },
+
+  cards() {
+    if (!this.board) {
+      return [];
+    }
+    const ownCardsIds = this.board.cards().map((card) => { return card.linkedId || card._id; });
+    return Cards.find({
+      boardId: this.selectedBoardId.get(),
+      swimlaneId: this.selectedSwimlaneId.get(),
+      listId: this.selectedListId.get(),
+      archived: false,
+      linkedId: {$nin: ownCardsIds},
+      _id: {$nin: ownCardsIds},
+    });
+  },
+
+  events() {
+    return [{
+      'change .js-select-boards'(evt) {
+        subManager.subscribe('board', $(evt.currentTarget).val());
+        this.selectedBoardId.set($(evt.currentTarget).val());
+      },
+      'change .js-select-swimlanes'(evt) {
+        this.selectedSwimlaneId.set($(evt.currentTarget).val());
+      },
+      'change .js-select-lists'(evt) {
+        this.selectedListId.set($(evt.currentTarget).val());
+      },
+      'click .js-done' (evt) {
+        // LINK CARD
+        evt.stopPropagation();
+        evt.preventDefault();
+        const linkedId = $('.js-select-cards option:selected').val();
+        if (!linkedId) {
+          Popup.close();
+          return;
+        }
+        const _id = Cards.insert({
+          title: $('.js-select-cards option:selected').text(), //dummy
+          listId: this.listId,
+          swimlaneId: this.swimlaneId,
+          boardId: this.boardId,
+          sort: Lists.findOne(this.listId).cards().count(),
+          type: 'cardType-linkedCard',
+          linkedId,
+        });
+        Filter.addException(_id);
+        Popup.close();
+      },
+      'click .js-link-board' (evt) {
+        //LINK BOARD
+        evt.stopPropagation();
+        evt.preventDefault();
+        const impBoardId = $('.js-select-boards option:selected').val();
+        if (!impBoardId || Cards.findOne({linkedId: impBoardId, archived: false})) {
+          Popup.close();
+          return;
+        }
+        const _id = Cards.insert({
+          title: $('.js-select-boards option:selected').text(), //dummy
+          listId: this.listId,
+          swimlaneId: this.swimlaneId,
+          boardId: this.boardId,
+          sort: Lists.findOne(this.listId).cards().count(),
+          type: 'cardType-linkedBoard',
+          linkedId: impBoardId,
+        });
+        Filter.addException(_id);
+        Popup.close();
+      },
+    }];
+  },
+}).register('linkCardPopup');
+
+BlazeComponent.extendComponent({
+  mixins() {
+    return [Mixins.PerfectScrollbar];
+  },
+
+  onCreated() {
+    // Prefetch first non-current board id
+    let board = Boards.findOne({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+    });
+    if (!board) {
+      Popup.close();
+      return;
+    }
+    const boardId = board._id;
+    // Subscribe to this board
+    subManager.subscribe('board', boardId);
+    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;
+    this.term = new ReactiveVar('');
+  },
+
+  boards() {
+    const boards = Boards.find({
+      archived: false,
+      'members.userId': Meteor.userId(),
+      _id: {$ne: Session.get('currentBoard')},
+    }, {
+      sort: ['title'],
+    });
+    return boards;
+  },
+
+  results() {
+    if (!this.selectedBoardId) {
+      return [];
+    }
+    const board = Boards.findOne(this.selectedBoardId.get());
+    return board.searchCards(this.term.get(), false);
+  },
+
+  events() {
+    return [{
+      'change .js-select-boards'(evt) {
+        subManager.subscribe('board', $(evt.currentTarget).val());
+        this.selectedBoardId.set($(evt.currentTarget).val());
+      },
+      'submit .js-search-term-form'(evt) {
+        evt.preventDefault();
+        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);
+        Popup.close();
+      },
+    }];
+  },
+}).register('searchCardPopup');
@@ -15,9 +15,8 @@ template(name="listHeader")
         |/#{wipLimit.value})

        if showCardsCountForList cards.count
-          = cards.count
-          span
-            |  {{_ 'cards-count'}}
+          |&nbsp;
+          p.quiet.small {{cardsCount}} {{_ 'cards-count'}}
      if isMiniScreen
        if currentList
          if isWatching
@@ -22,6 +22,16 @@ BlazeComponent.extendComponent({
    return Meteor.user().getLimitToShowCardsCount();
  },

+  cardsCount() {
+    const list = Template.currentData();
+    let swimlaneId = '';
+    const boardView = Meteor.user().profile.boardView;
+    if (boardView === 'board-view-swimlanes')
+      swimlaneId = this.parentComponent().parentComponent().data()._id;
+
+    return list.cards(swimlaneId).count();
+  },
+
  reachedWipLimit() {
    const list = Template.currentData();
    return list.getWipLimit('enabled') && list.getWipLimit('value') <= list.cards().count();
@@ -38,7 +38,10 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
  const view = this;
  const currentBoard = Boards.findOne(Session.get('currentBoard'));
  const knowedUsers = currentBoard.members.map((member) => {
-    member.username = Users.findOne(member.userId).username;
+    const u = Users.findOne(member.userId);
+    if(u){
+      member.username = u.username;
+    }
    return member;
  });
  const mentionRegex = /\B@([\w.]*)/gi;
@@ -47,6 +47,7 @@ template(name="header")
      +Template.dynamic(template=headerBar)

      unless hideLogo
+
        //-
          On sandstorm, the logo shouldn't be clickable, because we only have one
          page/document on it, and we don't want to see the home page containing
@@ -55,8 +56,9 @@ template(name="header")
          .wekan-logo
            img(src="{{pathFor '/wekan-logo-header.png'}}" alt="Wekan")
        else
-          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 '/wekan-logo-header.png'}}" alt="Wekan")

  if appIsOffline
    +offlineWarning
@@ -66,7 +68,8 @@ template(name="header")
      .announcement
        p
          i.fa.fa-bullhorn
-          | #{announcement}
+          +viewer
+            | #{announcement}
          i.fa.fa-times-circle.js-close-announcement

 template(name="offlineWarning")
@@ -1,11 +1,16 @@
 Meteor.subscribe('user-admin');
 Meteor.subscribe('boards');
+Meteor.subscribe('setting');

 Template.header.helpers({
  wrappedHeader() {
    return !Session.get('currentBoard');
  },

+  currentSetting() {
+    return Settings.findOne();
+  },
+
  hideLogo() {
    return Utils.isMiniScreen() && Session.get('currentBoard');
  },
@@ -9,14 +9,21 @@ head
    packages.
  link(rel="shortcut icon" href="/wekan-favicon.png")
  link(rel="apple-touch-icon" href="/wekan-favicon.png")
+  link(rel="mask-icon" href="/wekan-150.svg")
  link(rel="manifest" href="/wekan-manifest.json")

 template(name="userFormsLayout")
  section.auth-layout
-    h1.at-form-landing-logo
-      img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
+    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}}
@@ -35,11 +42,18 @@ template(name="defaultLayout")
  if (Modal.isOpen)
    #modal
      .overlay
-      .modal-content
-        a.modal-close-btn.js-close-modal
-          i.fa.fa-times-thin
-        +Template.dynamic(template=Modal.getHeaderName)
-        +Template.dynamic(template=Modal.getTemplateName)
+      if (Modal.isWide)
+        .modal-content-wide.modal-container
+          a.modal-close-btn.js-close-modal
+            i.fa.fa-times-thin
+          +Template.dynamic(template=Modal.getHeaderName)
+          +Template.dynamic(template=Modal.getTemplateName)
+      else
+        .modal-content.modal-container
+          a.modal-close-btn.js-close-modal
+            i.fa.fa-times-thin
+          +Template.dynamic(template=Modal.getHeaderName)
+          +Template.dynamic(template=Modal.getTemplateName)

 template(name="notFound")
  +message(label='page-not-found')
@@ -6,7 +6,29 @@ const i18nTagToT9n = (i18nTag) => {
  return i18nTag;
 };

+const validator = {
+  set(obj, prop, value) {
+    if (prop === 'state' && value !== 'signIn') {
+      $('.at-form-authentication').hide();
+    } else if (prop === 'state' && value === 'signIn') {
+      $('.at-form-authentication').show();
+    }
+    // The default behavior to store the value
+    obj[prop] = value;
+    // Indicate success
+    return true;
+  },
+};
+
+Template.userFormsLayout.onCreated(() => {
+  Meteor.subscribe('setting');
+
+});
+
 Template.userFormsLayout.onRendered(() => {
+
+  AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator);
+
  const i18nTag = navigator.language;
  if (i18nTag) {
    T9n.setLanguage(i18nTagToT9n(i18nTag));
@@ -15,6 +37,11 @@ Template.userFormsLayout.onRendered(() => {
 });

 Template.userFormsLayout.helpers({
+
+  currentSetting() {
+    return Settings.findOne();
+  },
+
  languages() {
    return _.map(TAPi18n.getLanguages(), (lang, code) => {
      const tag = code;
@@ -39,7 +66,7 @@ Template.userFormsLayout.helpers({
    const curLang = T9n.getLanguage() || 'en';
    return t9nTag === curLang;
  },
-
+/*
  isCas() {
    return Meteor.settings.public &&
      Meteor.settings.public.cas &&
@@ -49,6 +76,7 @@ Template.userFormsLayout.helpers({
  casSignInLabel() {
    return TAPi18n.__('casSignIn', {}, T9n.getLanguage() || 'en');
  },
+*/
 });

 Template.userFormsLayout.events({
@@ -64,6 +92,44 @@ Template.userFormsLayout.events({
      }
    });
  },
+  '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();
+        },
+      });
+    }
+  },
 });

 Template.defaultLayout.events({
@@ -61,6 +61,23 @@ body
      display: block
      float: right
      font-size: 24px
+  
+  .modal-content-wide
+    width: 800px
+    min-height: 0px
+    margin: 42px auto
+    padding: 12px
+    border-radius: 4px
+    background: darken(white, 13%)
+    z-index: 110
+
+    h2
+      margin-bottom: 25px
+
+    .modal-close-btn
+      display: block
+      float: right
+      font-size: 24px

 h1
  font-size: 22px
@@ -0,0 +1,46 @@
+template(name="boardActions")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-move-card-to'}}
+      div.trigger-dropdown
+        select(id="move-gen-action")
+          option(value="top") {{_'r-top-of'}}
+          option(value="bottom") {{_'r-bottom-of'}}
+      div.trigger-text 
+        | {{_'r-its-list'}}
+    div.trigger-button.js-add-gen-move-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-move-card-to'}}
+      div.trigger-dropdown
+        select(id="move-spec-action")
+          option(value="top") {{_'r-top-of'}}
+          option(value="bottom") {{_'r-bottom-of'}}
+      div.trigger-text 
+        | {{_'r-list'}}
+      div.trigger-dropdown
+        input(id="listName",type=text,placeholder="{{_'r-name'}}")
+    div.trigger-button.js-add-spec-move-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="arch-action")
+          option(value="archive") {{_'r-archive'}}
+          option(value="unarchive") {{_'r-unarchive'}}
+      div.trigger-text 
+        | {{_'r-card'}}
+    div.trigger-button.js-add-arch-action.js-goto-rules
+      i.fa.fa-plus  
+
+
+   
+  
+
+
+
@@ -0,0 +1,122 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+
+  },
+
+  events() {
+    return [{
+      'click .js-add-spec-move-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#move-spec-action').value;
+        const listTitle = this.find('#listName').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'top') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'moveCardToTop',
+            listTitle,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'bottom') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'moveCardToBottom',
+            listTitle,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+      'click .js-add-gen-move-action' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const boardId = Session.get('currentBoard');
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#move-gen-action').value;
+        if (actionSelected === 'top') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'moveCardToTop',
+            'listTitle': '*',
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'bottom') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'moveCardToBottom',
+            'listTitle': '*',
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+      'click .js-add-arch-action' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const boardId = Session.get('currentBoard');
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#arch-action').value;
+        if (actionSelected === 'archive') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'archive',
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'unarchive') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'unarchive',
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+    }];
+  },
+
+}).register('boardActions');
+/* eslint-no-undef */
@@ -0,0 +1,43 @@
+template(name="cardActions")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="label-action")
+          option(value="add") {{{_'r-add'}}}
+          option(value="remove") {{{_'r-remove'}}}
+      div.trigger-text 
+        | {{{_'r-label'}}}
+      div.trigger-dropdown
+        select(id="label-id")
+          each labels
+            option(value="#{_id}")
+              = name
+    div.trigger-button.js-add-label-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="member-action")
+          option(value="add") {{{_'r-add'}}}
+          option(value="remove") {{{_'r-remove'}}}
+      div.trigger-text 
+        | {{{_'r-member'}}}
+      div.trigger-dropdown
+        input(id="member-name",type=text,placeholder="{{{_'r-name'}}}")  
+    div.trigger-button.js-add-member-action.js-goto-rules
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{{_'r-remove-all'}}}
+    div.trigger-button.js-add-removeall-action.js-goto-rules
+      i.fa.fa-plus
+
+
+   
+  
+
+
+
@@ -0,0 +1,118 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+  },
+
+  labels() {
+    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();
+      }
+    }
+    return labels;
+  },
+
+  events() {
+    return [{
+      'click .js-add-label-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#label-action').value;
+        const labelId = this.find('#label-id').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'add') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'addLabel',
+            labelId,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'remove') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'removeLabel',
+            labelId,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+
+      },
+      'click .js-add-member-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#member-action').value;
+        const username = this.find('#member-name').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'add') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'addMember',
+            username,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+            desc,
+          });
+        }
+        if (actionSelected === 'remove') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'removeMember',
+            username,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+      'click .js-add-removeall-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const triggerId = Triggers.insert(trigger);
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const boardId = Session.get('currentBoard');
+        const actionId = Actions.insert({
+          actionType: 'removeMember',
+          'username': '*',
+          boardId,
+          desc,
+        });
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+        });
+      },
+    }];
+  },
+
+}).register('cardActions');
@@ -0,0 +1,51 @@
+template(name="checklistActions")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="check-action")
+          option(value="add") {{{_'r-add'}}}
+          option(value="remove") {{{_'r-remove'}}}
+      div.trigger-text 
+        | {{{_'r-checklist'}}}
+      div.trigger-dropdown
+        input(id="checklist-name",type=text,placeholder="{{{_'r-name'}}}")  
+    div.trigger-button.js-add-checklist-action.js-goto-rules
+      i.fa.fa-plus  
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="checkall-action")
+          option(value="check") {{{_'r-check-all'}}}
+          option(value="uncheck") {{{_'r-uncheck-all'}}}
+      div.trigger-text 
+        | {{{_'r-items-check'}}}
+      div.trigger-dropdown
+        input(id="checklist-name2",type=text,placeholder="{{{_'r-name'}}}")  
+    div.trigger-button.js-add-checkall-action.js-goto-rules
+      i.fa.fa-plus
+
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-dropdown
+        select(id="check-item-action")
+          option(value="check") {{{_'r-check'}}}
+          option(value="uncheck") {{{_'r-uncheck'}}}
+      div.trigger-text 
+        | {{{_'r-item'}}}
+      div.trigger-dropdown
+        input(id="checkitem-name",type=text,placeholder="{{{_'r-name'}}}")
+      div.trigger-text 
+        | {{{_'r-of-checklist'}}}
+      div.trigger-dropdown
+        input(id="checklist-name3",type=text,placeholder="{{{_'r-name'}}}")  
+    div.trigger-button.js-add-check-item-action.js-goto-rules
+      i.fa.fa-plus
+
+
+   
+  
+
+
+
@@ -0,0 +1,128 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+  },
+  events() {
+    return [{
+      'click .js-add-checklist-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#check-action').value;
+        const checklistName = this.find('#checklist-name').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'add') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'addChecklist',
+            checklistName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'remove') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'removeChecklist',
+            checklistName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+
+      },
+      'click .js-add-checkall-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const actionSelected = this.find('#checkall-action').value;
+        const checklistName = this.find('#checklist-name2').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'check') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'checkAll',
+            checklistName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'uncheck') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'uncheckAll',
+            checklistName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+      'click .js-add-check-item-action' (event) {
+        const ruleName = this.data().ruleName.get();
+        const trigger = this.data().triggerVar.get();
+        const checkItemName = this.find('#checkitem-name');
+        const checklistName = this.find('#checklist-name3');
+        const actionSelected = this.find('#check-item-action').value;
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        if (actionSelected === 'check') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'checkItem',
+            checklistName,
+            checkItemName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+        if (actionSelected === 'uncheck') {
+          const triggerId = Triggers.insert(trigger);
+          const actionId = Actions.insert({
+            actionType: 'uncheckItem',
+            checklistName,
+            checkItemName,
+            boardId,
+            desc,
+          });
+          Rules.insert({
+            title: ruleName,
+            triggerId,
+            actionId,
+            boardId,
+          });
+        }
+      },
+    }];
+  },
+
+}).register('checklistActions');
@@ -0,0 +1,11 @@
+template(name="mailActions")
+  div.trigger-item.trigger-item-mail
+    div.trigger-content.trigger-content-mail
+      div.trigger-text.trigger-text-email
+        | {{_'r-send-email'}}
+      div.trigger-dropdown-mail
+        input(id="email-to",type=text,placeholder="{{_'r-to'}}")
+      input(id="email-subject",type=text,placeholder="{{_'r-subject'}}")
+      textarea(id="email-msg")  
+    div.trigger-button.trigger-button-email.js-mail-action.js-goto-rules
+      i.fa.fa-plus
@@ -0,0 +1,35 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+
+  },
+
+  events() {
+    return [{
+      'click .js-mail-action' (event) {
+        const emailTo = this.find('#email-to').value;
+        const emailSubject = this.find('#email-subject').value;
+        const emailMsg = this.find('#email-msg').value;
+        const trigger = this.data().triggerVar.get();
+        const ruleName = this.data().ruleName.get();
+        const triggerId = Triggers.insert(trigger);
+        const boardId = Session.get('currentBoard');
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const actionId = Actions.insert({
+          actionType: 'sendEmail',
+          emailTo,
+          emailSubject,
+          emailMsg,
+          boardId,
+          desc,
+        });
+        Rules.insert({
+          title: ruleName,
+          triggerId,
+          actionId,
+          boardId,
+        });
+      },
+    }];
+  },
+
+}).register('mailActions');
@@ -0,0 +1,20 @@
+template(name="ruleDetails")
+  .rules
+    h2
+      i.fa.fa-magic
+      | {{{_ 'r-rule-details' }}}
+    .triggers-content
+        .triggers-body
+            .triggers-main-body
+                div.trigger-item
+                    div.trigger-content
+                        div.trigger-text 
+                        = trigger 
+                div.trigger-item
+                    div.trigger-content
+                        div.trigger-text 
+                        = action 
+    div.rules-back
+        button.js-goback
+          i.fa.fa-chevron-left
+          | {{{_ 'back'}}}
@@ -0,0 +1,38 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+    this.subscribe('allTriggers');
+    this.subscribe('allActions');
+
+  },
+
+  trigger() {
+    const ruleId = this.data().ruleId;
+    const rule = Rules.findOne({
+      _id: ruleId.get(),
+    });
+    const trigger = Triggers.findOne({
+      _id: rule.triggerId,
+    });
+    const desc = trigger.description();
+    const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1);
+    return upperdesc;
+  },
+  action() {
+    const ruleId = this.data().ruleId;
+    const rule = Rules.findOne({
+      _id: ruleId.get(),
+    });
+    const action = Actions.findOne({
+      _id: rule.actionId,
+    });
+    const desc = action.description();
+    const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1);
+    return upperdesc;
+  },
+
+  events() {
+    return [{}];
+  },
+
+}).register('ruleDetails');
@@ -0,0 +1,167 @@
+.rules-list
+  overflow:hidden
+  overflow-y:scroll
+  max-height: 400px
+.rules-lists-item
+  display: block
+  position: relative
+  overflow: auto
+  p
+  	display: inline-block
+  	float: left
+  	margin: revert
+
+.rules-btns-group
+  position: absolute
+  right: 0
+  top: 50%
+  transform: translateY(-50%)
+  button
+  	margin: auto
+.rules-add
+  display: block
+  overflow: auto
+  margin-top: 15px
+  margin-bottom: 5px
+  input
+  	display: inline-block
+  	float: right
+  	margin: auto
+  	margin-right: 10px
+  button
+  	display: inline-block
+  	float: right
+  	margin: auto
+.rules-back
+  display: block
+  overflow: auto
+  margin-top: 15px
+  margin-bottom: 5px
+  button
+    display: inline-block
+    float: right
+    margin: auto
+    margin-right:14px
+   
+.flex
+  display: -webkit-box
+  display: -moz-box
+  display: -webkit-flex
+  display: -moz-flex
+  display: -ms-flexbox
+  display: flex
+
+
+
+.triggers-content
+  color: #727479
+  background: #dedede
+  .triggers-body
+    display flex
+    padding-top 15px
+    height 100%
+
+    .triggers-side-menu
+      background-color: #f7f7f7
+      border: 1px solid #f0f0f0
+      border-radius: 4px
+      height: intrinsic
+      box-shadow: inset -1px -1px 3px rgba(0,0,0,.05)
+
+      ul
+
+        li
+          margin: 0.1rem 0.2rem;
+          width:50px
+          height:50px
+          text-align:center
+          font-size: 25px
+          position: relative
+          
+          i
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            box-shadow: none
+            transform: translate(-50%,-50%);
+
+
+          &.active
+            background #fff
+            box-shadow 0 1px 2px rgba(0,0,0,0.15);
+
+          &:hover
+            background #fff
+            box-shadow 0 1px 2px rgba(0,0,0,0.15);
+          a
+            @extends .flex
+            padding: 1rem 0 1rem 1rem
+            width: 100% - 5rem
+
+
+            span
+              font-size: 13px
+    .triggers-main-body
+      padding: 0.1em 1em
+      width:100%
+      .trigger-item
+        overflow:auto
+        padding:10px
+        height:40px
+        margin-bottom:5px
+        border-radius: 3px
+        position: relative
+        background-color: white
+        .trigger-content
+            position:absolute
+            top:50%
+            transform: translateY(-50%)
+            left:10px
+            .trigger-text
+              font-size: 16px
+              display:inline-block
+            .trigger-text.trigger-text-email
+              margin-left: 5px;
+              margin-top: 10px;
+              margin-bottom: 10px;
+            .trigger-dropdown
+              display:inline-block
+              select
+                width:auto
+                height:30px
+                margin:0px
+                margin-left:5px
+              input
+                display: inline-block
+                width: 80px;
+                margin: 0;
+        .trigger-content-mail
+          left:20px
+          right:100px
+        .trigger-button
+          position:absolute
+          top:50%
+          transform: translateY(-50%)
+          width:30px
+          height:30px
+          border: 1px solid #eee
+          border-radius: 4px
+          box-shadow: inset -1px -1px 3px rgba(0,0,0,.05)
+          text-align:center
+          font-size: 20px
+          right:10px
+          i
+            position: absolute
+            top: 50%
+            left: 50%
+            box-shadow: none
+            transform: translate(-50%,-50%)
+          &:hover, &.is-active
+            box-shadow: 0 0 0 2px darken(white, 60%) inset
+        .trigger-button.trigger-button-email
+          top:30px
+      .trigger-item.trigger-item-mail
+        height:300px
+  
+
+
@@ -0,0 +1,29 @@
+template(name="rulesActions")
+  h2
+    i.fa.fa-magic
+    | {{{_ 'r-rule' }}} "#{data.ruleName.get}" - {{{_ 'r-add-action'}}}
+  .triggers-content
+    .triggers-body
+      .triggers-side-menu
+        ul
+          li.active.js-set-board-actions
+            i.fa.fa-columns
+          li.js-set-card-actions
+            i.fa.fa-sticky-note
+          li.js-set-checklist-actions
+            i.fa.fa-check
+          li.js-set-mail-actions
+            i.fa.fa-at
+      .triggers-main-body
+        if ($eq currentActions.get 'board')
+          +boardActions(ruleName=data.ruleName triggerVar=data.triggerVar)
+        else if ($eq currentActions.get 'card')
+          +cardActions(ruleName=data.ruleName triggerVar=data.triggerVar)
+        else if ($eq currentActions.get 'checklist')
+          +checklistActions(ruleName=data.ruleName triggerVar=data.triggerVar)
+        else if ($eq currentActions.get 'mail')
+          +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar)
+  div.rules-back
+        button.js-goback
+          i.fa.fa-chevron-left
+          | {{{_ 'back'}}}
@@ -0,0 +1,58 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.currentActions = new ReactiveVar('board');
+  },
+
+  setBoardActions() {
+    this.currentActions.set('board');
+    $('.js-set-card-actions').removeClass('active');
+    $('.js-set-board-actions').addClass('active');
+    $('.js-set-checklist-actions').removeClass('active');
+    $('.js-set-mail-actions').removeClass('active');
+  },
+  setCardActions() {
+    this.currentActions.set('card');
+    $('.js-set-card-actions').addClass('active');
+    $('.js-set-board-actions').removeClass('active');
+    $('.js-set-checklist-actions').removeClass('active');
+    $('.js-set-mail-actions').removeClass('active');
+  },
+  setChecklistActions() {
+    this.currentActions.set('checklist');
+    $('.js-set-card-actions').removeClass('active');
+    $('.js-set-board-actions').removeClass('active');
+    $('.js-set-checklist-actions').addClass('active');
+    $('.js-set-mail-actions').removeClass('active');
+  },
+  setMailActions() {
+    this.currentActions.set('mail');
+    $('.js-set-card-actions').removeClass('active');
+    $('.js-set-board-actions').removeClass('active');
+    $('.js-set-checklist-actions').removeClass('active');
+    $('.js-set-mail-actions').addClass('active');
+  },
+
+  rules() {
+    return Rules.find({});
+  },
+
+  name() {
+    // console.log(this.data());
+  },
+  events() {
+    return [{
+      'click .js-set-board-actions'(){
+        this.setBoardActions();
+      },
+      'click .js-set-card-actions'() {
+        this.setCardActions();
+      },
+      'click .js-set-mail-actions'() {
+        this.setMailActions();
+      },
+      'click .js-set-checklist-actions'() {
+        this.setChecklistActions();
+      },
+    }];
+  },
+}).register('rulesActions');
@@ -0,0 +1,27 @@
+template(name="rulesList")
+  .rules
+    h2
+      i.fa.fa-magic
+      | {{{_ 'r-board-rules' }}}
+
+    ul.rules-list
+      each rules
+        li.rules-lists-item
+          p 
+            = title
+          div.rules-btns-group
+            button.js-goto-details
+              i.fa.fa-eye
+              | {{{_ 'r-view-rule'}}}
+            if currentUser.isAdmin
+              button.js-delete-rule
+                i.fa.fa-trash-o
+                | {{{_ 'r-delete-rule'}}}
+      else
+        li.no-items-message {{{_ 'r-no-rules' }}}
+    if currentUser.isAdmin
+      div.rules-add
+        button.js-goto-trigger
+          i.fa.fa-plus
+          | {{{_ 'r-add-rule'}}}
+        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")
@@ -0,0 +1,15 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+  },
+
+  rules() {
+    const boardId = Session.get('currentBoard');
+    return Rules.find({
+      boardId,
+    });
+  },
+  events() {
+    return [{}];
+  },
+}).register('rulesList');
@@ -0,0 +1,9 @@
+template(name="rulesMain")
+  if($eq rulesCurrentTab.get 'rulesList')
+    +rulesList
+  if($eq rulesCurrentTab.get 'trigger')
+    +rulesTriggers(ruleName=ruleName triggerVar=triggerVar)
+  if($eq rulesCurrentTab.get 'action')
+    +rulesActions(ruleName=ruleName triggerVar=triggerVar)
+  if($eq rulesCurrentTab.get 'ruleDetails')
+    +ruleDetails(ruleId=ruleId)
@@ -0,0 +1,70 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.rulesCurrentTab = new ReactiveVar('rulesList');
+    this.ruleName = new ReactiveVar('');
+    this.triggerVar = new ReactiveVar();
+    this.ruleId = new ReactiveVar();
+  },
+
+  setTrigger() {
+    this.rulesCurrentTab.set('trigger');
+  },
+
+  setRulesList() {
+    this.rulesCurrentTab.set('rulesList');
+  },
+
+  setAction() {
+    this.rulesCurrentTab.set('action');
+  },
+
+  setRuleDetails() {
+    this.rulesCurrentTab.set('ruleDetails');
+  },
+
+  events() {
+    return [{
+      'click .js-delete-rule' () {
+        const rule = this.currentData();
+        Rules.remove(rule._id);
+        Actions.remove(rule.actionId);
+        Triggers.remove(rule.triggerId);
+
+      },
+      'click .js-goto-trigger' (event) {
+        event.preventDefault();
+        const ruleTitle = this.find('#ruleTitle').value;
+        if(ruleTitle !== undefined && ruleTitle !== ''){
+          this.find('#ruleTitle').value = '';
+          this.ruleName.set(ruleTitle);
+          this.setTrigger();
+        }
+      },
+      'click .js-goto-action' (event) {
+        event.preventDefault();
+        this.setAction();
+      },
+      'click .js-goto-rules' (event) {
+        event.preventDefault();
+        this.setRulesList();
+      },
+      'click .js-goback' (event) {
+        event.preventDefault();
+        if(this.rulesCurrentTab.get() === 'trigger' || this.rulesCurrentTab.get() === 'ruleDetails' ){
+          this.setRulesList();
+        }
+        if(this.rulesCurrentTab.get() === 'action'){
+          this.setTrigger();
+        }
+      },
+      'click .js-goto-details' (event) {
+        event.preventDefault();
+        const rule = this.currentData();
+        this.ruleId.set(rule._id);
+        this.setRuleDetails();
+      },
+
+    }];
+  },
+
+}).register('rulesMain');
@@ -0,0 +1,25 @@
+template(name="rulesTriggers")
+  h2
+    i.fa.fa-magic
+    | {{{_ 'r-rule' }}} "#{data.ruleName.get}" - {{{_ 'r-add-trigger'}}}
+  .triggers-content
+    .triggers-body
+      .triggers-side-menu
+        ul
+          li.active.js-set-board-triggers
+            i.fa.fa-columns
+          li.js-set-card-triggers
+            i.fa.fa-sticky-note
+          li.js-set-checklist-triggers
+            i.fa.fa-check
+      .triggers-main-body
+        if showBoardTrigger.get
+          +boardTriggers
+        else if showCardTrigger.get
+          +cardTriggers
+        else if showChecklistTrigger.get
+          +checklistTriggers
+  div.rules-back
+        button.js-goback
+          i.fa.fa-chevron-left
+          | {{{_ 'back'}}}
@@ -0,0 +1,53 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.showBoardTrigger = new ReactiveVar(true);
+    this.showCardTrigger = new ReactiveVar(false);
+    this.showChecklistTrigger = new ReactiveVar(false);
+  },
+
+  setBoardTriggers() {
+    this.showBoardTrigger.set(true);
+    this.showCardTrigger.set(false);
+    this.showChecklistTrigger.set(false);
+    $('.js-set-card-triggers').removeClass('active');
+    $('.js-set-board-triggers').addClass('active');
+    $('.js-set-checklist-triggers').removeClass('active');
+  },
+  setCardTriggers() {
+    this.showBoardTrigger.set(false);
+    this.showCardTrigger.set(true);
+    this.showChecklistTrigger.set(false);
+    $('.js-set-card-triggers').addClass('active');
+    $('.js-set-board-triggers').removeClass('active');
+    $('.js-set-checklist-triggers').removeClass('active');
+  },
+  setChecklistTriggers() {
+    this.showBoardTrigger.set(false);
+    this.showCardTrigger.set(false);
+    this.showChecklistTrigger.set(true);
+    $('.js-set-card-triggers').removeClass('active');
+    $('.js-set-board-triggers').removeClass('active');
+    $('.js-set-checklist-triggers').addClass('active');
+  },
+
+  rules() {
+    return Rules.find({});
+  },
+
+  name() {
+    // console.log(this.data());
+  },
+  events() {
+    return [{
+      'click .js-set-board-triggers' () {
+        this.setBoardTriggers();
+      },
+      'click .js-set-card-triggers' () {
+        this.setCardTriggers();
+      },
+      'click .js-set-checklist-triggers' () {
+        this.setChecklistTriggers();
+      },
+    }];
+  },
+}).register('rulesTriggers');
@@ -0,0 +1,68 @@
+template(name="boardTriggers")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-card-is'}}
+      div.trigger-dropdown
+        select(id="gen-action")
+          option(value="created") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text 
+        | {{_'r-the-board'}}
+    div.trigger-button.js-add-gen-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-card-is'}}
+      div.trigger-dropdown
+        select(id="create-action")
+          option(value="created") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text 
+        | {{_'r-list'}}
+      div.trigger-dropdown
+        input(id="create-list-name",type=text,placeholder="{{_'r-list-name'}}")  
+    div.trigger-button.js-add-create-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-card-is-moved'}}
+    div.trigger-button.js-add-gen-moved-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-card-is'}}
+      div.trigger-dropdown
+        select(id="move-action")
+          option(value="moved-to") {{_'r-moved-to'}}
+          option(value="moved-from") {{_'r-moved-from'}}
+      div.trigger-text 
+        | {{_'r-list'}}
+      div.trigger-dropdown
+        input(id="move-list-name",type=text,placeholder="{{_'r-list-name'}}")  
+    div.trigger-button.js-add-moved-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-card-is'}}
+      div.trigger-dropdown
+        select(id="arch-action")
+          option(value="archived") {{_'r-archived'}}
+          option(value="unarchived") {{_'r-unarchived'}}
+    div.trigger-button.js-add-arch-trigger.js-goto-action
+      i.fa.fa-plus
+
+
+   
+  
+
+
+
@@ -0,0 +1,116 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+
+  },
+
+  events() {
+    return [{
+      'click .js-add-gen-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#gen-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'created') {
+          datas.triggerVar.set({
+            activityType: 'createCard',
+            boardId,
+            'listName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removeCard',
+            boardId,
+            desc,
+          });
+        }
+
+      },
+      'click .js-add-create-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#create-action').value;
+        const listName = this.find('#create-list-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'created') {
+          datas.triggerVar.set({
+            activityType: 'createCard',
+            boardId,
+            listName,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removeCard',
+            boardId,
+            listName,
+            desc,
+          });
+        }
+      },
+      'click .js-add-moved-trigger' (event) {
+        const datas = this.data();
+        const desc = Utils.getTriggerActionDesc(event, this);
+
+        const actionSelected = this.find('#move-action').value;
+        const listName = this.find('#move-list-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'moved-to') {
+          datas.triggerVar.set({
+            activityType: 'moveCard',
+            boardId,
+            listName,
+            'oldListName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'moved-from') {
+          datas.triggerVar.set({
+            activityType: 'moveCard',
+            boardId,
+            'listName': '*',
+            'oldListName': listName,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-moved-trigger' (event){
+        const datas = this.data();
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const boardId = Session.get('currentBoard');
+
+        datas.triggerVar.set({
+          activityType: 'moveCard',
+          boardId,
+          'listName':'*',
+          'oldListName': '*',
+          desc,
+        });
+      },
+      'click .js-add-arc-trigger' (event) {
+        const datas = this.data();
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const actionSelected = this.find('#arch-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'archived') {
+          datas.triggerVar.set({
+            activityType: 'archivedCard',
+            boardId,
+            desc,
+          });
+        }
+        if (actionSelected === 'unarchived') {
+          datas.triggerVar.set({
+            activityType: 'restoredCard',
+            boardId,
+            desc,
+          });
+        }
+      },
+
+    }];
+  },
+
+}).register('boardTriggers');
@@ -0,0 +1,79 @@
+template(name="cardTriggers")
+  div.trigger-item
+    div.trigger-content
+      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 
+        | {{_'r-a-card'}}
+    div.trigger-button.js-add-gen-label-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-the-label-is'}}
+      div.trigger-dropdown
+        select(id="spec-label")
+          each labels
+            option(value="#{_id}")
+              = name
+      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 
+        | {{_'r-a-card'}}
+    div.trigger-button.js-add-spec-label-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      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 
+        | {{_'r-a-card'}}
+    div.trigger-button.js-add-gen-member-trigger.js-goto-action
+      i.fa.fa-plus
+
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-the-member'}}
+      div.trigger-dropdown
+        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 
+        | {{_'r-a-card'}}
+    div.trigger-button.js-add-spec-member-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-attach'}}
+      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 
+        | {{_'r-a-card'}}
+    div.trigger-button.js-add-attachment-trigger.js-goto-action
+      i.fa.fa-plus
@@ -0,0 +1,128 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+  },
+  labels() {
+    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();
+      }
+    }
+    return labels;
+  },
+  events() {
+    return [{
+      'click .js-add-gen-label-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#label-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'addedLabel',
+            boardId,
+            'labelId': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removedLabel',
+            boardId,
+            'labelId': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-label-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-label-action').value;
+        const labelId = this.find('#spec-label').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'addedLabel',
+            boardId,
+            labelId,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removedLabel',
+            boardId,
+            labelId,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-member-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#gen-member-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'joinMember',
+            boardId,
+            'username': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'unjoinMember',
+            boardId,
+            'username': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-member-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-member-action').value;
+        const username = this.find('#spec-member').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'joinMember',
+            boardId,
+            username,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'unjoinMember',
+            boardId,
+            username,
+            desc,
+          });
+        }
+      },
+      'click .js-add-attachment-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#attach-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'added') {
+          datas.triggerVar.set({
+            activityType: 'addAttachment',
+            boardId,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'deleteAttachment',
+            boardId,
+            desc,
+          });
+        }
+      },
+    }];
+  },
+}).register('cardTriggers');
@@ -0,0 +1,83 @@
+template(name="checklistTriggers")
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-checklist'}}
+      div.trigger-dropdown
+        select(id="gen-check-action")
+          option(value="created") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text 
+        | {{_'r-a-card'}}
+    div.trigger-button.js-add-gen-check-trigger.js-goto-action
+      i.fa.fa-plus
+
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-the-checklist'}}
+      div.trigger-dropdown
+        input(id="check-name",type=text,placeholder="{{_'r-name'}}") 
+      div.trigger-text 
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="spec-check-action")
+          option(value="created") {{_'r-added-to'}}
+          option(value="removed") {{_'r-removed-from'}}
+      div.trigger-text 
+        | {{_'r-a-card'}}
+    div.trigger-button.js-add-spec-check-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-checklist'}}
+      div.trigger-dropdown
+        select(id="gen-comp-check-action")
+          option(value="completed") {{_'r-completed'}}
+          option(value="uncompleted") {{_'r-made-incomplete'}}
+    div.trigger-button.js-add-gen-comp-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-the-checklist'}}
+      div.trigger-dropdown
+        input(id="spec-comp-check-name",type=text,placeholder="{{_'r-name'}}") 
+      div.trigger-text 
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="spec-comp-check-action")
+          option(value="completed") {{_'r-completed'}}
+          option(value="uncompleted") {{_'r-made-incomplete'}}
+    div.trigger-button.js-add-spec-comp-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-a-item'}}
+      div.trigger-dropdown
+        select(id="check-item-gen-action")
+          option(value="checked") {{_'r-checked'}}
+          option(value="unchecked") {{_'r-unchecked'}}
+    div.trigger-button.js-add-gen-check-item-trigger.js-goto-action
+      i.fa.fa-plus
+
+  div.trigger-item
+    div.trigger-content
+      div.trigger-text 
+        | {{_'r-when-the-item'}}
+      div.trigger-dropdown
+        input(id="check-item-name",type=text,placeholder="{{_'r-name'}}") 
+      div.trigger-text 
+        | {{_'r-is'}}
+      div.trigger-dropdown
+        select(id="check-item-spec-action")
+          option(value="checked") {{_'r-checked'}}
+          option(value="unchecked") {{_'r-unchecked'}}
+    div.trigger-button.js-add-spec-check-item-trigger.js-goto-action
+      i.fa.fa-plus
@@ -0,0 +1,146 @@
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.subscribe('allRules');
+  },
+  events() {
+    return [{
+      'click .js-add-gen-check-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#gen-check-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'created') {
+          datas.triggerVar.set({
+            activityType: 'addChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removeChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-check-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-check-action').value;
+        const checklistId = this.find('#check-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'created') {
+          datas.triggerVar.set({
+            activityType: 'addChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+        if (actionSelected === 'removed') {
+          datas.triggerVar.set({
+            activityType: 'removeChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-comp-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+
+        const datas = this.data();
+        const actionSelected = this.find('#gen-comp-check-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'completed') {
+          datas.triggerVar.set({
+            activityType: 'completeChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'uncompleted') {
+          datas.triggerVar.set({
+            activityType: 'uncompleteChecklist',
+            boardId,
+            'checklistName': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-comp-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#spec-comp-check-action').value;
+        const checklistId = this.find('#spec-comp-check-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'completed') {
+          datas.triggerVar.set({
+            activityType: 'completeChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+        if (actionSelected === 'uncompleted') {
+          datas.triggerVar.set({
+            activityType: 'uncompleteChecklist',
+            boardId,
+            'checklistName': checklistId,
+            desc,
+          });
+        }
+      },
+      'click .js-add-gen-check-item-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#check-item-gen-action').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'checked') {
+          datas.triggerVar.set({
+            activityType: 'checkedItem',
+            boardId,
+            'checklistItemName': '*',
+            desc,
+          });
+        }
+        if (actionSelected === 'unchecked') {
+          datas.triggerVar.set({
+            activityType: 'uncheckedItem',
+            boardId,
+            'checklistItemName': '*',
+            desc,
+          });
+        }
+      },
+      'click .js-add-spec-check-item-trigger' (event) {
+        const desc = Utils.getTriggerActionDesc(event, this);
+        const datas = this.data();
+        const actionSelected = this.find('#check-item-spec-action').value;
+        const checklistItemId = this.find('#check-item-name').value;
+        const boardId = Session.get('currentBoard');
+        if (actionSelected === 'checked') {
+          datas.triggerVar.set({
+            activityType: 'checkedItem',
+            boardId,
+            'checklistItemName': checklistItemId,
+            desc,
+          });
+        }
+        if (actionSelected === 'unchecked') {
+          datas.triggerVar.set({
+            activityType: 'uncheckedItem',
+            boardId,
+            'checklistItemName': checklistItemId,
+            desc,
+          });
+        }
+      },
+    }];
+  },
+
+}).register('checklistTriggers');
@@ -0,0 +1,6 @@
+template(name='connectionMethod')
+  div.at-form-authentication
+    label {{_ 'authentication-method'}}
+    select.select-authentication
+        each authentications
+            option(value="{{value}}") {{_ value}}
@@ -0,0 +1,34 @@
+Template.connectionMethod.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]})),
+      ]);
+    }
+
+    // If only the default authentication available, hides the select boxe
+    const content = $('.at-form-authentication');
+    if (!(this.authenticationMethods.get().length > 1)) {
+      content.hide();
+    } else {
+      content.show();
+    }
+  });
+});
+
+Template.connectionMethod.onRendered(() => {
+  // Moves the select boxe in the first place of the at-pwd-form div
+  $('.at-form-authentication').detach().prependTo('.at-pwd-form');
+});
+
+Template.connectionMethod.helpers({
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+});
@@ -27,6 +27,7 @@ template(name="peopleGeneral")
        th {{_ 'verified'}}
        th {{_ 'createdAt'}}
        th {{_ 'active'}}
+        th {{_ 'authentication-method'}}
        th
      each user in peopleList
        +peopleRow(userId=user._id)
@@ -52,6 +53,7 @@ template(name="peopleRow")
        | {{_ 'no'}}
      else
        | {{_ 'yes'}}
+    td {{_ userData.authenticationMethod }}
    td
      a.edit-user
        | {{_ 'edit'}}
@@ -66,12 +68,18 @@ template(name="editUserPopup")
      | {{_ 'username'}}
      span.error.hide.username-taken
        | {{_ 'error-username-taken'}}
-      input.js-profile-username(type="text" value=user.username)
+      if isLdap
+        input.js-profile-username(type="text" value=user.username readonly)
+      else
+        input.js-profile-username(type="text" value=user.username)
    label
      | {{_ 'email'}}
      span.error.hide.email-taken
        | {{_ 'error-email-taken'}}
-      input.js-profile-email(type="email" value="{{user.emails.[0].address}}")
+      if isLdap
+        input.js-profile-email(type="email" value="{{user.emails.[0].address}}" readonly)
+      else
+        input.js-profile-email(type="email" value="{{user.emails.[0].address}}")
    label
      | {{_ 'admin'}}
      select.select-role.js-profile-isadmin
@@ -82,9 +90,17 @@ template(name="editUserPopup")
      select.select-active.js-profile-isactive
        option(value="false") {{_ 'yes'}}
        option(value="true" selected="{{user.loginDisabled}}") {{_ 'no'}}
+    label
+      | {{_ 'authentication-type'}}
+      select.select-authenticationMethod.js-authenticationMethod
+        each authentications
+          if isSelected value
+            option(value="{{value}}" selected) {{_ value}}
+          else
+            option(value="{{value}}") {{_ value}}
    hr
    label
      | {{_ 'password'}}
      input.js-profile-password(type="password")

-    input.primary.wide(type="submit" value="{{_ 'save'}}")
+    input.primary.wide(type="submit" value="{{_ 'save'}}")
@@ -62,10 +62,39 @@ Template.peopleRow.helpers({
  },
 });

+Template.editUserPopup.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.editUserPopup.helpers({
  user() {
    return Users.findOne(this.userId);
  },
+  authentications() {
+    return Template.instance().authenticationMethods.get();
+  },
+  isSelected(match) {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === match;
+  },
+  isLdap() {
+    const userId = Template.instance().data.userId;
+    const selected = Users.findOne(userId).authenticationMethod;
+    return selected === 'ldap';
+  },
 });

 BlazeComponent.extendComponent({
@@ -91,6 +120,7 @@ Template.editUserPopup.events({
    const isAdmin = tpl.find('.js-profile-isadmin').value.trim();
    const isActive = tpl.find('.js-profile-isactive').value.trim();
    const email = tpl.find('.js-profile-email').value.trim();
+    const authentication = tpl.find('.js-authenticationMethod').value.trim();

    const isChangePassword = password.length > 0;
    const isChangeUserName = username !== user.username;
@@ -101,6 +131,7 @@ Template.editUserPopup.events({
        'profile.fullname': fullname,
        'isAdmin': isAdmin === 'true',
        'loginDisabled': isActive === 'true',
+        'authenticationMethod': authentication,
      },
    });

@@ -16,6 +16,8 @@ template(name="setting")
              a.js-setting-menu(data-id="account-setting") {{_ 'accounts'}}
            li
              a.js-setting-menu(data-id="announcement-setting") {{_ 'admin-announcement'}}
+            li
+              a.js-setting-menu(data-id="layout-setting") {{_ 'layout'}}
        .main-body
          if loading.get
            +spinner
@@ -27,6 +29,8 @@ template(name="setting")
            +accountSettings
          else if announcementSetting.get
            +announcementSettings
+          else if layoutSetting.get
+            +layoutSettings

 template(name="general")
  ul#registration-setting.setting-detail
@@ -72,7 +76,7 @@ template(name='email')
    li.smtp-form
      .title {{_ 'smtp-password'}}
      .form-group
-        input.form-control#mail-server-password(type="text", placeholder="{{_ 'password'}}" value="{{currentSetting.mailServer.password}}")
+        input.form-control#mail-server-password(type="password", placeholder="{{_ 'password'}}" value="{{currentSetting.mailServer.password}}")
    li.smtp-form
      .title {{_ 'smtp-tls'}}
      .form-group
@@ -127,3 +131,19 @@ template(name='announcementSettings')
            textarea#admin-announcement.form-control= currentSetting.body
          li
            button.js-announcement-save.primary {{_ 'save'}}
+
+template(name='layoutSettings')
+  ul#layout-setting.setting-detail
+    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 {{_ 'custom-product-name'}}
+      .form-group
+        input.form-control#product-name(type="text", placeholder="Wekan" value="{{currentSetting.productName}}")
+    li
+      button.js-save-layout.primary {{_ 'save'}}
@@ -6,6 +6,7 @@ BlazeComponent.extendComponent({
    this.emailSetting = new ReactiveVar(false);
    this.accountSetting = new ReactiveVar(false);
    this.announcementSetting = new ReactiveVar(false);
+    this.layoutSetting = new ReactiveVar(false);

    Meteor.subscribe('setting');
    Meteor.subscribe('mailServer');
@@ -58,6 +59,9 @@ BlazeComponent.extendComponent({
  toggleTLS() {
    $('#mail-server-tls').toggleClass('is-checked');
  },
+  toggleHideLogo() {
+    $('#hide-logo').toggleClass('is-checked');
+  },
  switchMenu(event) {
    const target = $(event.target);
    if (!target.hasClass('active')) {
@@ -68,6 +72,7 @@ BlazeComponent.extendComponent({
      this.emailSetting.set('email-setting' === targetID);
      this.accountSetting.set('account-setting' === targetID);
      this.announcementSetting.set('announcement-setting' === targetID);
+      this.layoutSetting.set('layout-setting' === targetID);
    }
  },

@@ -129,6 +134,31 @@ BlazeComponent.extendComponent({

  },

+  saveLayout() {
+    this.setLoading(true);
+    $('li').removeClass('has-error');
+
+    const productName = $('#product-name').val().trim();
+    const hideLogoChange = ($('input[name=hideLogo]:checked').val() === 'true');
+
+    try {
+
+      Settings.update(Settings.findOne()._id, {
+        $set: {
+          productName,
+          hideLogo: hideLogoChange,
+        },
+      });
+    } catch (e) {
+      return;
+    } finally {
+      this.setLoading(false);
+    }
+
+    saveMailServerInfo();
+
+  },
+
  sendSMTPTestEmail() {
    Meteor.call('sendSMTPTestEmail', (err, ret) => {
      if (!err && ret) { /* eslint-disable no-console */
@@ -154,6 +184,8 @@ BlazeComponent.extendComponent({
      'click button.js-email-invite': this.inviteThroughEmail,
      'click button.js-save': this.saveMailServerInfo,
      'click button.js-send-smtp-test-email': this.sendSMTPTestEmail,
+      'click a.js-toggle-hide-logo': this.toggleHideLogo,
+      'click button.js-save-layout': this.saveLayout,
    }];
  },
 }).register('setting');
@@ -66,7 +66,8 @@
              padding: 0 0.5rem

          .admin-announcement,
-          .invite-people
+          .invite-people,
+          .layout
            padding-left 20px;
            li
              min-width: 500px;
@@ -23,10 +23,11 @@ template(name='homeSidebar')
  hr
  +labelsWidget
  hr
-  h3
-    i.fa.fa-comments-o
-    | {{_ 'activities'}}
-  +activities(mode="board")
+  unless currentUser.isNoComments
+    h3
+      i.fa.fa-comments-o
+      | {{_ 'activities'}}
+    +activities(mode="board")

 template(name="membersWidget")
  .board-widget.board-widget-members
@@ -145,6 +146,12 @@ template(name="changePermissionsPopup")
        if isNormal
          i.fa.fa-check
        span.sub-name {{_ 'normal-desc'}}
+    li
+      a(class="{{#if isLastAdmin}}disabled{{else}}js-set-no-comments{{/if}}")
+        | {{_ 'no-comments'}}
+        if isNoComments
+          i.fa.fa-check
+        span.sub-name {{_ 'no-comments-desc'}}
    li
      a(class="{{#if isLastAdmin}}disabled{{else}}js-set-comment-only{{/if}}")
        | {{_ 'comment-only'}}
@@ -16,8 +16,7 @@ BlazeComponent.extendComponent({
  },

  onCreated() {
-    const initOpen = Utils.isMiniScreen() ? false : (!Session.get('currentCard'));
-    this._isOpen = new ReactiveVar(initOpen);
+    this._isOpen = new ReactiveVar(false);
    this._view = new ReactiveVar(defaultView);
    Sidebar = this;
  },
@@ -126,8 +125,11 @@ Template.memberPopup.helpers({
    if(type === 'normal'){
      const currentBoard = Boards.findOne(Session.get('currentBoard'));
      const commentOnly = currentBoard.hasCommentOnly(this.userId);
+      const noComments = currentBoard.hasNoComments(this.userId);
      if(commentOnly){
        return TAPi18n.__('comment-only').toLowerCase();
+      } else if(noComments) {
+        return TAPi18n.__('no-comments').toLowerCase();
      } else {
        return TAPi18n.__(type).toLowerCase();
      }
@@ -324,12 +326,13 @@ BlazeComponent.extendComponent({
 }).register('addMemberPopup');

 Template.changePermissionsPopup.events({
-  'click .js-set-admin, click .js-set-normal, click .js-set-comment-only'(event) {
+  'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only'(event) {
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
    const memberId = this.userId;
    const isAdmin = $(event.currentTarget).hasClass('js-set-admin');
    const isCommentOnly = $(event.currentTarget).hasClass('js-set-comment-only');
-    currentBoard.setMemberPermission(memberId, isAdmin, isCommentOnly);
+    const isNoComments = $(event.currentTarget).hasClass('js-set-no-comments');
+    currentBoard.setMemberPermission(memberId, isAdmin, isNoComments, isCommentOnly);
    Popup.back(1);
  },
 });
@@ -342,7 +345,12 @@ Template.changePermissionsPopup.helpers({

  isNormal() {
    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    return !currentBoard.hasAdmin(this.userId) && !currentBoard.hasCommentOnly(this.userId);
+    return !currentBoard.hasAdmin(this.userId) && !currentBoard.hasNoComments(this.userId) && !currentBoard.hasCommentOnly(this.userId);
+  },
+
+  isNoComments() {
+    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    return !currentBoard.hasAdmin(this.userId) && currentBoard.hasNoComments(this.userId);
  },

  isCommentOnly() {
@@ -41,6 +41,16 @@ template(name="createCustomFieldPopup")
            .materialCheckBox(class="{{#if showOnCard}}is-checked{{/if}}")

            span {{_ 'show-field-on-card'}}
+        a.flex.js-field-automatically-on-card(class="{{#if automaticallyOnCard}}is-checked{{/if}}")
+            .materialCheckBox(class="{{#if automaticallyOnCard}}is-checked{{/if}}")
+
+            span {{_ 'automatically-field-on-card'}}
+
+        a.flex.js-field-showLabel-on-card(class="{{#if showLabelOnMiniCard}}is-checked{{/if}}")
+            .materialCheckBox(class="{{#if showLabelOnMiniCard}}is-checked{{/if}}")
+
+            span {{_ 'showLabel-field-on-card'}}
+
        button.primary.wide.left(type="button")
            | {{_ 'save'}}
        if _id
@@ -83,6 +83,22 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
        $target.find('.materialCheckBox').toggleClass('is-checked');
        $target.toggleClass('is-checked');
      },
+      'click .js-field-automatically-on-card'(evt) {
+        let $target = $(evt.target);
+        if(!$target.hasClass('js-field-automatically-on-card')){
+          $target = $target.parent();
+        }
+        $target.find('.materialCheckBox').toggleClass('is-checked');
+        $target.toggleClass('is-checked');
+      },
+      'click .js-field-showLabel-on-card'(evt) {
+        let $target = $(evt.target);
+        if(!$target.hasClass('js-field-showLabel-on-card')){
+          $target = $target.parent();
+        }
+        $target.find('.materialCheckBox').toggleClass('is-checked');
+        $target.toggleClass('is-checked');
+      },
      'click .primary'(evt) {
        evt.preventDefault();

@@ -92,6 +108,8 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
          type: this.type.get(),
          settings: this.getSettings(),
          showOnCard: this.find('.js-field-show-on-card.is-checked') !== null,
+          showLabelOnMiniCard: this.find('.js-field-showLabel-on-card.is-checked') !== null,
+          automaticallyOnCard: this.find('.js-field-automatically-on-card.is-checked') !== null,
        };

        // insert or update
@@ -32,6 +32,7 @@
    border-bottom: 1px solid #CCC

    .swimlane-header
+      -ms-writing-mode: tb-rl;
      writing-mode: vertical-rl;
      transform: rotate(180deg);
      font-size: 14px;
@@ -1,7 +1,7 @@
 template(name="userAvatar")
  a.member.js-member(title="{{userData.profile.fullname}} ({{userData.username}})")
    if userData.profile.avatarUrl
-      img.avatar.avatar-image(src=userData.profile.avatarUrl)
+      img.avatar.avatar-image(src="{{userData.profile.avatarUrl}}")
    else
      +userAvatarInitials(userId=userData._id)

@@ -134,8 +134,9 @@ BlazeComponent.extendComponent({

 Template.cardMembersPopup.helpers({
  isCardMember() {
-    const cardId = Template.parentData()._id;
-    const cardMembers = Cards.findOne(cardId).members || [];
+    const card = Template.parentData();
+    const cardMembers = card.getMembers();
+
    return _.contains(cardMembers, this.userId);
  },

@@ -17,7 +17,6 @@ template(name="memberMenuPopup")
      li: a.js-change-avatar {{_ 'edit-avatar'}}
      li: a.js-change-password {{_ 'changePasswordPopup-title'}}
      li: a.js-change-language {{_ 'changeLanguagePopup-title'}}
-      li: a.js-edit-notification {{_ 'editNotificationPopup-title'}}
    if currentUser.isAdmin
      li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}}
  hr
@@ -50,23 +49,6 @@ template(name="editProfilePopup")
        input.js-profile-email(type="email" value="{{emails.[0].address}}" readonly)
    input.primary.wide(type="submit" value="{{_ 'save'}}")

-template(name="editNotificationPopup")
-  ul.pop-over-list
-    li
-      a.js-toggle-tag-notify-watch
-        i.fa.fa-eye.colorful
-        | {{_ 'watching'}}
-        if hasTag "notify-watch"
-          i.fa.fa-check
-        span.sub-name {{_ 'notify-watch'}}
-    li
-      a.js-toggle-tag-notify-participate
-        i.fa.fa-bell.colorful
-        | {{_ 'tracking'}}
-        if hasTag "notify-participate"
-          i.fa.fa-check
-        span.sub-name {{_ 'notify-participate'}}
-
 template(name="changePasswordPopup")
  +atForm(state='changePwd')

@@ -9,7 +9,6 @@ Template.memberMenuPopup.events({
  'click .js-change-avatar': Popup.open('changeAvatar'),
  'click .js-change-password': Popup.open('changePassword'),
  'click .js-change-language': Popup.open('changeLanguage'),
-  'click .js-edit-notification': Popup.open('editNotification'),
  'click .js-logout'(evt) {
    evt.preventDefault();

@@ -89,25 +88,6 @@ Template.editProfilePopup.events({
  },
 });

-Template.editNotificationPopup.helpers({
-  hasTag(tag) {
-    const user = Meteor.user();
-    return user && user.hasTag(tag);
-  },
-});
-
-// we defined github like rules, see: https://github.com/settings/notifications
-Template.editNotificationPopup.events({
-  'click .js-toggle-tag-notify-participate'() {
-    const user = Meteor.user();
-    if (user) user.toggleTag('notify-participate');
-  },
-  'click .js-toggle-tag-notify-watch'() {
-    const user = Meteor.user();
-    if (user) user.toggleTag('notify-watch');
-  },
-});
-
 // XXX For some reason the useraccounts autofocus isnt working in this case.
 // See https://github.com/meteor-useraccounts/core/issues/384
 Template.changePasswordPopup.onRendered(function () {
@@ -3,7 +3,6 @@
 // RangeFilter, dateFilter, etc.). We then define a global `Filter` object whose
 // goal is to filter complete documents by using the local filters for each
 // fields.
-
 function showFilterSidebar() {
  Sidebar.setView('filter');
 }
@@ -64,7 +63,9 @@ class SetFilter {

  _getMongoSelector() {
    this._dep.depend();
-    return { $in: this._selectedElements };
+    return {
+      $in: this._selectedElements,
+    };
  }

  _getEmptySelector() {
@@ -75,7 +76,9 @@ class SetFilter {
        includeEmpty = true;
      }
    });
-    return includeEmpty ? { $eq: [] } : null;
+    return includeEmpty ? {
+      $eq: [],
+    } : null;
  }
 }

@@ -119,7 +122,7 @@ class AdvancedFilter {
        current += char;
        continue;
      }
-      if (char === '/'){
+      if (char === '/') {
        string = !string;
        if (string) regex = true;
        current += char;
@@ -135,7 +138,11 @@ class AdvancedFilter {
        continue;
      }
      if (char === ' ' && !string) {
-        commands.push({ 'cmd': current, 'string': wasString, regex});
+        commands.push({
+          'cmd': current,
+          'string': wasString,
+          regex,
+        });
        wasString = false;
        current = '';
        continue;
@@ -143,25 +150,29 @@ class AdvancedFilter {
      current += char;
    }
    if (current !== '') {
-      commands.push({ 'cmd': current, 'string': wasString, regex});
+      commands.push({
+        'cmd': current,
+        'string': wasString,
+        regex,
+      });
    }
    return commands;
  }

  _fieldNameToId(field) {
-    const found = CustomFields.findOne({ 'name': field });
+    const found = CustomFields.findOne({
+      'name': field,
+    });
    return found._id;
  }

-  _fieldValueToId(field, value)
-  {
-    const found = CustomFields.findOne({ 'name': field });
-    if (found.settings.dropdownItems && found.settings.dropdownItems.length > 0)
-    {
-      for (let i = 0; i < found.settings.dropdownItems.length; i++)
-      {
-        if (found.settings.dropdownItems[i].name === value)
-        {
+  _fieldValueToId(field, value) {
+    const found = CustomFields.findOne({
+      'name': field,
+    });
+    if (found.settings.dropdownItems && found.settings.dropdownItems.length > 0) {
+      for (let i = 0; i < found.settings.dropdownItems.length; i++) {
+        if (found.settings.dropdownItems[i].name === value) {
          return found.settings.dropdownItems[i]._id;
        }
      }
@@ -173,10 +184,15 @@ class AdvancedFilter {
    try {
      //let changed = false;
      this._processSubCommands(commands);
+    } catch (e) {
+      return this._lastValide;
    }
-    catch (e) { return this._lastValide; }
-    this._lastValide = { $or: commands };
-    return { $or: commands };
+    this._lastValide = {
+      $or: commands,
+    };
+    return {
+      $or: commands,
+    };
  }

  _processSubCommands(commands) {
@@ -232,19 +248,24 @@ class AdvancedFilter {
        {
          const field = commands[i - 1].cmd;
          const str = commands[i + 1].cmd;
-          if (commands[i + 1].regex)
-          {
+          if (commands[i + 1].regex) {
            const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
            let regex = null;
            if (match.length > 2)
              regex = new RegExp(match[1], match[2]);
            else
              regex = new RegExp(match[1]);
-            commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': regex };
-          }
-          else
-          {
-            commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} };
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': regex,
+            };
+          } else {
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': {
+                $in: [this._fieldValueToId(field, str), parseInt(str, 10)],
+              },
+            };
          }
          commands.splice(i - 1, 1);
          commands.splice(i, 1);
@@ -257,19 +278,28 @@ class AdvancedFilter {
        {
          const field = commands[i - 1].cmd;
          const str = commands[i + 1].cmd;
-          if (commands[i + 1].regex)
-          {
+          if (commands[i + 1].regex) {
            const match = str.match(new RegExp('^/(.*?)/([gimy]*)$'));
            let regex = null;
            if (match.length > 2)
              regex = new RegExp(match[1], match[2]);
            else
              regex = new RegExp(match[1]);
-            commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $not: regex } };
-          }
-          else
-          {
-            commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $not: {$in: [this._fieldValueToId(field, str), parseInt(str, 10)]} } };
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': {
+                $not: regex,
+              },
+            };
+          } else {
+            commands[i] = {
+              'customFields._id': this._fieldNameToId(field),
+              'customFields.value': {
+                $not: {
+                  $in: [this._fieldValueToId(field, str), parseInt(str, 10)],
+                },
+              },
+            };
          }
          commands.splice(i - 1, 1);
          commands.splice(i, 1);
@@ -284,7 +314,12 @@ class AdvancedFilter {
        {
          const field = commands[i - 1].cmd;
          const str = commands[i + 1].cmd;
-          commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $gt: parseInt(str, 10) } };
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $gt: parseInt(str, 10),
+            },
+          };
          commands.splice(i - 1, 1);
          commands.splice(i, 1);
          //changed = true;
@@ -299,7 +334,12 @@ class AdvancedFilter {
        {
          const field = commands[i - 1].cmd;
          const str = commands[i + 1].cmd;
-          commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $gte:  parseInt(str, 10) } };
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $gte: parseInt(str, 10),
+            },
+          };
          commands.splice(i - 1, 1);
          commands.splice(i, 1);
          //changed = true;
@@ -313,7 +353,12 @@ class AdvancedFilter {
        {
          const field = commands[i - 1].cmd;
          const str = commands[i + 1].cmd;
-          commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $lt:  parseInt(str, 10) } };
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $lt: parseInt(str, 10),
+            },
+          };
          commands.splice(i - 1, 1);
          commands.splice(i, 1);
          //changed = true;
@@ -328,14 +373,18 @@ class AdvancedFilter {
        {
          const field = commands[i - 1].cmd;
          const str = commands[i + 1].cmd;
-          commands[i] = { 'customFields._id': this._fieldNameToId(field), 'customFields.value': { $lte:  parseInt(str, 10) } };
+          commands[i] = {
+            'customFields._id': this._fieldNameToId(field),
+            'customFields.value': {
+              $lte: parseInt(str, 10),
+            },
+          };
          commands.splice(i - 1, 1);
          commands.splice(i, 1);
          //changed = true;
          i--;
          break;
        }
-
        }
      }
    }
@@ -353,7 +402,9 @@ class AdvancedFilter {
        {
          const op1 = commands[i - 1];
          const op2 = commands[i + 1];
-          commands[i] = { $or: [op1, op2] };
+          commands[i] = {
+            $or: [op1, op2],
+          };
          commands.splice(i - 1, 1);
          commands.splice(i, 1);
          //changed = true;
@@ -368,27 +419,29 @@ class AdvancedFilter {
        {
          const op1 = commands[i - 1];
          const op2 = commands[i + 1];
-          commands[i] = { $and: [op1, op2] };
+          commands[i] = {
+            $and: [op1, op2],
+          };
          commands.splice(i - 1, 1);
          commands.splice(i, 1);
          //changed = true;
          i--;
          break;
        }
-
        case 'not':
        case 'Not':
        case 'NOT':
        case '!':
        {
          const op1 = commands[i + 1];
-          commands[i] = { $not: op1 };
+          commands[i] = {
+            $not: op1,
+          };
          commands.splice(i + 1, 1);
          //changed = true;
          i--;
          break;
        }
-
        }
      }
    }
@@ -441,8 +494,7 @@ Filter = {
      if (filter._isActive()) {
        if (filter.subField !== '') {
          filterSelector[`${fieldName}.${filter.subField}`] = filter._getMongoSelector();
-        }
-        else {
+        } else {
          filterSelector[fieldName] = filter._getMongoSelector();
        }
        emptySelector[fieldName] = filter._getEmptySelector();
@@ -452,7 +504,11 @@ Filter = {
      }
    });

-    const exceptionsSelector = { _id: { $in: this._exceptions } };
+    const exceptionsSelector = {
+      _id: {
+        $in: this._exceptions,
+      },
+    };
    this._exceptionsDep.depend();

    const selectors = [exceptionsSelector];
@@ -463,7 +519,9 @@ Filter = {
    if (includeEmptySelectors) selectors.push(emptySelector);
    if (this.advanced._isActive()) selectors.push(this.advanced._getMongoSelector());

-    return { $or: selectors };
+    return {
+      $or: selectors,
+    };
  },

  mongoSelector(additionalSelector) {
@@ -471,7 +529,9 @@ Filter = {
    if (_.isUndefined(additionalSelector))
      return filterSelector;
    else
-      return { $and: [filterSelector, additionalSelector] };
+      return {
+        $and: [filterSelector, additionalSelector],
+      };
  },

  reset() {
@@ -4,6 +4,7 @@ window.Modal = new class {
  constructor() {
    this._currentModal = new ReactiveVar(closedValue);
    this._onCloseGoTo = '';
+    this._isWideModal = false;
  }

  getHeaderName() {
@@ -20,6 +21,10 @@ window.Modal = new class {
    return this.getTemplateName() !== closedValue;
  }

+  isWide(){
+    return this._isWideModal;
+  }
+
  close() {
    this._currentModal.set(closedValue);
    if (this._onCloseGoTo) {
@@ -27,9 +32,16 @@ window.Modal = new class {
    }
  }

+  openWide(modalName, { header = '', onCloseGoTo = ''} = {}) {
+    this._currentModal.set({ header, modalName });
+    this._onCloseGoTo = onCloseGoTo;
+    this._isWideModal = true;
+  }
+
  open(modalName, { header = '', onCloseGoTo = ''} = {}) {
    this._currentModal.set({ header, modalName });
    this._onCloseGoTo = onCloseGoTo;
+
  }
 }();

@@ -38,5 +50,5 @@ Blaze.registerHelper('Modal', Modal);
 EscapeActions.register('modalWindow',
  () => Modal.close(),
  () => Modal.isOpen(),
-  { noClickEscapeOn: '.modal-content' }
+  { noClickEscapeOn: '.modal-container' }
 );
@@ -39,11 +39,11 @@ Utils = {
    if (!prevData && !nextData) {
      base = 0;
      increment = 1;
-    // If we drop the card in the first position
+      // If we drop the card in the first position
    } else if (!prevData) {
      base = nextData.sort - 1;
      increment = -1;
-    // If we drop the card in the last position
+      // If we drop the card in the last position
    } else if (!nextData) {
      base = prevData.sort + 1;
      increment = 1;
@@ -71,11 +71,11 @@ Utils = {
    if (!prevCardDomElement && !nextCardDomElement) {
      base = 0;
      increment = 1;
-    // If we drop the card in the first position
+      // If we drop the card in the first position
    } else if (!prevCardDomElement) {
      base = Blaze.getData(nextCardDomElement).sort - 1;
      increment = -1;
-    // If we drop the card in the last position
+      // If we drop the card in the last position
    } else if (!nextCardDomElement) {
      base = Blaze.getData(prevCardDomElement).sort + 1;
      increment = 1;
@@ -144,6 +144,72 @@ Utils = {
      }
    });
  },
+
+  setMatomo(data){
+    window._paq = window._paq || [];
+    window._paq.push(['setDoNotTrack', data.doNotTrack]);
+    if (data.withUserName){
+      window._paq.push(['setUserId', Meteor.user().username]);
+    }
+    window._paq.push(['trackPageView']);
+    window._paq.push(['enableLinkTracking']);
+
+    (function() {
+      window._paq.push(['setTrackerUrl', `${data.address}piwik.php`]);
+      window._paq.push(['setSiteId', data.siteId]);
+
+      const script = document.createElement('script');
+      Object.assign(script, {
+        id: 'scriptMatomo',
+        type: 'text/javascript',
+        async: 'true',
+        defer: 'true',
+        src: `${data.address}piwik.js`,
+      });
+
+      const s = document.getElementsByTagName('script')[0];
+      s.parentNode.insertBefore(script, s);
+    })();
+
+    Session.set('matomo', true);
+  },
+
+  manageMatomo() {
+    const matomo = Session.get('matomo');
+    if (matomo === undefined){
+      Meteor.call('getMatomoConf', (err, data) => {
+        if (err && err.error[0] === 'var-not-exist'){
+          Session.set('matomo', false); // siteId || address server not defined
+        }
+        if (!err){
+          Utils.setMatomo(data);
+        }
+      });
+    } else if (matomo) {
+      window._paq.push(['trackPageView']);
+    }
+  },
+
+  getTriggerActionDesc(event, tempInstance) {
+    const jqueryEl = tempInstance.$(event.currentTarget.parentNode);
+    const triggerEls = jqueryEl.find('.trigger-content').children();
+    let finalString = '';
+    for (let i = 0; i < triggerEls.length; i++) {
+      const element = tempInstance.$(triggerEls[i]);
+      if (element.hasClass('trigger-text')) {
+        finalString += element.text().toLowerCase();
+      } else if (element.find('select').length > 0) {
+        finalString += element.find('select option:selected').text().toLowerCase();
+      } else if (element.find('input').length > 0) {
+        finalString += element.find('input').val();
+      }
+      // Add space
+      if (i !== length - 1) {
+        finalString += ' ';
+      }
+    }
+    return finalString;
+  },
 };

 // A simple tracker dependency that we invalidate every time the window is
@@ -0,0 +1,4 @@
+module.exports.models = {
+  connection: 'mongodb',
+  migrate: 'safe',
+};
@@ -14,6 +14,8 @@ FlowRouter.route('/', {
    Filter.reset();
    EscapeActions.executeAll();

+    Utils.manageMatomo();
+
    BlazeLayout.render('defaultLayout', {
      headerBar: 'boardListHeaderBar',
      content: 'boardList',
@@ -38,6 +40,8 @@ FlowRouter.route('/b/:id/:slug', {
      EscapeActions.executeUpTo('popup-close');
    }

+    Utils.manageMatomo();
+
    BlazeLayout.render('defaultLayout', {
      headerBar: 'boardHeaderBar',
      content: 'board',
@@ -53,6 +57,8 @@ FlowRouter.route('/b/:boardId/:slug/:cardId', {
    Session.set('currentBoard', params.boardId);
    Session.set('currentCard', params.cardId);

+    Utils.manageMatomo();
+
    BlazeLayout.render('defaultLayout', {
      headerBar: 'boardHeaderBar',
      content: 'board',
@@ -0,0 +1,224 @@
+version: '2'
+
+# Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
+# 1) Edit settings
+# 2) docker-compose up -d
+
+services:
+
+  wekandb:
+    image: mongo:3.2.21
+    container_name: wekan-db
+    restart: always
+    command: mongod --smallfiles --oplogSize 128
+    networks:
+      - wekan-tier
+    expose:
+      - 27017
+    volumes:
+      - wekan-db:/data/db
+      - wekan-db-dump:/dump
+
+  wekan:
+    image: quay.io/wekan/wekan
+    container_name: wekan-app
+    restart: always
+    networks:
+      - wekan-tier
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        - NODE_VERSION=${NODE_VERSION}
+        - METEOR_RELEASE=${METEOR_RELEASE}
+        - NPM_VERSION=${NPM_VERSION}
+        - ARCHITECTURE=${ARCHITECTURE}
+        - SRC_PATH=${SRC_PATH}
+        - METEOR_EDGE=${METEOR_EDGE}
+        - USE_EDGE=${USE_EDGE}
+    ports:
+      # Docker outsideport:insideport
+      - 80:8080
+    environment:
+      - MONGO_URL=mongodb://wekandb:27017/wekan
+      - ROOT_URL=http://localhost
+      # Wekan Export Board works when WITH_API=true.
+      # If you disable Wekan API with false, Export Board does not work.
+      - WITH_API=true
+      # 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=
+      # The value of the site ID given in Matomo server for Wekan
+      # example: - MATOMO_SITE_ID=12345
+      #- MATOMO_SITE_ID=
+      # The option do not track which enables users to not be tracked by matomo
+      # example:  - MATOMO_DO_NOT_TRACK=false
+      #- MATOMO_DO_NOT_TRACK=
+      # The option that allows matomo to retrieve the username:
+      # example: MATOMO_WITH_USERNAME=true
+      #- MATOMO_WITH_USERNAME=false
+      # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
+      # Setting this to false is not recommended, it also disables all other browser policy protections
+      # 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=
+      # 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=
+      # Enable the OAuth2 connection
+      # example: OAUTH2_ENABLED=true
+      #- OAUTH2_ENABLED=false
+      # 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=
+      # LDAP_ENABLE : Enable or not the connection by the LDAP
+      # example : LDAP_ENABLE=true
+      #- LDAP_ENABLE=false
+      # LDAP_PORT : The port of the LDAP server
+      # example : LDAP_PORT=389
+      #- LDAP_PORT=389
+      # LDAP_HOST : The host server for the LDAP server
+      # example : LDAP_HOST=localhost
+      #- LDAP_HOST=
+      # LDAP_BASEDN : The base DN for the LDAP Tree
+      # example : LDAP_BASEDN=ou=user,dc=example,dc=org
+      #- LDAP_BASEDN=
+      # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+      # example : LDAP_LOGIN_FALLBACK=true
+      #- LDAP_LOGIN_FALLBACK=false
+      # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+      # example : LDAP_RECONNECT=false
+      #- LDAP_RECONNECT=true
+      # LDAP_TIMEOUT : Overall timeout, in milliseconds
+      # example : LDAP_TIMEOUT=12345
+      #- LDAP_TIMEOUT=10000
+      # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+      # example : LDAP_IDLE_TIMEOUT=12345
+      #- LDAP_IDLE_TIMEOUT=10000
+      # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+      # example : LDAP_CONNECT_TIMEOUT=12345
+      #- LDAP_CONNECT_TIMEOUT=10000
+      # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+      # example : LDAP_AUTHENTIFICATION=true
+      #- LDAP_AUTHENTIFICATION=false
+      # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+      # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+      #- LDAP_AUTHENTIFICATION_USERDN=
+      # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+      # example : AUTHENTIFICATION_PASSWORD=admin
+      #- LDAP_AUTHENTIFICATION_PASSWORD=
+      # LDAP_LOG_ENABLED : Enable logs for the module
+      # example : LDAP_LOG_ENABLED=true
+      #- LDAP_LOG_ENABLED=false
+      # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+      # example : LDAP_BACKGROUND_SYNC=true
+      #- LDAP_BACKGROUND_SYNC=false
+      # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+      # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
+      #- 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
+      #- 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=
+      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+      # example : LDAP_REJECT_UNAUTHORIZED=true
+      #- 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=
+      #- 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=
+      # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+      # example : LDAP_USER_SEARCH_FIELD=uid
+      #- LDAP_USER_SEARCH_FIELD=
+      # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+      # example : LDAP_SEARCH_PAGE_SIZE=12345
+      #- LDAP_SEARCH_PAGE_SIZE=0
+      # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+      # example : LDAP_SEARCH_SIZE_LIMIT=12345
+      #- LDAP_SEARCH_SIZE_LIMIT=0
+      # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+      # example : LDAP_GROUP_FILTER_ENABLE=true
+      #- LDAP_GROUP_FILTER_ENABLE=false
+      # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+      # example : LDAP_GROUP_FILTER_OBJECTCLASS=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=
+      # 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_FULLNAME_FIELD : Which field contains the ldap fullname
+      # example : LDAP_FULLNAME_FIELD=fullname
+      #- LDAP_FULLNAME_FIELD=
+      # LDAP_MERGE_EXISTING_USERS :
+      # example : LDAP_MERGE_EXISTING_USERS=true
+      #- LDAP_MERGE_EXISTING_USERS=false
+      # 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_GROUP_ROLES :
+      # example :
+      #- 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
+      # example :
+      #- LDAP_DEFAULT_DOMAIN=
+
+    depends_on:
+      - wekandb
+
+volumes:
+  wekan-db:
+    driver: local
+  wekan-db-dump:
+    driver: local
+
+networks:
+  wekan-tier:
+    driver: bridge
@@ -0,0 +1,247 @@
+version: '2'
+
+# Docker: Wekan <=> MongoDB <=> ToroDB => PostgreSQL read-only mirroring
+# for reporting with SQL, and accessing with any programming language,
+# reporting package and Office suite that can connect to PostgreSQL.
+# https://github.com/wekan/wekan-postgresql
+
+services:
+  torodb-stampede:
+    image: torodb/stampede:1.0.0-SNAPSHOT
+    networks:
+      - wekan-tier
+    links:
+      - postgres
+      - mongodb
+    environment:
+      - POSTGRES_PASSWORD
+      - TORODB_SETUP=true
+      - TORODB_SYNC_SOURCE=mongodb:27017
+      - TORODB_BACKEND_HOST=postgres
+      - TORODB_BACKEND_PORT=5432
+      - TORODB_BACKEND_DATABASE=wekan
+      - TORODB_BACKEND_USER=wekan
+      - TORODB_BACKEND_PASSWORD=wekan
+      - DEBUG
+  postgres:
+    image: postgres:9.6
+    networks:
+      - wekan-tier
+    environment:
+      - POSTGRES_PASSWORD
+    ports:
+      - "15432:5432"
+  mongodb:
+    image: mongo:3.2
+    networks:
+      - wekan-tier
+    ports:
+      - "28017:27017"
+    entrypoint:
+      - /bin/bash
+      - "-c"
+      - mongo --nodb --eval '
+            var db;
+            while (!db) {
+                try {
+                  db = new Mongo("mongodb:27017").getDB("local");
+                } catch(ex) {}
+                sleep(3000);
+            };
+            rs.initiate({_id:"rs1",members:[{_id:0,host:"mongodb:27017"}]});
+        ' 1>/dev/null 2>&1 &
+        mongod --replSet rs1
+  wekan:
+    image: quay.io/wekan/wekan
+    container_name: wekan-app
+    restart: always
+    networks:
+      - wekan-tier
+    ports:
+      - 80:8080
+    environment:
+      - MONGO_URL=mongodb://mongodb:27017/wekan
+      - ROOT_URL=http://localhost
+      #---------------------------------------------------------------
+      # == WEKAN API ==
+      # Wekan Export Board works when WITH_API='true'.
+      # If you disable Wekan API, Export Board does not work.
+      - WITH_API=true
+      # 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=
+      # The value of the site ID given in Matomo server for Wekan
+      # example: - MATOMO_SITE_ID=12345
+      #- MATOMO_SITE_ID=
+      # The option do not track which enables users to not be tracked by matomo
+      # example:  - MATOMO_DO_NOT_TRACK=false
+      #- MATOMO_DO_NOT_TRACK=
+      # The option that allows matomo to retrieve the username:
+      # example: MATOMO_WITH_USERNAME=true
+      #- MATOMO_WITH_USERNAME=false
+      # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
+      # Setting this to false is not recommended, it also disables all other browser policy protections
+      # 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=
+      # 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=
+      # Enable the OAuth2 connection
+      # example: OAUTH2_ENABLED=true
+      #- OAUTH2_ENABLED=false
+      # 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=
+      # LDAP_ENABLE : Enable or not the connection by the LDAP
+      # example : LDAP_ENABLE=true
+      #- LDAP_ENABLE=false
+      # LDAP_PORT : The port of the LDAP server
+      # example : LDAP_PORT=389
+      #- LDAP_PORT=389
+      # LDAP_HOST : The host server for the LDAP server
+      # example : LDAP_HOST=localhost
+      #- LDAP_HOST=
+      # LDAP_BASEDN : The base DN for the LDAP Tree
+      # example : LDAP_BASEDN=ou=user,dc=example,dc=org
+      #- LDAP_BASEDN=
+      # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+      # example : LDAP_LOGIN_FALLBACK=true
+      #- LDAP_LOGIN_FALLBACK=false
+      # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+      # example : LDAP_RECONNECT=false
+      #- LDAP_RECONNECT=true
+      # LDAP_TIMEOUT : Overall timeout, in milliseconds
+      # example : LDAP_TIMEOUT=12345
+      #- LDAP_TIMEOUT=10000
+      # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+      # example : LDAP_IDLE_TIMEOUT=12345
+      #- LDAP_IDLE_TIMEOUT=10000
+      # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+      # example : LDAP_CONNECT_TIMEOUT=12345
+      #- LDAP_CONNECT_TIMEOUT=10000
+      # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+      # example : LDAP_AUTHENTIFICATION=true
+      #- LDAP_AUTHENTIFICATION=false
+      # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+      # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+      #- LDAP_AUTHENTIFICATION_USERDN=
+      # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+      # example : AUTHENTIFICATION_PASSWORD=admin
+      #- LDAP_AUTHENTIFICATION_PASSWORD=
+      # LDAP_LOG_ENABLED : Enable logs for the module
+      # example : LDAP_LOG_ENABLED=true
+      #- LDAP_LOG_ENABLED=false
+      # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+      # example : LDAP_BACKGROUND_SYNC=true
+      #- LDAP_BACKGROUND_SYNC=false
+      # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+      # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
+      #- 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
+      #- 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=
+      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+      # example : LDAP_REJECT_UNAUTHORIZED=true
+      #- 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=
+      #- 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=
+      # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+      # example : LDAP_USER_SEARCH_FIELD=uid
+      #- LDAP_USER_SEARCH_FIELD=
+      # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+      # example : LDAP_SEARCH_PAGE_SIZE=12345
+      #- LDAP_SEARCH_PAGE_SIZE=0
+      # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+      # example : LDAP_SEARCH_SIZE_LIMIT=12345
+      #- LDAP_SEARCH_SIZE_LIMIT=0
+      # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+      # example : LDAP_GROUP_FILTER_ENABLE=true
+      #- LDAP_GROUP_FILTER_ENABLE=false
+      # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+      # example : LDAP_GROUP_FILTER_OBJECTCLASS=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=
+      # 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_FULLNAME_FIELD : Which field contains the ldap fullname
+      # example : LDAP_FULLNAME_FIELD=fullname
+      #- LDAP_FULLNAME_FIELD=
+      # LDAP_MERGE_EXISTING_USERS :
+      # example : LDAP_MERGE_EXISTING_USERS=true
+      #- LDAP_MERGE_EXISTING_USERS=false
+      # 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_GROUP_ROLES :
+      # example :
+      #- 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
+      # example :
+      #- LDAP_DEFAULT_DOMAIN=
+
+
+    depends_on:
+      - mongodb
+
+volumes:
+  mongodb:
+    driver: local
+  mongodb-dump:
+    driver: local
+
+networks:
+  wekan-tier:
+    driver: bridge
@@ -1,9 +1,13 @@
 version: '2'

+# Note: Do not add single quotes '' to variables. Having spaces still works without quotes where required.
+# 1) Edit settings
+# 2) docker-compose up -d
+
 services:

  wekandb:
-    image: mongo:3.2.20
+    image: mongo:3.2.21
    container_name: wekan-db
    restart: always
    command: mongod --smallfiles --oplogSize 128
@@ -21,22 +25,180 @@ services:
    restart: always
    networks:
      - wekan-tier
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        - NODE_VERSION=${NODE_VERSION}
-        - METEOR_RELEASE=${METEOR_RELEASE}
-        - NPM_VERSION=${NPM_VERSION}
-        - ARCHITECTURE=${ARCHITECTURE}
-        - SRC_PATH=${SRC_PATH}
-        - METEOR_EDGE=${METEOR_EDGE}
-        - USE_EDGE=${USE_EDGE}
    ports:
-      - 80:80
+      # Docker outsideport:insideport
+      - 80:8080
    environment:
      - MONGO_URL=mongodb://wekandb:27017/wekan
      - ROOT_URL=http://localhost
+      # Wekan Export Board works when WITH_API=true.
+      # If you disable Wekan API with false, Export Board does not work.
+      - WITH_API=true
+      # 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=
+      # The value of the site ID given in Matomo server for Wekan
+      # example: - MATOMO_SITE_ID=12345
+      #- MATOMO_SITE_ID=
+      # The option do not track which enables users to not be tracked by matomo
+      # example:  - MATOMO_DO_NOT_TRACK=false
+      #- MATOMO_DO_NOT_TRACK=
+      # The option that allows matomo to retrieve the username:
+      # example: MATOMO_WITH_USERNAME=true
+      #- MATOMO_WITH_USERNAME=false
+      # Enable browser policy and allow one trusted URL that can have iframe that has Wekan embedded inside.
+      # Setting this to false is not recommended, it also disables all other browser policy protections
+      # 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=
+      # 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=
+      # Enable the OAuth2 connection
+      # example: OAUTH2_ENABLED=true
+      #- OAUTH2_ENABLED=false
+      # 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=
+      # LDAP_ENABLE : Enable or not the connection by the LDAP
+      # example : LDAP_ENABLE=true
+      #- LDAP_ENABLE=false
+      # LDAP_PORT : The port of the LDAP server
+      # example : LDAP_PORT=389
+      #- LDAP_PORT=389
+      # LDAP_HOST : The host server for the LDAP server
+      # example : LDAP_HOST=localhost
+      #- LDAP_HOST=
+      # LDAP_BASEDN : The base DN for the LDAP Tree
+      # example : LDAP_BASEDN=ou=user,dc=example,dc=org
+      #- LDAP_BASEDN=
+      # LDAP_LOGIN_FALLBACK : Fallback on the default authentication method
+      # example : LDAP_LOGIN_FALLBACK=true
+      #- LDAP_LOGIN_FALLBACK=false
+      # LDAP_RECONNECT : Reconnect to the server if the connection is lost
+      # example : LDAP_RECONNECT=false
+      #- LDAP_RECONNECT=true
+      # LDAP_TIMEOUT : Overall timeout, in milliseconds
+      # example : LDAP_TIMEOUT=12345
+      #- LDAP_TIMEOUT=10000
+      # LDAP_IDLE_TIMEOUT : Specifies the timeout for idle LDAP connections in milliseconds
+      # example : LDAP_IDLE_TIMEOUT=12345
+      #- LDAP_IDLE_TIMEOUT=10000
+      # LDAP_CONNECT_TIMEOUT : Connection timeout, in milliseconds
+      # example : LDAP_CONNECT_TIMEOUT=12345
+      #- LDAP_CONNECT_TIMEOUT=10000
+      # LDAP_AUTHENTIFICATION : If the LDAP needs a user account to search
+      # example : LDAP_AUTHENTIFICATION=true
+      #- LDAP_AUTHENTIFICATION=false
+      # LDAP_AUTHENTIFICATION_USERDN : The search user DN
+      # example : LDAP_AUTHENTIFICATION_USERDN=cn=admin,dc=example,dc=org
+      #- LDAP_AUTHENTIFICATION_USERDN=
+      # LDAP_AUTHENTIFICATION_PASSWORD : The password for the search user
+      # example : AUTHENTIFICATION_PASSWORD=admin
+      #- LDAP_AUTHENTIFICATION_PASSWORD=
+      # LDAP_LOG_ENABLED : Enable logs for the module
+      # example : LDAP_LOG_ENABLED=true
+      #- LDAP_LOG_ENABLED=false
+      # LDAP_BACKGROUND_SYNC : If the sync of the users should be done in the background
+      # example : LDAP_BACKGROUND_SYNC=true
+      #- LDAP_BACKGROUND_SYNC=false
+      # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
+      # example : LDAP_BACKGROUND_SYNC_INTERVAL=12345
+      #- 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
+      #- 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=
+      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
+      # example : LDAP_REJECT_UNAUTHORIZED=true
+      #- 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=
+      #- 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=
+      # LDAP_USER_SEARCH_FIELD : Which field is used to find the user
+      # example : LDAP_USER_SEARCH_FIELD=uid
+      #- LDAP_USER_SEARCH_FIELD=
+      # LDAP_SEARCH_PAGE_SIZE : Used for pagination (0=unlimited)
+      # example : LDAP_SEARCH_PAGE_SIZE=12345
+      #- LDAP_SEARCH_PAGE_SIZE=0
+      # LDAP_SEARCH_SIZE_LIMIT : The limit number of entries (0=unlimited)
+      # example : LDAP_SEARCH_SIZE_LIMIT=12345
+      #- LDAP_SEARCH_SIZE_LIMIT=0
+      # LDAP_GROUP_FILTER_ENABLE : Enable group filtering
+      # example : LDAP_GROUP_FILTER_ENABLE=true
+      #- LDAP_GROUP_FILTER_ENABLE=false
+      # LDAP_GROUP_FILTER_OBJECTCLASS : The object class for filtering
+      # example : LDAP_GROUP_FILTER_OBJECTCLASS=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=
+      # 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_FULLNAME_FIELD : Which field contains the ldap fullname
+      # example : LDAP_FULLNAME_FIELD=fullname
+      #- LDAP_FULLNAME_FIELD=
+      # LDAP_MERGE_EXISTING_USERS :
+      # example : LDAP_MERGE_EXISTING_USERS=true
+      #- LDAP_MERGE_EXISTING_USERS=false
+      # 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_GROUP_ROLES :
+      # example :
+      #- 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
+      # example :
+      #- LDAP_DEFAULT_DOMAIN=
+
    depends_on:
      - wekandb

@@ -11,10 +11,10 @@
    "act-createCustomField": "created custom field __customField__",
    "act-createList": "اضاف __list__ الى __board__",
    "act-addBoardMember": "اضاف __member__ الى __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "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__",
@@ -29,7 +29,7 @@
    "activities": "الأنشطة",
    "activity": "النشاط",
    "activity-added": "تمت إضافة %s ل %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
    "activity-attached": "إرفاق %s ل %s",
    "activity-created": "أنشأ %s",
    "activity-customfield-created": "created custom field %s",
@@ -43,9 +43,19 @@
    "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-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",
    "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",
    "add-attachment": "إضافة مرفق",
    "add-board": "إضافة لوحة",
    "add-card": "إضافة بطاقة",
@@ -69,19 +79,19 @@
    "and-n-other-card_plural": "And __count__ other بطاقات",
    "apply": "طبق",
    "app-is-offline": "يتمّ تحميل ويكان، يرجى الانتظار. سيؤدي تحديث الصفحة إلى فقدان البيانات. إذا لم يتم تحميل ويكان، يرجى التحقق من أن خادم ويكان لم يتوقف. ",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "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?",
+    "archived-items": "أرشيف",
+    "archived-boards": "Boards in Archive",
    "restore-board": "استعادة اللوحة",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "أرشيف",
    "assign-member": "تعيين عضو",
    "attached": "أُرفق)",
    "attachment": "مرفق",
@@ -108,11 +118,12 @@
    "board-view-lists": "القائمات",
    "bucket-example": "مثل « todo list » على سبيل المثال",
    "cancel": "إلغاء",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
    "card-comments-title": "%s تعليقات لهذه البطاقة",
    "card-delete-notice": "هذا حذف أبديّ . سوف تفقد كل الإجراءات المنوطة بهذه البطاقة",
    "card-delete-pop": "سيتم إزالة جميع الإجراءات من تبعات النشاط، وأنك لن تكون قادرا على إعادة فتح البطاقة. لا يوجد التراجع.",
-    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
    "card-due": "مستحق",
    "card-due-on": "مستحق في",
    "card-spent": "Spent Time",
@@ -135,6 +146,9 @@
    "cards": "بطاقات",
    "cards-count": "بطاقات",
    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
    "change": "Change",
    "change-avatar": "تعديل الصورة الشخصية",
    "change-password": "تغيير كلمة المرور",
@@ -152,7 +166,7 @@
    "clipboard": "Clipboard or drag & drop",
    "close": "غلق",
    "close-board": "غلق اللوحة",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "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-green": "green",
@@ -167,10 +181,14 @@
    "comment-placeholder": "أكتب تعليق",
    "comment-only": "التعليق فقط",
    "comment-only-desc": "يمكن التعليق على بطاقات فقط.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
    "computer": "حاسوب",
    "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",
    "copyCardPopup-title": "نسخ البطاقة",
    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -261,15 +279,18 @@
    "headerBarCreateBoardPopup-title": "إنشاء لوحة",
    "home": "الرئيسية",
    "import": "Import",
+    "link": "Link",
    "import-board": "استيراد لوحة",
    "import-board-c": "استيراد لوحة",
    "import-board-title-trello": "Import board from Trello",
    "import-board-title-wekan": "استيراد لوحة من ويكان",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original Wekan 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-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "من تريلو",
    "from-wekan": "من ويكان",
    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
    "import-board-instruction-wekan": "في لوحة ويكان الخاصة بك، انتقل إلى 'القائمة'، ثم 'تصدير اللوحة'، ونسخ النص في الملف الذي تم تنزيله.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "import-map-members": "رسم خريطة الأعضاء",
    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
@@ -294,8 +315,8 @@
    "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
    "leaveBoardPopup-title": "مغادرة اللوحة ؟",
    "link-card": "ربط هذه البطاقة",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "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-move-cards": "نقل بطاقات هذه القائمة",
    "list-select-cards": "تحديد بطاقات هذه القائمة",
    "listActionPopup-title": "قائمة الإجراءات",
@@ -304,7 +325,7 @@
    "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 Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
    "lists": "القائمات",
    "swimlanes": "Swimlanes",
    "log-out": "تسجيل الخروج",
@@ -324,9 +345,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "لوحاتي",
    "name": "اسم",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
    "no-results": "لا توجد نتائج",
    "normal": "عادي",
    "normal-desc": "يمكن مشاهدة و تعديل  البطاقات. لا يمكن تغيير إعدادات الضبط.",
@@ -362,6 +383,7 @@
    "restore": "استعادة",
    "save": "حفظ",
    "search": "بحث",
+    "rules": "Rules",
    "search-cards": "Search from card titles and descriptions on this board",
    "search-example": "Text to search for?",
    "select-color": "اختيار اللون",
@@ -405,7 +427,7 @@
    "uploaded-avatar": "تم رفع الصورة الشخصية",
    "username": "اسم المستخدم",
    "view-it": "شاهدها",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
    "watch": "مُشاهد",
    "watching": "مشاهدة",
    "watching-info": "You will be notified of any change in this board",
@@ -462,6 +484,8 @@
    "minutes": "الدقائق",
    "seconds": "الثواني",
    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "نعم",
    "no": "لا",
    "accounts": "الحسابات",
@@ -498,5 +522,101 @@
    "change-card-parent": "Change card's parent",
    "parent-card": "Parent card",
    "source-board": "Source board",
-    "no-parent": "Don't show parent"
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "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-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "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-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-is": "is",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "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-add": "أضف",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "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-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "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-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo"
 }
@@ -1,8 +1,8 @@
 {
-    "accept": "Accept",
+    "accept": "Приемам",
    "act-activity-notify": "[Wekan] Известия за дейности",
    "act-addAttachment": "прикачи __attachment__ към __card__",
-    "act-addSubtask": "added subtask __checklist__ to __card__",
+    "act-addSubtask": "добави задача __checklist__ към __card__",
    "act-addChecklist": "добави списък със задачи __checklist__ към __card__",
    "act-addChecklistItem": "добави __checklistItem__ към списък със задачи __checklist__ в __card__",
    "act-addComment": "Коментира в __card__: __comment__",
@@ -11,10 +11,10 @@
    "act-createCustomField": "създаде собствено поле __customField__",
    "act-createList": "добави __list__ към __board__",
    "act-addBoardMember": "добави __member__ към __board__",
-    "act-archivedBoard": "__board__ беше преместен в Кошчето",
-    "act-archivedCard": "__card__ беше преместена в Кошчето",
-    "act-archivedList": "__list__ беше преместен в Кошчето",
-    "act-archivedSwimlane": "__swimlane__ беше преместен в Кошчето",
+    "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__",
@@ -25,11 +25,11 @@
    "act-unjoinMember": "премахна __member__ от __card__",
    "act-withBoardTitle": "[Wekan] __board__",
    "act-withCardTitle": "[__board__] __card__",
-    "actions": "Actions",
+    "actions": "Действия",
    "activities": "Действия",
    "activity": "Дейности",
    "activity-added": "добави %s към %s",
-    "activity-archived": "премести %s в Кошчето",
+    "activity-archived": "%s moved to Archive",
    "activity-attached": "прикачи %s към %s",
    "activity-created": "създаде %s",
    "activity-customfield-created": "създаде собствено поле %s",
@@ -42,15 +42,25 @@
    "activity-removed": "премахна %s от %s",
    "activity-sent": "изпрати %s до %s",
    "activity-unjoined": "вече не е част от %s",
-    "activity-subtask-added": "added subtask to %s",
+    "activity-subtask-added": "добави задача към %s",
+    "activity-checked-item": "отбеляза%s в списък със задачи %s на %s",
+    "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-item-added": "добави точка към '%s' в/във %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %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",
    "add-attachment": "Добави прикачен файл",
    "add-board": "Добави Табло",
    "add-card": "Добави карта",
    "add-swimlane": "Добави коридор",
-    "add-subtask": "Add Subtask",
+    "add-subtask": "Добави подзадача",
    "add-checklist": "Добави списък със задачи",
    "add-checklist-item": "Добави точка към списъка със задачи",
    "add-cover": "Добави корица",
@@ -68,20 +78,20 @@
    "and-n-other-card": "И __count__ друга карта",
    "and-n-other-card_plural": "И __count__ други карти",
    "apply": "Приложи",
-    "app-is-offline": "Wekan зарежда, моля изчакайте! Презареждането на страницата може да доведе до загуба на данни. Ако Wekan не се зареди, моля проверете дали сървъра му работи.",
-    "archive": "Премести в Кошчето",
-    "archive-all": "Премести всички в Кошчето",
-    "archive-board": "Премести Таблото в Кошчето",
-    "archive-card": "Премести Картата в Кошчето",
-    "archive-list": "Премести Списъка в Кошчето",
-    "archive-swimlane": "Премести Коридора в Кошчето",
-    "archive-selection": "Премести избраните в Кошчето",
-    "archiveBoardPopup-title": "Сигурни ли сте, че искате да преместите Таблото в Кошчето?",
-    "archived-items": "Кошче",
-    "archived-boards": "Табла в Кошчето",
+    "app-is-offline": "Wekan зарежда, моля изчакайте! Презареждането на страницата може да доведе до загуба на данни. Ако Wekan не се зареди, моля проверете дали сървърът му работи.",
+    "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?",
+    "archived-items": "Архив",
+    "archived-boards": "Boards in Archive",
    "restore-board": "Възстанови Таблото",
-    "no-archived-boards": "Няма Табла в Кошчето.",
-    "archives": "Кошче",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Архив",
    "assign-member": "Възложи на член от екипа",
    "attached": "прикачен",
    "attachment": "Прикаченн файл",
@@ -103,16 +113,17 @@
    "boardMenuPopup-title": "Меню на Таблото",
    "boards": "Табла",
    "board-view": "Board View",
-    "board-view-cal": "Calendar",
+    "board-view-cal": "Календар",
    "board-view-swimlanes": "Коридори",
    "board-view-lists": "Списъци",
    "bucket-example": "Like “Bucket List” for example",
    "cancel": "Cancel",
-    "card-archived": "Картата е преместена в Кошчето.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
    "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 Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
    "card-due": "Готова за",
    "card-due-on": "Готова за",
    "card-spent": "Изработено време",
@@ -135,24 +146,27 @@
    "cards": "Карти",
    "cards-count": "Карти",
    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Карта",
+    "cardType-linkedCard": "Свързана карта",
+    "cardType-linkedBoard": "Свързано табло",
    "change": "Промени",
    "change-avatar": "Промени аватара",
    "change-password": "Промени паролата",
-    "change-permissions": "Change permissions",
+    "change-permissions": "Промени правата",
    "change-settings": "Промени настройките",
    "changeAvatarPopup-title": "Промени аватара",
    "changeLanguagePopup-title": "Промени езика",
    "changePasswordPopup-title": "Промени паролата",
-    "changePermissionsPopup-title": "Change Permissions",
+    "changePermissionsPopup-title": "Промени правата",
    "changeSettingsPopup-title": "Промяна на настройките",
-    "subtasks": "Subtasks",
+    "subtasks": "Подзадачи",
    "checklists": "Списъци със задачи",
    "click-to-star": "Click to star this board.",
    "click-to-unstar": "Натиснете, за да премахнете това табло от любими.",
    "clipboard": "Клипборда или с драг & дроп",
    "close": "Затвори",
    "close-board": "Затвори Таблото",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
    "color-black": "черно",
    "color-blue": "синьо",
    "color-green": "зелено",
@@ -167,26 +181,30 @@
    "comment-placeholder": "Напиши коментар",
    "comment-only": "Само коментар",
    "comment-only-desc": "Може да коментира само в карти.",
+    "no-comments": "Няма коментари",
+    "no-comments-desc": "Can not see comments and activities.",
    "computer": "Компютър",
-    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
+    "confirm-subtask-delete-dialog": "Сигурен ли сте, че искате да изтриете подзадачата?",
+    "confirm-checklist-delete-dialog": "Сигурни ли сте, че искате да изтриете този чеклист?",
    "copy-card-link-to-clipboard": "Копирай връзката на картата в клипборда",
+    "linkCardPopup-title": "Свържи картата",
+    "searchCardPopup-title": "Търсене на карта",
    "copyCardPopup-title": "Копирай картата",
    "copyChecklistToManyCardsPopup-title": "Копирай чеклисти в други карти",
    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"First card title\", \"description\":\"First card description\"}, {\"title\":\"Second card title\",\"description\":\"Second card description\"},{\"title\":\"Last card title\",\"description\":\"Last card description\"} ]",
-    "create": "Create",
-    "createBoardPopup-title": "Create Board",
-    "chooseBoardSourcePopup-title": "Import board",
-    "createLabelPopup-title": "Create Label",
-    "createCustomField": "Create Field",
-    "createCustomFieldPopup-title": "Create Field",
-    "current": "current",
+    "create": "Създай",
+    "createBoardPopup-title": "Създай Табло",
+    "chooseBoardSourcePopup-title": "Импортирай Табло",
+    "createLabelPopup-title": "Създай Табло",
+    "createCustomField": "Създай Поле",
+    "createCustomFieldPopup-title": "Създай Поле",
+    "current": "сегашен",
    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
    "custom-field-checkbox": "Чекбокс",
    "custom-field-date": "Дата",
    "custom-field-dropdown": "Падащо меню",
-    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-none": "(няма)",
    "custom-field-dropdown-options": "List Options",
    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
    "custom-field-dropdown-unknown": "(unknown)",
@@ -232,18 +250,18 @@
    "email-verifyEmail-subject": "Verify your email address on __siteName__",
    "email-verifyEmail-text": "Hello __user__,\n\nTo verify your account email, simply click the link below.\n\n__url__\n\nThanks.",
    "enable-wip-limit": "Включи WIP лимита",
-    "error-board-doesNotExist": "This board does not exist",
-    "error-board-notAdmin": "You need to be admin of this board to do that",
-    "error-board-notAMember": "You need to be a member of this board to do that",
-    "error-json-malformed": "Your text is not valid JSON",
-    "error-json-schema": "Your JSON data does not include the proper information in the correct format",
-    "error-list-doesNotExist": "This list does not exist",
-    "error-user-doesNotExist": "This user does not exist",
-    "error-user-notAllowSelf": "You can not invite yourself",
-    "error-user-notCreated": "This user is not created",
-    "error-username-taken": "This username is already taken",
+    "error-board-doesNotExist": "Това табло не съществува",
+    "error-board-notAdmin": "За да направите това трябва да сте администратор на това табло",
+    "error-board-notAMember": "За да направите това трябва да сте член на това табло",
+    "error-json-malformed": "Текстът Ви не е валиден JSON",
+    "error-json-schema": "JSON информацията Ви не съдържа информация във валиден формат",
+    "error-list-doesNotExist": "Този списък не съществува",
+    "error-user-doesNotExist": "Този потребител не съществува",
+    "error-user-notAllowSelf": "Не можете да поканите себе си",
+    "error-user-notCreated": "Този потребител не е създаден",
+    "error-username-taken": "Това потребителско име е вече заето",
    "error-email-taken": "Имейлът е вече зает",
-    "export-board": "Export board",
+    "export-board": "Експортиране на Табло",
    "filter": "Филтър",
    "filter-cards": "Филтрирай картите",
    "filter-clear": "Премахване на филтрите",
@@ -256,21 +274,24 @@
    "advanced-filter-label": "Advanced Filter",
    "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": "Име",
-    "header-logo-title": "Go back to your boards page.",
+    "header-logo-title": "Назад към страницата с Вашите табла.",
    "hide-system-messages": "Скриване на системните съобщения",
-    "headerBarCreateBoardPopup-title": "Create Board",
+    "headerBarCreateBoardPopup-title": "Създай Табло",
    "home": "Начало",
-    "import": "Import",
-    "import-board": "import board",
-    "import-board-c": "Import board",
-    "import-board-title-trello": "Import board from Trello",
-    "import-board-title-wekan": "Import board from Wekan",
-    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
-    "from-trello": "From Trello",
-    "from-wekan": "From Wekan",
+    "import": "Импорт",
+    "link": "Връзка",
+    "import-board": "Импортирай Табло",
+    "import-board-c": "Импортирай Табло",
+    "import-board-title-trello": "Импорт на табло от Trello",
+    "import-board-title-wekan": "Импортирай табло от Wekan",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original Wekan 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-warning": "Импортирането ще изтрие всичката налична информация в таблото и ще я замени с нова.",
+    "from-trello": "От Trello",
+    "from-wekan": "От Wekan",
    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text.",
    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
-    "import-json-placeholder": "Paste your valid JSON data here",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
+    "import-json-placeholder": "Копирайте валидната Ви JSON информация тук",
    "import-map-members": "Map members",
    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
    "import-show-user-mapping": "Review members mapping",
@@ -282,10 +303,10 @@
    "invalid-time": "Невалиден час",
    "invalid-user": "Невалиден потребител",
    "joined": "присъедини ",
-    "just-invited": "You are just invited to this board",
-    "keyboard-shortcuts": "Keyboard shortcuts",
+    "just-invited": "Бяхте поканени в това табло",
+    "keyboard-shortcuts": "Преки пътища с клавиатурата",
    "label-create": "Създай етикет",
-    "label-default": "%s label (default)",
+    "label-default": "%s етикет (по подразбиране)",
    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
    "labels": "Етикети",
    "language": "Език",
@@ -294,8 +315,8 @@
    "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": "Премести всички карти от този списък в Кошчето",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "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-move-cards": "Премести всички карти в този списък",
    "list-select-cards": "Избери всички карти в този списък",
    "listActionPopup-title": "List Actions",
@@ -304,7 +325,7 @@
    "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": "Можете да преместите списък в Кошчето, за да го премахнете от Таблото и запазите активността.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
    "lists": "Списъци",
    "swimlanes": "Коридори",
    "log-out": "Изход",
@@ -324,9 +345,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "Моите табла",
    "name": "Име",
-    "no-archived-cards": "Няма карти в Кошчето.",
-    "no-archived-lists": "Няма списъци в Кошчето.",
-    "no-archived-swimlanes": "Няма коридори в Кошчето.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
    "no-results": "No results",
    "normal": "Normal",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -334,7 +355,7 @@
    "notify-participate": "Получавате информация за всички карти, в които сте отбелязани или сте създали",
    "notify-watch": "Получавате информация за всички табла, списъци и карти, които наблюдавате",
    "optional": "optional",
-    "or": "or",
+    "or": "или",
    "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.",
    "page-not-found": "Page not found.",
    "password": "Парола",
@@ -362,6 +383,7 @@
    "restore": "Възстанови",
    "save": "Запази",
    "search": "Търсене",
+    "rules": "Правила",
    "search-cards": "Search from card titles and descriptions on this board",
    "search-example": "Text to search for?",
    "select-color": "Избери цвят",
@@ -385,7 +407,7 @@
    "starred-boards-description": "Любимите табла се показват в началото на списъка Ви.",
    "subscribe": "Subscribe",
    "team": "Team",
-    "this-board": "this board",
+    "this-board": "това табло",
    "this-card": "картата",
    "spent-time-hours": "Изработено време (часа)",
    "overtime-hours": "Оувъртайм (часа)",
@@ -405,7 +427,7 @@
    "uploaded-avatar": "Качихте аватар",
    "username": "Потребителско име",
    "view-it": "View it",
-    "warn-list-archived": "внимание: тази карта е в списък, който е в Кошчето",
+    "warn-list-archived": "warning: this card is in an list at Archive",
    "watch": "Наблюдавай",
    "watching": "Наблюдава",
    "watching-info": "You will be notified of any change in this board",
@@ -462,6 +484,8 @@
    "minutes": "минути",
    "seconds": "секунди",
    "show-field-on-card": "Покажи това поле в картата",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Да",
    "no": "Не",
    "accounts": "Профили",
@@ -482,12 +506,12 @@
    "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",
-    "default-subtasks-board": "Subtasks for __board__ board",
-    "default": "Default",
+    "default-subtasks-board": "Подзадачи за табло __board__",
+    "default": "по подразбиране",
    "queue": "Queue",
-    "subtask-settings": "Subtasks Settings",
-    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
-    "show-subtasks-field": "Cards can have subtasks",
+    "subtask-settings": "Настройки на Подзадачите",
+    "boardSubtaskSettingsPopup-title": "Настройки за Подзадачите за това Табло",
+    "show-subtasks-field": "Картата може да има подзадачи",
    "deposit-subtasks-board": "Deposit subtasks to this board:",
    "deposit-subtasks-list": "Landing list for subtasks deposited here:",
    "show-parent-in-minicard": "Show parent in minicard:",
@@ -495,8 +519,104 @@
    "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",
+    "change-card-parent": "Промени източника на картата",
+    "parent-card": "Карта-източник",
    "source-board": "Source board",
-    "no-parent": "Don't show parent"
+    "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",
+    "r-rule": "Правило",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "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-is": "When a card is",
+    "r-added-to": "Added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "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-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-is": "is",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "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-add": "Добави",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Детайли за правилото",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "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-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "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-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo"
 }
@@ -11,10 +11,10 @@
    "act-createCustomField": "created custom field __customField__",
    "act-createList": "added __list__ to __board__",
    "act-addBoardMember": "added __member__ to __board__",
-    "act-archivedBoard": "__board__ moved to Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "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__",
@@ -29,7 +29,7 @@
    "activities": "Oberiantizoù",
    "activity": "Oberiantiz",
    "activity-added": "%s ouzhpennet da %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
    "activity-attached": "%s liammet ouzh %s",
    "activity-created": "%s krouet",
    "activity-customfield-created": "created custom field %s",
@@ -43,9 +43,19 @@
    "activity-sent": "sent %s to %s",
    "activity-unjoined": "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-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-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-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Add Attachment",
    "add-board": "Add Board",
    "add-card": "Add Card",
@@ -69,19 +79,19 @@
    "and-n-other-card_plural": "And __count__ other cards",
    "apply": "Apply",
    "app-is-offline": "Wekan is loading, please wait. Refreshing the page will cause data loss. If Wekan does not load, please check that Wekan server has not stopped.",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "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?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
    "restore-board": "Restore Board",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
    "assign-member": "Assign member",
    "attached": "attached",
    "attachment": "Attachment",
@@ -108,11 +118,12 @@
    "board-view-lists": "Lists",
    "bucket-example": "Like “Bucket List” for example",
    "cancel": "Cancel",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
    "card-comments-title": "This card has %s comment.",
    "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 Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
    "card-due": "Due",
    "card-due-on": "Due on",
    "card-spent": "Spent Time",
@@ -135,6 +146,9 @@
    "cards": "Kartennoù",
    "cards-count": "Kartennoù",
    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
    "change": "Change",
    "change-avatar": "Change Avatar",
    "change-password": "Kemmañ ger-tremen",
@@ -152,7 +166,7 @@
    "clipboard": "Clipboard or drag & drop",
    "close": "Close",
    "close-board": "Close Board",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "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-green": "gwer",
@@ -167,10 +181,14 @@
    "comment-placeholder": "Write Comment",
    "comment-only": "Comment only",
    "comment-only-desc": "Can comment on cards only.",
+    "no-comments": "No comments",
+    "no-comments-desc": "Can not see comments and activities.",
    "computer": "Computer",
    "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": "Copy card link to clipboard",
+    "linkCardPopup-title": "Link Card",
+    "searchCardPopup-title": "Search Card",
    "copyCardPopup-title": "Copy Card",
    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
@@ -261,15 +279,18 @@
    "headerBarCreateBoardPopup-title": "Create Board",
    "home": "Home",
    "import": "Import",
+    "link": "Link",
    "import-board": "import board",
    "import-board-c": "Import board",
    "import-board-title-trello": "Import board from Trello",
    "import-board-title-wekan": "Import board from Wekan",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original Wekan 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-warning": "Imported board will delete all existing data on board and replace it with imported board.",
    "from-trello": "From Trello",
    "from-wekan": "From Wekan",
    "import-board-instruction-trello": "In your Trello board, go to 'Menu', then 'More', 'Print and Export', 'Export JSON', and copy the resulting text",
    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
    "import-json-placeholder": "Paste your valid JSON data here",
    "import-map-members": "Map members",
    "import-members-map": "Your imported board has some members. Please map the members you want to import to Wekan users",
@@ -294,8 +315,8 @@
    "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": "Link to this card",
-    "list-archive-cards": "Move all cards in this list to Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "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-move-cards": "Move all cards in this list",
    "list-select-cards": "Select all cards in this list",
    "listActionPopup-title": "List Actions",
@@ -304,7 +325,7 @@
    "listMorePopup-title": "Muioc’h",
    "link-list": "Link to this 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 Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
    "lists": "Lists",
    "swimlanes": "Swimlanes",
    "log-out": "Log Out",
@@ -324,9 +345,9 @@
    "muted-info": "You will never be notified of any changes in this board",
    "my-boards": "My Boards",
    "name": "Name",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
    "no-results": "No results",
    "normal": "Normal",
    "normal-desc": "Can view and edit cards. Can't change settings.",
@@ -362,6 +383,7 @@
    "restore": "Restore",
    "save": "Save",
    "search": "Search",
+    "rules": "Rules",
    "search-cards": "Search from card titles and descriptions on this board",
    "search-example": "Text to search for?",
    "select-color": "Select Color",
@@ -405,7 +427,7 @@
    "uploaded-avatar": "Uploaded an avatar",
    "username": "Username",
    "view-it": "View it",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
    "watch": "Watch",
    "watching": "Watching",
    "watching-info": "You will be notified of any change in this board",
@@ -462,6 +484,8 @@
    "minutes": "minutes",
    "seconds": "seconds",
    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Yes",
    "no": "No",
    "accounts": "Accounts",
@@ -498,5 +522,101 @@
    "change-card-parent": "Change card's parent",
    "parent-card": "Parent card",
    "source-board": "Source board",
-    "no-parent": "Don't show parent"
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "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-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "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-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-is": "is",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "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-add": "Ouzhpenn",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "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-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "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-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo"
 }
@@ -11,10 +11,10 @@
    "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 Recycle Bin",
-    "act-archivedCard": "__card__ moved to Recycle Bin",
-    "act-archivedList": "__list__ moved to Recycle Bin",
-    "act-archivedSwimlane": "__swimlane__ moved to Recycle Bin",
+    "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",
@@ -29,7 +29,7 @@
    "activities": "Activitats",
    "activity": "Activitat",
    "activity-added": "ha afegit %s a %s",
-    "activity-archived": "%s moved to Recycle Bin",
+    "activity-archived": "%s moved to Archive",
    "activity-attached": "ha adjuntat %s a %s",
    "activity-created": "ha creat %s",
    "activity-customfield-created": "created custom field %s",
@@ -43,9 +43,19 @@
    "activity-sent": "ha enviat %s %s",
    "activity-unjoined": "desassignat %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-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-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-uncompleted-card": "uncompleted the checklist %s",
    "add-attachment": "Afegeix adjunt",
    "add-board": "Afegeix Tauler",
    "add-card": "Afegeix fitxa",
@@ -69,19 +79,19 @@
    "and-n-other-card_plural": "And __count__ other cards",
    "apply": "Aplica",
    "app-is-offline": "Wekan s'està carregant, esperau si us plau. Refrescar la pàgina causarà la pérdua de les dades. Si Wekan no carrega, verificau que el servei de Wekan no estigui aturat",
-    "archive": "Move to Recycle Bin",
-    "archive-all": "Move All to Recycle Bin",
-    "archive-board": "Move Board to Recycle Bin",
-    "archive-card": "Move Card to Recycle Bin",
-    "archive-list": "Move List to Recycle Bin",
-    "archive-swimlane": "Move Swimlane to Recycle Bin",
-    "archive-selection": "Move selection to Recycle Bin",
-    "archiveBoardPopup-title": "Move Board to Recycle Bin?",
-    "archived-items": "Recycle Bin",
-    "archived-boards": "Boards in Recycle Bin",
+    "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?",
+    "archived-items": "Desa",
+    "archived-boards": "Boards in Archive",
    "restore-board": "Restaura Tauler",
-    "no-archived-boards": "No Boards in Recycle Bin.",
-    "archives": "Recycle Bin",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Desa",
    "assign-member": "Assignar membre",
    "attached": "adjuntat",
    "attachment": "Adjunt",
@@ -108,11 +118,12 @@
    "board-view-lists": "Llistes",
    "bucket-example": "Igual que “Bucket List”,  per exemple",
    "cancel": "Cancel·la",
-    "card-archived": "This card is moved to Recycle Bin.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
    "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.",
-    "card-delete-suggest-archive": "You can move a card to Recycle Bin to remove it from the board and preserve the activity.",
+    "card-delete-suggest-archive": "You can move a card to Archive to remove it from the board and preserve the activity.",
    "card-due": "Finalitza",
    "card-due-on": "Finalitza a",
    "card-spent": "Temps Dedicat",
@@ -135,6 +146,9 @@
    "cards": "Fitxes",
    "cards-count": "Fitxes",
    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
    "change": "Canvia",
    "change-avatar": "Canvia Avatar",
    "change-password": "Canvia la clau",
@@ -152,7 +166,7 @@
    "clipboard": "Portaretalls o estirar i amollar",
    "close": "Tanca",
    "close-board": "Tanca tauler",
-    "close-board-pop": "You will be able to restore the board by clicking the “Recycle Bin” button from the home header.",
+    "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-green": "verd",
@@ -167,10 +181,14 @@
    "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-desc": "Can not see comments and activities.",
    "computer": "Ordinador",
    "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": "Copia l'enllaç de la ftixa al porta-retalls",
+    "linkCardPopup-title": "Link Card",
+    "searchCardPopup-title": "Search Card",
    "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",
@@ -261,15 +279,18 @@
    "headerBarCreateBoardPopup-title": "Crea tauler",
    "home": "Inici",
    "import": "importa",
+    "link": "Link",
    "import-board": "Importa tauler",
    "import-board-c": "Importa tauler",
    "import-board-title-trello": "Importa tauler des de Trello",
    "import-board-title-wekan": "I",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original Wekan 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-warning": "Estau segur que voleu esborrar aquesta checklist?",
    "from-trello": "Des de Trello",
    "from-wekan": "Des de Wekan",
    "import-board-instruction-trello": "En el teu tauler Trello, ves a 'Menú', 'Més'.' Imprimir i Exportar', 'Exportar JSON', i copia el text resultant.",
    "import-board-instruction-wekan": "In your Wekan board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.",
+    "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.",
    "import-json-placeholder": "Aferra codi JSON vàlid aquí",
    "import-map-members": "Mapeja el membres",
    "import-members-map": "El tauler importat conté membres. Assigna els membres que vulguis importar a usuaris Wekan",
@@ -294,8 +315,8 @@
    "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 Recycle Bin",
-    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Recycle Bin and bring them back to the board, click “Menu” > “Recycle Bin”.",
+    "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-move-cards": "Mou totes les fitxes d'aquesta llista",
    "list-select-cards": "Selecciona totes les fitxes d'aquesta llista",
    "listActionPopup-title": "Accions de la llista",
@@ -304,7 +325,7 @@
    "listMorePopup-title": "Més",
    "link-list": "Enllaça a aquesta llista",
    "list-delete-pop": "Totes les accions seran esborrades de la llista d'activitats i no serà possible recuperar la llista",
-    "list-delete-suggest-archive": "You can move a list to Recycle Bin to remove it from the board and preserve the activity.",
+    "list-delete-suggest-archive": "You can move a list to Archive to remove it from the board and preserve the activity.",
    "lists": "Llistes",
    "swimlanes": "Carrils de Natació",
    "log-out": "Finalitza la  sessió",
@@ -324,9 +345,9 @@
    "muted-info": "No seràs notificat dels canvis en aquest tauler",
    "my-boards": "Els meus taulers",
    "name": "Nom",
-    "no-archived-cards": "No cards in Recycle Bin.",
-    "no-archived-lists": "No lists in Recycle Bin.",
-    "no-archived-swimlanes": "No swimlanes in Recycle Bin.",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
    "no-results": "Sense resultats",
    "normal": "Normal",
    "normal-desc": "Podeu veure i editar fitxes. No podeu canviar la configuració.",
@@ -362,6 +383,7 @@
    "restore": "Restaura",
    "save": "Desa",
    "search": "Cerca",
+    "rules": "Rules",
    "search-cards": "Cerca títols de fitxa i descripcions en aquest tauler",
    "search-example": "Text que cercar?",
    "select-color": "Selecciona color",
@@ -405,7 +427,7 @@
    "uploaded-avatar": "Avatar actualitzat",
    "username": "Nom d'Usuari",
    "view-it": "Vist",
-    "warn-list-archived": "warning: this card is in an list at Recycle Bin",
+    "warn-list-archived": "warning: this card is in an list at Archive",
    "watch": "Observa",
    "watching": "En observació",
    "watching-info": "Seràs notificat de cada canvi en aquest tauler",
@@ -462,6 +484,8 @@
    "minutes": "minuts",
    "seconds": "segons",
    "show-field-on-card": "Show this field on card",
+    "automatically-field-on-card": "Auto create field to all cards",
+    "showLabel-field-on-card": "Show field label on minicard",
    "yes": "Si",
    "no": "No",
    "accounts": "Comptes",
@@ -498,5 +522,101 @@
    "change-card-parent": "Change card's parent",
    "parent-card": "Parent card",
    "source-board": "Source board",
-    "no-parent": "Don't show parent"
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "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-when-a-card-is": "When a card is",
+    "r-added-to": "Added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "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-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-is": "is",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-checklist": "When a checklist is",
+    "r-when-the-checklist": "When the checklist",
+    "r-completed": "Completed",
+    "r-made-incomplete": "Made incomplete",
+    "r-when-a-item": "When a checklist item is",
+    "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-add": "Afegeix",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "items of checklist",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "of checklist",
+    "r-send-email": "Send an email",
+    "r-to": "to",
+    "r-subject": "subject",
+    "r-rule-details": "Rule details",
+    "r-d-move-to-top-gen": "Move card to top of its list",
+    "r-d-move-to-top-spec": "Move card to top of list",
+    "r-d-move-to-bottom-gen": "Move card to bottom of its list",
+    "r-d-move-to-bottom-spec": "Move card to bottom of list",
+    "r-d-send-email": "Send email",
+    "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-add-label": "Add label",
+    "r-d-remove-label": "Remove label",
+    "r-d-add-member": "Add member",
+    "r-d-remove-member": "Remove member",
+    "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-check-of-list": "of checklist",
+    "r-d-add-checklist": "Add checklist",
+    "r-d-remove-checklist": "Remove checklist",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Authentication method",
+    "authentication-type": "Authentication type",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo"
 }
@@ -11,10 +11,10 @@
    "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__ bylo přesunuto do koše",
-    "act-archivedCard": "__card__ bylo přesunuto do koše",
-    "act-archivedList": "__list__ bylo přesunuto do koše",
-    "act-archivedSwimlane": "__swimlane__ bylo přesunuto do koše",
+    "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__",
@@ -29,7 +29,7 @@
    "activities": "Aktivity",
    "activity": "Aktivita",
    "activity-added": "%s přidáno k %s",
-    "activity-archived": "%s bylo přesunuto do koše",
+    "activity-archived": "%s moved to Archive",
    "activity-attached": "přiloženo %s k %s",
    "activity-created": "%s vytvořeno",
    "activity-customfield-created": "vytvořeno vlastní pole %s",
@@ -43,19 +43,29 @@
    "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-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-item-added": "přidána položka checklist do '%s' v %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %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",
    "add-attachment": "Přidat přílohu",
    "add-board": "Přidat tablo",
    "add-card": "Přidat kartu",
    "add-swimlane": "Přidat Swimlane",
-    "add-subtask": "Add Subtask",
+    "add-subtask": "Přidat Podúkol",
    "add-checklist": "Přidat zaškrtávací seznam",
    "add-checklist-item": "Přidat položku do zaškrtávacího seznamu",
    "add-cover": "Přidat obal",
    "add-label": "Přidat štítek",
-    "add-list": "Přidat list",
+    "add-list": "Přidat sloupec",
    "add-members": "Přidat členy",
    "added": "Přidán",
    "addMemberPopup-title": "Členové",
@@ -69,19 +79,19 @@
    "and-n-other-card_plural": "A __count__ dalších karet",
    "apply": "Použít",
    "app-is-offline": "Wekan se načítá, prosím čekejte. Obnovení stránky způsobí ztrátu dat. Pokud se Wekan nenačte, zkontrolujte prosím, jestli se server s Wekanem nezastavil.",
-    "archive": "Přesunout do koše",
-    "archive-all": "Přesunout všechno do koše",
-    "archive-board": "Přesunout tablo do koše",
-    "archive-card": "Přesunout kartu do koše",
-    "archive-list": "Přesunout seznam do koše",
-    "archive-swimlane": "Přesunout swimlane do koše",
-    "archive-selection": "Přesunout výběr do koše",
-    "archiveBoardPopup-title": "Chcete přesunout tablo do koše?",
-    "archived-items": "Koš",
-    "archived-boards": "Tabla v koši",
+    "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?",
+    "archived-items": "Archiv",
+    "archived-boards": "Boards in Archive",
    "restore-board": "Obnovit tablo",
-    "no-archived-boards": "Žádná tabla v koši",
-    "archives": "Koš",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archiv",
    "assign-member": "Přiřadit člena",
    "attached": "přiloženo",
    "attachment": "Příloha",
@@ -103,16 +113,17 @@
    "boardMenuPopup-title": "Menu tabla",
    "boards": "Tabla",
    "board-view": "Náhled tabla",
-    "board-view-cal": "Calendar",
+    "board-view-cal": "Kalendář",
    "board-view-swimlanes": "Swimlanes",
-    "board-view-lists": "Seznamy",
-    "bucket-example": "Například \"Než mě odvedou\"",
+    "board-view-lists": "Sloupce",
+    "bucket-example": "Například \"O čem sním\"",
    "cancel": "Zrušit",
-    "card-archived": "Karta byla přesunuta do koše.",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
    "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 znovu otevřít. Toto nelze vrátit zpět.",
-    "card-delete-suggest-archive": "Kartu můžete přesunout do koše a tím ji odstranit z tabla a přitom zachovat aktivity.",
+    "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-due": "Termín",
    "card-due-on": "Do",
    "card-spent": "Strávený čas",
@@ -135,6 +146,9 @@
    "cards": "Karty",
    "cards-count": "Karty",
    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Karta",
+    "cardType-linkedCard": "Propojená karta",
+    "cardType-linkedBoard": "Propojené tablo",
    "change": "Změnit",
    "change-avatar": "Změnit avatar",
    "change-password": "Změnit heslo",
@@ -152,7 +166,7 @@
    "clipboard": "Schránka nebo potáhnout a pustit",
    "close": "Zavřít",
    "close-board": "Zavřít tablo",
-    "close-board-pop": "Kliknutím na tlačítko \"Recyklovat\" budete moci obnovit tablo z koše.",
+    "close-board-pop": "You will be able to restore the board by clicking the “Archive” button from the home header.",
    "color-black": "černá",
    "color-blue": "modrá",
    "color-green": "zelená",
@@ -167,10 +181,14 @@
    "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.",
    "computer": "Počítač",
-    "confirm-subtask-delete-dialog": "Are you sure you want to delete subtask?",
-    "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist?",
+    "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",
    "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",
@@ -237,7 +255,7 @@
    "error-board-notAMember": "K provedení změny musíš být členem tohoto tabla",
    "error-json-malformed": "Tvůj text není validní JSON",
    "error-json-schema": "Tato JSON data neobsahují správné informace v platném formátu",
-    "error-list-doesNotExist": "Tento seznam neexistuje",
+    "error-list-doesNotExist": "Tento sloupec ;neexistuje",
    "error-user-doesNotExist": "Tento uživatel neexistuje",
    "error-user-notAllowSelf": "Nemůžeš pozvat sám sebe",
    "error-user-notCreated": "Tento uživatel není vytvořen",
@@ -254,22 +272,25 @@
    "filter-on-desc": "Filtrujete karty tohoto tabla. Pro úpravu filtru klikni sem.",
    "filter-to-selection": "Filtrovat výběr",
    "advanced-filter-label": "Pokročilý filtr",
-    "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",
+    "advanced-filter-description": "Pokročilý filtr dovoluje zapsat řetězec následujících operátorů: == != <= >= && || () Operátory jsou odděleny mezerou. Můžete filtrovat všechny vlastní pole zadáním jejich názvů nebo hodnot. Například: Pole1 == Hodnota1. Poznámka: Pokud pole nebo hodnoty obsahují mezery, je potřeba je obalit v jednoduchých uvozovkách. Například: 'Pole 1' == 'Hodnota 1'. Pro ignorovaní kontrolních znaků (' \\ /) je možné použít \\. Například Pole1 == I\\'m. Můžete také kombinovat více podmínek. Například P1 == H1 || P1 == H2. Obvykle jsou operátory interpretovány zleva doprava. Jejich pořadí můžete měnit pomocí závorek. Například: P1 == H1 && ( P2 == H2 || P2 == H3 )",
    "fullname": "Celé jméno",
    "header-logo-title": "Jit zpět na stránku s tably.",
    "hide-system-messages": "Skrýt systémové zprávy",
    "headerBarCreateBoardPopup-title": "Vytvořit tablo",
    "home": "Domů",
    "import": "Import",
+    "link": "Propojit",
    "import-board": "Importovat tablo",
    "import-board-c": "Importovat tablo",
    "import-board-title-trello": "Import board from Trello",
    "import-board-title-wekan": "Importovat tablo z Wekanu",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original Wekan 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-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 Wekanu",
    "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 Wekan 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-json-placeholder": "Sem vlož validní JSON data",
    "import-map-members": "Mapovat členy",
    "import-members-map": "Toto importované tablo obsahuje několik členů. Namapuj členy z importu na uživatelské účty Wekan.",
@@ -294,18 +315,18 @@
    "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": "Přesunout všechny karty v tomto seznamu do koše",
-    "list-archive-cards-pop": "Toto odstraní z tabla všechny karty z tohoto seznamu. Pro zobrazení karet v koši a jejich opětovné obnovení, klikni v \"Menu\" > \"Archivované položky\".",
-    "list-move-cards": "Přesunout všechny karty v tomto seznamu",
-    "list-select-cards": "Vybrat všechny karty v tomto seznamu",
+    "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-move-cards": "Přesunout všechny karty v tomto sloupci",
+    "list-select-cards": "Vybrat všechny karty v tomto sloupci",
    "listActionPopup-title": "Vypsat akce",
    "swimlaneActionPopup-title": "Akce swimlane",
    "listImportCardPopup-title": "Importovat Trello kartu",
    "listMorePopup-title": "Více",
-    "link-list": "Odkaz na tento seznam",
-    "list-delete-pop": "Všechny akce budou odstraněny z kanálu aktivity a nebude možné kartu obnovit. Toto nelze vrátit zpět.",
-    "list-delete-suggest-archive": "Kartu můžete přesunout do koše a tím ji odstranit z tabla a přitom zachovat aktivity.",
-    "lists": "Seznamy",
+    "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.",
+    "lists": "Sloupce",
    "swimlanes": "Swimlanes",
    "log-out": "Odhlásit",
    "log-in": "Přihlásit",
@@ -324,15 +345,15 @@
    "muted-info": "Nikdy nedostanete oznámení o změně v tomto tablu.",
    "my-boards": "Moje tabla",
    "name": "Jméno",
-    "no-archived-cards": "Žádné karty v koši",
-    "no-archived-lists": "Žádné seznamy v koši",
-    "no-archived-swimlanes": "Žádné swimlane v koši",
+    "no-archived-cards": "No cards in Archive.",
+    "no-archived-lists": "No lists in Archive.",
+    "no-archived-swimlanes": "No swimlanes in Archive.",
    "no-results": "Žádné výsledky",
    "normal": "Normální",
    "normal-desc": "Může zobrazovat a upravovat karty. Nemůže měnit nastavení.",
    "not-accepted-yet": "Pozvánka ještě nebyla přijmuta",
    "notify-participate": "Dostane aktualizace do všech karet, ve kterých se účastní jako tvůrce nebo člen",
-    "notify-watch": "Dostane aktualitace to všech tabel, seznamů nebo karet, které sledujete",
+    "notify-watch": "Dostane aktualitace to všech tabel, sloupců nebo karet, které sledujete",
    "optional": "volitelný",
    "or": "nebo",
    "page-maybe-private": "Tato stránka může být soukromá. Můžete ji zobrazit po <a href='%s'>přihlášení</a>.",
@@ -352,7 +373,7 @@
    "remove-cover": "Odstranit obal",
    "remove-from-board": "Odstranit z tabla",
    "remove-label": "Odstranit štítek",
-    "listDeletePopup-title": "Smazat seznam?",
+    "listDeletePopup-title": "Smazat sloupec?",
    "remove-member": "Odebrat uživatele",
    "remove-member-from-card": "Odstranit z karty",
    "remove-member-pop": "Odstranit __name__ (__username__) z __boardTitle__? Uživatel bude odebrán ze všech karet na tomto tablu. Na tuto skutečnost bude upozorněn.",
@@ -362,10 +383,11 @@
    "restore": "Obnovit",
    "save": "Uložit",
    "search": "Hledat",
+    "rules": "Pravidla",
    "search-cards": "Hledat nadpisy a popisy karet v tomto tablu",
    "search-example": "Hledaný text",
    "select-color": "Vybrat barvu",
-    "set-wip-limit-value": "Nastaví limit pro maximální počet úkolů v seznamu.",
+    "set-wip-limit-value": "Nastaví limit pro maximální počet úkolů ve sloupci.",
    "setWipLimitPopup-title": "Nastavit WIP Limit",
    "shortcut-assign-self": "Přiřadit sebe k aktuální kartě",
    "shortcut-autocomplete-emoji": "Automatické dokončování emoji",
@@ -376,13 +398,13 @@
    "shortcut-show-shortcuts": "Otevřít tento seznam odkazů",
    "shortcut-toggle-filterbar": "Přepnout lištu filtrování",
    "shortcut-toggle-sidebar": "Přepnout lištu tabla",
-    "show-cards-minimum-count": "Zobrazit počet karet pokud seznam obsahuje více než ",
+    "show-cards-minimum-count": "Zobrazit počet karet pokud sloupec obsahuje více než ",
    "sidebar-open": "Otevřít boční panel",
    "sidebar-close": "Zavřít boční panel",
    "signupPopup-title": "Vytvořit účet",
-    "star-board-title": "Kliknutím přidat tablu hvězdičku. Poté bude zobrazeno navrchu seznamu.",
+    "star-board-title": "Kliknutím přidat tablu hvězdičku. Poté bude zobrazeno nahoře.",
    "starred-boards": "Tabla s hvězdičkou",
-    "starred-boards-description": "Tabla s hvězdičkou jsou zobrazena navrchu seznamu.",
+    "starred-boards-description": "Tabla s hvězdičkou jsou zobrazena nahoře.",
    "subscribe": "Odebírat",
    "team": "Tým",
    "this-board": "toto tablo",
@@ -405,7 +427,7 @@
    "uploaded-avatar": "Avatar nahrán",
    "username": "Uživatelské jméno",
    "view-it": "Zobrazit",
-    "warn-list-archived": "varování: tuto kartu obsahuje seznam v koši",
+    "warn-list-archived": "warning: this card is in an list at Archive",
    "watch": "Sledovat",
    "watching": "Sledující",
    "watching-info": "Bude vám oznámena každá změna v tomto tablu",
@@ -415,8 +437,8 @@
    "welcome-list2": "Pokročilé",
    "what-to-do": "Co chcete dělat?",
    "wipLimitErrorPopup-title": "Neplatný WIP Limit",
-    "wipLimitErrorPopup-dialog-pt1": "Počet úkolů v tomto seznamu je vyšší než definovaný WIP limit.",
-    "wipLimitErrorPopup-dialog-pt2": "Přesuňte prosím některé úkoly mimo tento seznam, nebo nastavte vyšší WIP limit.",
+    "wipLimitErrorPopup-dialog-pt1": "Počet úkolů v tomto sloupci je vyšší než definovaný WIP limit.",
+    "wipLimitErrorPopup-dialog-pt2": "Přesuňte prosím některé úkoly mimo tento sloupec, nebo nastavte vyšší WIP limit.",
    "admin-panel": "Administrátorský panel",
    "settings": "Nastavení",
    "people": "Lidé",
@@ -462,6 +484,8 @@
    "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",
    "yes": "Ano",
    "no": "Ne",
    "accounts": "Účty",
@@ -476,18 +500,18 @@
    "card-end-on": "Končí v",
    "editCardReceivedDatePopup-title": "Změnit datum přijetí",
    "editCardEndDatePopup-title": "Změnit datum konce",
-    "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.",
-    "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.",
+    "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.",
+    "delete-board-confirm-popup": "Všechny sloupce, štítky a aktivity budou smazány a obsah tabla nebude možné obnovit. Toto nelze vrátit zpět.",
    "boardDeletePopup-title": "Smazat tablo?",
    "delete-board": "Smazat tablo",
-    "default-subtasks-board": "Subtasks for __board__ board",
-    "default": "Default",
+    "default-subtasks-board": "Podúkoly pro tablo __board__",
+    "default": "Výchozí",
    "queue": "Queue",
-    "subtask-settings": "Subtasks Settings",
-    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
-    "show-subtasks-field": "Cards can have subtasks",
+    "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-list": "Landing list for subtasks deposited here:",
    "show-parent-in-minicard": "Show parent in minicard:",
@@ -497,6 +521,102 @@
    "subtext-with-parent": "Subtext with parent",
    "change-card-parent": "Change card's parent",
    "parent-card": "Parent card",
-    "source-board": "Source board",
-    "no-parent": "Don't show parent"
+    "source-board": "Zdrojové tablo",
+    "no-parent": "Don't show parent",
+    "activity-added-label": "added label '%s' to %s",
+    "activity-removed-label": "removed label '%s' from %s",
+    "activity-delete-attach": "deleted an attachment from %s",
+    "activity-added-label-card": "added label '%s'",
+    "activity-removed-label-card": "removed label '%s'",
+    "activity-delete-attach-card": "deleted an attachment",
+    "r-rule": "Pravidlo",
+    "r-add-trigger": "Add trigger",
+    "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-no-rules": "Žádná pravidla",
+    "r-when-a-card-is": "Pokud je karta",
+    "r-added-to": "Přidáno do",
+    "r-removed-from": "Odstraněno z",
+    "r-the-board": "the board",
+    "r-list": "sloupce",
+    "r-moved-to": "Přesunuto do",
+    "r-moved-from": "Přesunuto z",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "Název sloupce",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-is": "is",
+    "r-when-a-attach": "When an attachment",
+    "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-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": "Checked",
+    "r-unchecked": "Unchecked",
+    "r-move-card-to": "Move card to",
+    "r-top-of": "Top of",
+    "r-bottom-of": "Bottom of",
+    "r-its-list": "toho sloupce",
+    "r-archive": "Move to Archive",
+    "r-unarchive": "Restore from Archive",
+    "r-card": "karta",
+    "r-add": "Přidat",
+    "r-remove": "Odstranit",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-checklist": "zaškrtávací seznam",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "r-items-check": "položky zaškrtávacího seznamu",
+    "r-check": "Check",
+    "r-uncheck": "Uncheck",
+    "r-item": "item",
+    "r-of-checklist": "ze zaškrtávacího seznamu",
+    "r-send-email": "Send an email",
+    "r-to": "komu",
+    "r-subject": "předmět",
+    "r-rule-details": "Rule details",
+    "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",
+    "r-d-move-to-bottom-spec": "Přesunout kartu na konec sloupce",
+    "r-d-send-email": "Odeslat email",
+    "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-add-label": "Přidat štítek",
+    "r-d-remove-label": "Odstranit štítek",
+    "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-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-when-a-card-is-moved": "Když je karta přesunuta do jiného sloupce",
+    "ldap": "LDAP",
+    "oauth2": "OAuth2",
+    "cas": "CAS",
+    "authentication-method": "Metoda autentizace",
+    "authentication-type": "Typ autentizace",
+    "custom-product-name": "Custom Product Name",
+    "layout": "Layout",
+    "hide-logo": "Hide Logo"
 }