v2.68

Update changelog.
Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
2019-05-10 23:18:12 +03:00 · 2019-05-10 23:13:20 +03:00 · 2019-05-10 23:04:51 +03:00 · 2019-05-10 22:23:15 +03:00 · 2019-05-10 22:21:50 +03:00 · 2019-05-10 21:01:34 +03:00
99 changed files with 1431 additions and 332 deletions
@@ -39,7 +39,7 @@ host = https://www.transifex.com
 # tap:i18n requires us to use `-` separator in the language identifiers whereas
 # Transifex uses a `_` separator, without an option to customize it on one side
 # or the other, so we need to do a Manual mapping.
-lang_map = bg_BG:bg, en_GB:en-GB, es_AR:es-AR, el_GR:el, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, no:nb, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, zh_CN:zh-CN, zh_TW:zh-TW
+lang_map = bg_BG:bg, en_GB:en-GB, es_AR:es-AR, el_GR:el, fi_FI:fi, hu_HU:hu, id_ID:id, mn_MN:mn, no:nb, lv_LV:lv, pt_BR:pt-BR, ro_RO:ro, zh_CN:zh-CN, zh_TW:zh-TW, zh_HK:zh-HK

 [wekan.application]
 file_filter = i18n/<lang>.i18n.json
@@ -1,3 +1,69 @@
+# v2.68 2019-05-10 Wekan release
+
+This release adds the following new features:
+
+- [Option to login to the LDAP server with the user's own username and password, instead of an administrator
+  key](https://github.com/wekan/wekan/pull/2399). Default: false (use administrator key).
+  With new setting: LDAP_USER_AUTHENTICATION=true.
+  Thanks to thiagofernando.
+- [Added above new LDAP_USER_AUTHENTION=true option to Snap, Docker and Source settings](https://github.com/wekan/wekan/commit/3bbc805ee42e3c1638b50260d3fafc2b5f936923).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.67 2019-05-10 Wekan release
+
+This release adds the following new features:
+
+- [Move board to Archive button at each board at All Boards page](https://github.com/wekan/wekan/commit/828f6ea321020eda77fea399df52889e2081dfac).
+  Thanks to xet7. Related [#2389](https://github.com/wekan/wekan/issues/2389).
+- [If adding Subtasks does not work on old board, added wiki page how to make it work again](https://github.com/wekan/wekan/wiki/Subtasks).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.66 2019-05-09 Wekan release
+
+This release adds the following new features:
+
+- [Delete user feature](https://github.com/wekan/wekan/pull/2384).
+  Thanks to Akuket.
+- Change to Delete user feature: [When last board admin is removed, board is not deleted, other board users can
+  still use it](https://github.com/wekan/wekan/commit/e1b016cf3d4ff93e9e0fe1feb96372e3e1625233).
+  Thanks to xet7.
+
+and adds the following new translations:
+
+- Add Chinese (Hong Kong).
+  Thanks to translators.
+
+and fixes the following bugs:
+
+- [Fix OIDC login](https://github.com/wekan/wekan/pull/2385). Related [#2383](https://github.com/wekan/wekan/issues/2383).
+  Thanks to faust64.
+- [Fix missing profile checks](https://github.com/wekan/wekan/pull/2396).
+  Thanks to justinr1234.
+- [Fix RTL issue #884, part 1](https://github.com/wekan/wekan/pull/2395).
+  Thanks to guyzyl.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v2.65 2019-04-24 Wekan release
+
+This release adds the following new features:
+
+- [Now a loading animation is displayed when the authentication is performed. This allows users
+  to know that it's in progress](https://github.com/wekan/wekan/pull/2379).
+  Thanks to Akuket.
+
+and removes the following UI duplicates:
+
+- [Remove from card menu, because they also exist at card:
+  members, labels, attachments, dates received/start/due/end](https://github.com/wekan/wekan/issues/2242).
+  Thanks to sfahrenholz, jrsupplee and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.64 2019-04-23 Wekan release

 This release adds the following new features:
@@ -61,6 +61,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential pyth
    LDAP_ENCRYPTION=false \
    LDAP_CA_CERT="" \
    LDAP_REJECT_UNAUTHORIZED=false \
+    LDAP_USER_AUTHENTICATION=false \
    LDAP_USER_SEARCH_FILTER="" \
    LDAP_USER_SEARCH_SCOPE="" \
    LDAP_USER_SEARCH_FIELD="" \
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.64.0"
+appVersion: "v2.68.0"
 files:
  userUploads:
    - README.md
@@ -30,6 +30,8 @@ template(name="boardBody")
        +listsGroup(currentBoard)
      else if isViewCalendar
        +calendarView
+      else
+        +listsGroup(currentBoard)

 template(name="calendarView")
  if isViewCalendar
@@ -191,19 +191,19 @@ BlazeComponent.extendComponent({
  isViewSwimlanes() {
    const currentUser = Meteor.user();
    if (!currentUser) return false;
-    return (currentUser.profile.boardView === 'board-view-swimlanes');
+    return ((currentUser.profile || {}).boardView === 'board-view-swimlanes');
  },

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

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

  openNewListForm() {
@@ -335,6 +335,6 @@ BlazeComponent.extendComponent({
  isViewCalendar() {
    const currentUser = Meteor.user();
    if (!currentUser) return false;
-    return (currentUser.profile.boardView === 'board-view-cal');
+    return ((currentUser.profile || {}).boardView === 'board-view-cal');
  },
 }).register('calendarView');
@@ -98,7 +98,7 @@ template(name="boardHeaderBar")
        a.board-header-btn.js-toggle-board-view(
          title="{{_ 'board-view'}}")
          i.fa.fa-th-large
-          span {{_ currentUser.profile.boardView}}
+          span {{#if currentUser.profile.boardView}}{{_ currentUser.profile.boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}}

      if canModifyBoard
        a.board-header-btn.js-multiselection-activate(
@@ -193,10 +193,10 @@ template(name="boardChangeTitlePopup")
  form
    label
      | {{_ 'title'}}
-      input.js-board-name(type="text" value=title autofocus)
+      input.js-board-name(type="text" value=title autofocus dir="auto")
    label
      | {{_ 'description'}}
-      textarea.js-board-desc= description
+      textarea.js-board-desc(dir="auto")= description
    input.primary.wide(type="submit" value="{{_ 'rename'}}")

 template(name="boardCreateRulePopup")
@@ -89,12 +89,14 @@ BlazeComponent.extendComponent({
      },
      'click .js-toggle-board-view'() {
        const currentUser = Meteor.user();
-        if (currentUser.profile.boardView === 'board-view-swimlanes') {
+        if ((currentUser.profile || {}).boardView === 'board-view-swimlanes') {
          currentUser.setBoardView('board-view-cal');
-        } else if (currentUser.profile.boardView === 'board-view-lists') {
+        } else if ((currentUser.profile || {}).boardView === 'board-view-lists') {
          currentUser.setBoardView('board-view-swimlanes');
-        } else if (currentUser.profile.boardView === 'board-view-cal') {
+        } else if ((currentUser.profile || {}).boardView === 'board-view-cal') {
          currentUser.setBoardView('board-view-lists');
+        } else {
+          currentUser.setBoardView('board-view-swimlanes');
        }
      },
      'click .js-toggle-sidebar'() {
@@ -30,8 +30,9 @@ template(name="boardList")
                i.fa.js-clone-board(
                    class="fa-clone"
                    title="{{_ 'duplicate-board'}}")
-
-
+                i.fa.js-archive-board(
+                    class="fa-archive"
+                    title="{{_ 'archive-board'}}")

 template(name="boardListHeaderBar")
  h1 {{_ 'my-boards'}}
@@ -70,6 +70,11 @@ BlazeComponent.extendComponent({
        );
        evt.preventDefault();
      },
+      'click .js-archive-board'(evt) {
+        const boardId = this.currentData()._id;
+        Meteor.call('archiveBoard', boardId);
+        evt.preventDefault();
+      },
      'click .js-accept-invite'() {
        const boardId = this.currentData()._id;
        Meteor.user().removeInvite(boardId);
@@ -106,15 +106,29 @@ $spaceBetweenTiles = 16px
    transition-duration: .15s
    transition-property: color, font-size, background

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

    .fa-star,
    .fa-clone,
+    .fa-archive,
    .fa-star-o
      color: white
      opacity: .75
@@ -197,20 +197,20 @@ template(name="cardDetails")
          +activities(card=this mode="card")

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

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

 template(name="editCardAssignerForm")
-  input.js-edit-card-assigner(type='text' autofocus value=getAssignedBy)
+  input.js-edit-card-assigner(type='text' autofocus value=getAssignedBy dir="auto")
  .edit-controls.clearfix
    button.primary.confirm.js-submit-edit-card-assigner-form(type="submit") {{_ 'save'}}
    a.fa.fa-times-thin.js-close-inlined-form
@@ -221,14 +221,14 @@ template(name="cardDetailsActionsPopup")
  if canModifyCard
    hr
    ul.pop-over-list
-      li: a.js-members {{_ 'card-edit-members'}}
-      li: a.js-labels {{_ 'card-edit-labels'}}
-      li: a.js-attachments {{_ 'card-edit-attachments'}}
+      //li: a.js-members {{_ 'card-edit-members'}}
+      //li: a.js-labels {{_ 'card-edit-labels'}}
+      //li: a.js-attachments {{_ 'card-edit-attachments'}}
      li: a.js-custom-fields {{_ 'card-edit-custom-fields'}}
-      li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
-      li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
-      li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
-      li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
+      //li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}}
+      //li: a.js-start-date {{_ 'editCardStartDatePopup-title'}}
+      //li: a.js-due-date {{_ 'editCardDueDatePopup-title'}}
+      //li: a.js-end-date {{_ 'editCardEndDatePopup-title'}}
      li: a.js-spent-time {{_ 'editCardSpentTimePopup-title'}}
      li: a.js-set-card-color {{_ 'setCardColorPopup-title'}}
    hr
@@ -56,7 +56,7 @@ template(name="addChecklistItemForm")
    a.fa.fa-times-thin.js-close-inlined-form

 template(name="editChecklistItemForm")
-  textarea.js-edit-checklist-item(rows='1' autofocus)
+  textarea.js-edit-checklist-item(rows='1' autofocus dir="auto")
    if $eq type 'item'
      = item.title
    else
@@ -50,13 +50,13 @@ template(name="subtaskDeleteDialog")
      button.toggle-delete-subtask-dialog(type="button") {{_ 'cancel'}}

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

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

        // Normally the jquery-ui sortable library moves the dragged DOM element
@@ -105,7 +105,7 @@ template(name="searchElementPopup")
        each boards
          option(value="{{_id}}") {{title}}
  form.js-search-term-form
-    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus)
+    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
  .list-body.js-perfect-scrollbar.search-card-results
    .minicards.clearfix.js-minicards
      if isBoardTemplateSearch
@@ -48,7 +48,7 @@ BlazeComponent.extendComponent({
    const board = this.data().board();
    let linkedId = '';
    let swimlaneId = '';
-    const boardView = Meteor.user().profile.boardView;
+    const boardView = (Meteor.user().profile || {}).boardView;
    let cardType = 'cardType-card';
    if (title) {
      if (board.isTemplatesBoard()) {
@@ -72,7 +72,7 @@ BlazeComponent.extendComponent({
        }
      } else if (boardView === 'board-view-swimlanes')
        swimlaneId = this.parentComponent().parentComponent().data()._id;
-      else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal'))
+      else if ((boardView === 'board-view-lists') || (boardView === 'board-view-cal') || !boardView)
        swimlaneId = board.getDefaultSwimline()._id;

      const _id = Cards.insert({
@@ -149,7 +149,7 @@ BlazeComponent.extendComponent({

  idOrNull(swimlaneId) {
    const currentUser = Meteor.user();
-    if (currentUser.profile.boardView === 'board-view-swimlanes' ||
+    if ((currentUser.profile || {}).boardView === 'board-view-swimlanes' ||
        this.data().board().isTemplatesBoard())
      return swimlaneId;
    return undefined;
@@ -356,10 +356,10 @@ BlazeComponent.extendComponent({
    // Swimlane where to insert card
    const swimlane = $(Popup._getTopStack().openerElement).closest('.js-swimlane');
    this.swimlaneId = '';
-    const boardView = Meteor.user().profile.boardView;
+    const boardView = (Meteor.user().profile || {}).boardView;
    if (boardView === 'board-view-swimlanes')
      this.swimlaneId = Blaze.getData(swimlane[0])._id;
-    else if (boardView === 'board-view-lists')
+    else if (boardView === 'board-view-lists' || !boardView)
      this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
  },

@@ -485,13 +485,13 @@ BlazeComponent.extendComponent({
      this.isBoardTemplateSearch;
    let board = {};
    if (this.isTemplateSearch) {
-      board = Boards.findOne(Meteor.user().profile.templatesBoardId);
+      board = Boards.findOne((Meteor.user().profile || {}).templatesBoardId);
    } else {
      // Prefetch first non-current board id
      board = Boards.findOne({
        archived: false,
        'members.userId': Meteor.userId(),
-        _id: {$nin: [Session.get('currentBoard'), Meteor.user().profile.templatesBoardId]},
+        _id: {$nin: [Session.get('currentBoard'), (Meteor.user().profile || {}).templatesBoardId]},
      });
    }
    if (!board) {
@@ -510,7 +510,7 @@ BlazeComponent.extendComponent({
      this.swimlaneId = '';
      // Swimlane where to insert card
      const swimlane = $(Popup._getTopStack().openerElement).parents('.js-swimlane');
-      if (Meteor.user().profile.boardView === 'board-view-swimlanes')
+      if ((Meteor.user().profile || {}).boardView === 'board-view-swimlanes')
        this.swimlaneId = Blaze.getData(swimlane[0])._id;
      else
        this.swimlaneId = Swimlanes.findOne({boardId: this.boardId})._id;
@@ -620,7 +620,7 @@ BlazeComponent.extendComponent({
    this.listId = this.parentComponent().data()._id;
    this.swimlaneId = '';

-    const boardView = Meteor.user().profile.boardView;
+    const boardView = (Meteor.user().profile || {}).boardView;
    if (boardView === 'board-view-swimlanes')
      this.swimlaneId = this.parentComponent().parentComponent().parentComponent().data()._id;
  },
@@ -30,7 +30,7 @@ BlazeComponent.extendComponent({
  cardsCount() {
    const list = Template.currentData();
    let swimlaneId = '';
-    const boardView = Meteor.user().profile.boardView;
+    const boardView = (Meteor.user().profile || {}).boardView;
    if (boardView === 'board-view-swimlanes')
      swimlaneId = this.parentComponent().parentComponent().data()._id;

@@ -1,5 +1,6 @@
 template(name="editor")
  textarea.editor(
+    dir="auto"
    class="{{class}}"
    id=id
    autofocus=autofocus
@@ -7,7 +8,7 @@ template(name="editor")
    +Template.contentBlock

 template(name="viewer")
-  .viewer
+  .viewer(dir="auto")
    +mentions
      +markdown
        {{> UI.contentBlock }}
@@ -13,20 +13,20 @@ head

 template(name="userFormsLayout")
  section.auth-layout
-    h1
-      br
-      br
    section.auth-dialog
-      +Template.dynamic(template=content)
-      if currentSetting.displayAuthenticationMethod
-        +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
-      div.at-form-lang
-        select.select-lang.js-userform-set-language
-          each languages
-            if isCurrentLanguage
-              option(value="{{tag}}" selected="selected") {{name}}
-            else
-              option(value="{{tag}}") {{name}}
+      if isLoading
+        +loader
+      else
+        +Template.dynamic(template=content)
+        if currentSetting.displayAuthenticationMethod
+          +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
+        div.at-form-lang
+          select.select-lang.js-userform-set-language
+            each languages
+              if isCurrentLanguage
+                option(value="{{tag}}" selected="selected") {{name}}
+              else
+                option(value="{{tag}}") {{name}}

 template(name="defaultLayout")
  +header
@@ -59,3 +59,14 @@ template(name="message")
    unless currentUser
      with(pathFor route='atSignIn')
        p {{{_ 'page-maybe-private' this}}}
+
+template(name="loader")
+  h1.loadingText {{_ 'loading'}}
+  .lds-roller
+    div
+    div
+    div
+    div
+    div
+    div
+    div
@@ -23,6 +23,7 @@ const validator = {
 Template.userFormsLayout.onCreated(function() {
  const instance = this;
  instance.currentSetting = new ReactiveVar();
+  instance.isLoading = new ReactiveVar(false);

  Meteor.subscribe('setting', {
    onReady() {
@@ -47,6 +48,10 @@ Template.userFormsLayout.helpers({
    return Template.instance().currentSetting.get();
  },

+  isLoading() {
+    return Template.instance().isLoading.get();
+  },
+
  afterBodyStart() {
    return currentSetting.customHTMLafterBodyStart;
  },
@@ -89,7 +94,11 @@ Template.userFormsLayout.events({
  },
  'click #at-btn'(event, instance) {
    if (FlowRouter.getRouteName() === 'atSignIn') {
-      authentication(event, instance);
+      instance.isLoading.set(true);
+      authentication(event, instance)
+        .then(() => {
+          instance.isLoading.set(false);
+        });
    }
  },
 });
@@ -104,11 +113,11 @@ async function authentication(event, instance) {
  const match = $('#at-field-username_and_email').val();
  const password = $('#at-field-password').val();

-  if (!match || !password) return;
+  if (!match || !password) return undefined;

  const result = await getAuthenticationMethod(instance.currentSetting.get(), match);

-  if (result === 'password') return;
+  if (result === 'password') return undefined;

  // Stop submit #at-pwd-form
  event.preventDefault();
@@ -116,19 +125,21 @@ async function authentication(event, instance) {

  switch (result) {
  case 'ldap':
-    Meteor.loginWithLDAP(match, password, function() {
-      FlowRouter.go('/');
+    return new Promise((resolve) => {
+      Meteor.loginWithLDAP(match, password, function() {
+        resolve(FlowRouter.go('/'));
+      });
    });
-    break;

  case 'cas':
-    Meteor.loginWithCas(function() {
-      FlowRouter.go('/');
+    return new Promise((resolve) => {
+      Meteor.loginWithCas(match, password, function() {
+        resolve(FlowRouter.go('/'));
+      });
    });
-    break;

  default:
-    break;
+    return undefined;
  }
 }

@@ -61,7 +61,7 @@ body
      display: block
      float: right
      font-size: 24px
-  
+
  .modal-content-wide
    width: 800px
    min-height: 0px
@@ -290,7 +290,7 @@ kbd
 // Implement a thiner close icon as suggested in
 // https://github.com/FortAwesome/Font-Awesome/issues/1540#issuecomment-68689950
 .fa.fa-times-thin:before
-  content: '\00d7';
+  content: '\00d7'

 .fa.fa-globe.colorful, .fa.fa-bell.colorful
  color: #4caf50
@@ -399,3 +399,103 @@ a
  height: 37px
  margin: 8px 10px 0 0
  width: 50px
+
+.select-authentication
+  width: 100%
+
+.auth-layout
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  height: 100%
+
+  .auth-dialog
+    margin: 0 !important
+
+.loadingText
+  text-align: center
+
+.lds-roller
+  display: block
+  margin: auto
+  position: relative
+  width: 64px
+  height: 64px
+
+  div
+    animation: lds-roller 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite
+    transform-origin: 32px 32px
+
+  div:after
+    content: " "
+    display: block
+    position: absolute
+    width: 6px
+    height: 6px
+    border-radius: 50%
+    background: #dedede
+    margin: -3px 0 0 -3px
+
+  div:nth-child(1)
+    animation-delay: -0.036s
+
+  div:nth-child(1):after
+    top: 50px
+    left: 50px
+
+  div:nth-child(2)
+    animation-delay: -0.072s
+
+  div:nth-child(2):after
+    top: 54px
+    left: 45px
+
+  div:nth-child(3)
+    animation-delay: -0.108s
+
+  div:nth-child(3):after
+    top: 57px
+    left: 39px
+
+  div:nth-child(4)
+    animation-delay: -0.144s
+
+  div:nth-child(4):after
+    top: 58px
+    left: 32px
+
+  div:nth-child(5)
+    animation-delay: -0.18s
+
+  div:nth-child(5):after
+    top: 57px
+    left: 25px
+
+  div:nth-child(6)
+    animation-delay: -0.216s
+
+  div:nth-child(6):after
+    top: 54px
+    left: 19px
+
+  div:nth-child(7)
+    animation-delay: -0.252s
+
+  div:nth-child(7):after
+    top: 50px
+    left: 14px
+
+  div:nth-child(8)
+    animation-delay: -0.288s
+
+  div:nth-child(8):after
+    top: 45px
+    left: 10px
+
+@keyframes lds-roller
+  0%
+    transform: rotate(0deg)
+
+  100%
+    transform: rotate(360deg)
@@ -107,5 +107,8 @@ template(name="editUserPopup")
    label
      | {{_ 'password'}}
      input.js-profile-password(type="password")
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+      div
+      input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")

-    input.primary.wide(type="submit" value="{{_ 'save'}}")
@@ -98,6 +98,7 @@ Template.peopleRow.helpers({

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

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

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

  button
    min-width: 60px;
+
+.content-wrapper
+  margin-top: 10px
+
+.buttonsContainer
+  display: flex
+
+  input
+    margin: 0
+
+  div
+    margin: auto
@@ -1,6 +1,6 @@
 template(name="searchSidebar")
  form.js-search-term-form
-    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus)
+    input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
  .list-body.js-perfect-scrollbar
    .minicards.clearfix.js-minicards
      each (results)
@@ -8,7 +8,7 @@ function currentListIsInThisSwimlane(swimlaneId) {
 function currentCardIsInThisList(listId, swimlaneId) {
  const currentCard = Cards.findOne(Session.get('currentCard'));
  const currentUser = Meteor.user();
-  if (currentUser && currentUser.profile.boardView === 'board-view-swimlanes')
+  if (currentUser && currentUser.profile && currentUser.profile.boardView === 'board-view-swimlanes')
    return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
  else // Default view: board-view-lists
    return currentCard && currentCard.listId === listId;
@@ -53,7 +53,10 @@ template(name="editProfilePopup")
        input.js-profile-email(type="email" value="{{emails.[0].address}}")
      else
        input.js-profile-email(type="email" value="{{emails.[0].address}}" readonly)
-    input.primary.wide(type="submit" value="{{_ 'save'}}")
+    div.buttonsContainer
+      input.primary.wide(type="submit" value="{{_ 'save'}}")
+      div
+      input#deleteButton.primary.wide(type="button" value="{{_ 'delete'}}")

 template(name="changePasswordPopup")
  +atForm(state='changePwd')
@@ -95,6 +95,11 @@ Template.editProfilePopup.events({
      });
    } else Popup.back();
  },
+  'click #deleteButton'() {
+    Users.remove(Meteor.userId());
+    Popup.close();
+    AccountsTemplates.logout();
+  },
 });

 // XXX For some reason the useraccounts autofocus isnt working in this case.
@@ -135,6 +135,6 @@ $(document).on('click', (evt) => {
  }
 });

-$(document).on('click', 'a[href=#]',  (evt) => {
+$(document).on('click', 'a[href=\\#]',  (evt) => {
  evt.preventDefault();
 });
@@ -400,6 +400,9 @@ services:
      # Reject Unauthorized Certificate
      #- LDAP_REJECT_UNAUTHORIZED=false
      #
+      # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
+      #- LDAP_USER_AUTHENTICATION="true"
+      #
      # Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
      #- LDAP_USER_SEARCH_FILTER=
      #
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -683,10 +683,11 @@
    "error-ldap-login": "Během přihlašování nastala chyba",
    "display-authentication-method": "Zobraz způsob ověřování",
    "default-authentication-method": "Zobraz způsob ověřování",
-    "duplicate-board": "Duplicate Board",
+    "duplicate-board": "Duplikovat tablo",
    "people-number": "The number of people is:",
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -271,9 +271,9 @@
    "email-enrollAccount-subject": "Ihr Benutzerkonto auf __siteName__ wurde erstellt",
    "email-enrollAccount-text": "Hallo __user__,\n\num den Dienst nutzen zu können, klicken Sie bitte auf folgenden Link:\n\n__url__\n\nDanke.",
    "email-fail": "Senden der E-Mail fehlgeschlagen",
-    "email-fail-text": "Fehler beim Senden des E-Mails",
+    "email-fail-text": "Fehler beim Senden der E-Mail",
    "email-invalid": "Ungültige E-Mail-Adresse",
-    "email-invite": "via E-Mail einladen",
+    "email-invite": "per E-Mail einladen",
    "email-invite-subject": "__inviter__ hat Ihnen eine Einladung geschickt",
    "email-invite-text": "Hallo __user__,\n\n__inviter__ hat Sie zu dem Board \"__board__\" eingeladen.\n\nBitte klicken Sie auf folgenden Link:\n\n__url__\n\nDanke.",
    "email-resetPassword-subject": "Setzten Sie ihr Passwort auf __siteName__ zurück",
@@ -685,8 +685,9 @@
    "default-authentication-method": "Standardauthentifizierungsverfahren",
    "duplicate-board": "Board duplizieren",
    "people-number": "Anzahl der Personen:",
-    "swimlaneDeletePopup-title": "Delete Swimlane ?",
-    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
-    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "swimlaneDeletePopup-title": "Swimlane löschen?",
+    "swimlane-delete-pop": "Alle Aktionen werden aus dem Aktivitätenfeed entfernt und die Swimlane kann nicht wiederhergestellt werden. Es gibt kein Rückgängig!",
+    "restore-all": "Alles wiederherstellen",
+    "delete-all": "Alles löschen",
+    "loading": "Laden, bitte warten."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -691,5 +691,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "¿Eliminar el carril de flujo?",
    "swimlane-delete-pop": "Todas las acciones serán eliminadas del historial de actividades y no se podrá recuperar el carril de flujo. Esta acción no puede deshacerse.",
    "restore-all": "Restaurar todas",
-    "delete-all": "Borrar todas"
+    "delete-all": "Borrar todas",
+    "loading": "Cargando. Por favor, espere."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Poista Swimlane ?",
    "swimlane-delete-pop": "Kaikki toimet poistetaan toimintasyötteestä ja swimlanen poistaminen on lopullista. Tätä ei pysty peruuttamaan.",
    "restore-all": "Palauta kaikki",
-    "delete-all": "Poista kaikki"
+    "delete-all": "Poista kaikki",
+    "loading": "Ladataan, odota hetki."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Supprimer le couloir ?",
    "swimlane-delete-pop": "Toutes les actions vont être supprimées du suivi d'activités et vous ne pourrez plus utiliser ce couloir. Cette action est irréversible.",
    "restore-all": "Tout supprimer",
-    "delete-all": "Tout restaurer"
+    "delete-all": "Tout restaurer",
+    "loading": "Chargement, merci de patienter."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -11,12 +11,12 @@
    "act-addChecklist": "נוספה רשימת מטלות __checklist__ לכרטיס __card__ ברשימה __list__ שבמסלול __swimlane__ בלוח __board__",
    "act-addChecklistItem": "נוסף פריט סימון __checklistItem__ לרשימת המטלות __checklist__ לכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
    "act-removeChecklist": "הוסרה רשימת מטלות __checklist__ מהכרטיס __card__ ברשימה __list__ שבמסלול __swimlane__ בלוח __board__",
-    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "פריט הסימון __checklistItem__ הוסר מרשימת המטלות __checkList__ בכרטיס __card__ ברשימה __list__ מהמסלול __swimlane__ בלוח __board__",
+    "act-checkedItem": "הפריט  __checklistItem__ ששייך לרשימת המשימות  __checklist__ בכרטיס __card__ שברשימת __list__ במסלול __swimlane__ שבלוח __board__ סומן",
+    "act-uncheckedItem": "בוטל הסימון __checklistItem__ ברשימת המטלות __checklist__ בכרטיס __card__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
+    "act-completeChecklist": "רשימת המטלות __checklist__ בכרטיס __card__ שברשימה __list__ תחת המסלול __swimlane__ בלוח __board__ הושלמה",
+    "act-uncompleteChecklist": "ההשלמה של רשימת המטלות __checklist__ בכרטיס __card__ שברשימה __list__ תחת המסלול __swimlane__ בלוח __board__ בוטלה",
+    "act-addComment": "התקבלה תגובה על הכרטיס __card__:‏ __comment__ ברשימה __list__ במסלול __swimlane__ בלוח __board__",
    "act-createBoard": "הלוח __board__ נוצר",
    "act-createSwimlane": "נוצר מסלול __swimlane__ בלוח __board__",
    "act-createCard": "הכרטיס __card__ נוצר ברשימה __list__ במסלול __swimlane__ שבלוח __board__",
@@ -60,14 +60,14 @@
    "activity-unchecked-item": "בוטל הסימון של %s ברשימת המשימות %s מתוך %s",
    "activity-checklist-added": "נוספה רשימת משימות אל %s",
    "activity-checklist-removed": "הוסרה רשימת משימות מ־%s",
-    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed": "רשימת המטלות __checklist__ בכרטיס __card__ שברשימה __list__ תחת המסלול __swimlane__ בלוח __board__ הושלמה",
    "activity-checklist-uncompleted": "רשימת המשימות %s מתוך %s סומנה כבלתי מושלמת",
    "activity-checklist-item-added": "נוסף פריט רשימת משימות אל ‚%s‘ תחת %s",
    "activity-checklist-item-removed": "הוסר פריט מרשימת המשימות ‚%s’ תחת %s",
    "add": "הוספה",
    "activity-checked-item-card": "סומן %s ברשימת המשימות %s",
    "activity-unchecked-item-card": "הסימון של %s בוטל ברשימת המשימות %s",
-    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-completed-card": "רשימת המטלות __checklist__ בכרטיס __card__ שברשימה __list__ תחת המסלול __swimlane__ בלוח __board__ הושלמה",
    "activity-checklist-uncompleted-card": "רשימת המשימות %s סומנה כבלתי מושלמת",
    "add-attachment": "הוספת קובץ מצורף",
    "add-board": "הוספת לוח",
@@ -685,8 +685,9 @@
    "default-authentication-method": "שיטת אימות כבררת מחדל",
    "duplicate-board": "שכפול לוח",
    "people-number": "מספר האנשים הוא:",
-    "swimlaneDeletePopup-title": "Delete Swimlane ?",
-    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
-    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "swimlaneDeletePopup-title": "למחוק מסלול?",
+    "swimlane-delete-pop": "כל הפעולות יוסרו מהזנת הפעילות ולא תהיה לך אפשרות לשחזר את המסלול. אי אפשר לחזור אחורה.",
+    "restore-all": "לשחזר הכול",
+    "delete-all": "למחוק הכול",
+    "loading": "העמוד בטעינה, אנא המתינו."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -1,6 +1,6 @@
 {
    "accept": "受け入れ",
-    "act-activity-notify": "Activity Notification",
+    "act-activity-notify": "アクティビティ通知",
    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
@@ -42,7 +42,7 @@
    "activities": "アクティビティ",
    "activity": "アクティビティ",
    "activity-added": "%s を %s に追加しました",
-    "activity-archived": "%s moved to Archive",
+    "activity-archived": "%sをアーカイブしました",
    "activity-attached": "%s を %s に添付しました",
    "activity-created": "%s を作成しました",
    "activity-customfield-created": "%s を作成しました",
@@ -55,7 +55,7 @@
    "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": "checked %s in checklist %s of %s",
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
    "activity-checklist-added": "%s にチェックリストを追加しました",
@@ -162,7 +162,7 @@
    "cards": "カード",
    "cards-count": "カード",
    "casSignIn": "Sign In with CAS",
-    "cardType-card": "Card",
+    "cardType-card": "カード",
    "cardType-linkedCard": "Linked Card",
    "cardType-linkedBoard": "Linked Board",
    "change": "変更",
@@ -175,7 +175,7 @@
    "changePasswordPopup-title": "パスワードの変更",
    "changePermissionsPopup-title": "パーミッションの変更",
    "changeSettingsPopup-title": "設定の変更",
-    "subtasks": "Subtasks",
+    "subtasks": "サブタスク",
    "checklists": "チェックリスト",
    "click-to-star": "ボードにスターをつける",
    "click-to-unstar": "ボードからスターを外す",
@@ -185,14 +185,14 @@
    "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-crimson": "crimson",
-    "color-darkgreen": "darkgreen",
-    "color-gold": "gold",
-    "color-gray": "gray",
+    "color-crimson": "濃赤",
+    "color-darkgreen": "濃緑",
+    "color-gold": "金",
+    "color-gray": "灰",
    "color-green": "緑",
-    "color-indigo": "indigo",
+    "color-indigo": "藍",
    "color-lime": "ライム",
-    "color-magenta": "magenta",
+    "color-magenta": "マゼンタ",
    "color-mistyrose": "mistyrose",
    "color-navy": "navy",
    "color-orange": "オレンジ",
@@ -203,12 +203,12 @@
    "color-purple": "紫",
    "color-red": "赤",
    "color-saddlebrown": "saddlebrown",
-    "color-silver": "silver",
+    "color-silver": "銀",
    "color-sky": "空",
    "color-slateblue": "slateblue",
-    "color-white": "white",
+    "color-white": "白",
    "color-yellow": "黄",
-    "unset-color": "Unset",
+    "unset-color": "設定しない",
    "comment": "コメント",
    "comment-placeholder": "コメントを書く",
    "comment-only": "コメントのみ",
@@ -216,15 +216,15 @@
    "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?",
+    "confirm-subtask-delete-dialog": "本当にサブタスクを削除してもよろしいでしょうか？",
+    "confirm-checklist-delete-dialog": "本当にチェックリストを削除してもよろしいでしょうか？",
    "copy-card-link-to-clipboard": "カードへのリンクをクリップボードにコピー",
    "linkCardPopup-title": "Link Card",
    "searchElementPopup-title": "検索",
    "copyCardPopup-title": "カードをコピー",
    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
    "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\"} ]",
+    "copyChecklistToManyCardsPopup-format": "[ {\"title\": \"1つ目のカードタイトル\", \"description\":\"1つ目のカードの説明\"}, {\"title\":\"2つ目のカードタイトル\",\"description\":\"2つ目のカードの説明\"},{\"title\":\"最後のカードタイトル\",\"description\":\"最後のカードの説明\"} ]",
    "create": "作成",
    "createBoardPopup-title": "ボードの作成",
    "chooseBoardSourcePopup-title": "ボードをインポート",
@@ -233,15 +233,15 @@
    "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": "Checkbox",
+    "custom-field-checkbox": "チェックボックス",
    "custom-field-date": "日付",
-    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown": "ドロップダウンリスト",
    "custom-field-dropdown-none": "(none)",
    "custom-field-dropdown-options": "List Options",
    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
    "custom-field-dropdown-unknown": "(unknown)",
    "custom-field-number": "Number",
-    "custom-field-text": "Text",
+    "custom-field-text": "テキスト",
    "custom-fields": "カスタムフィールド",
    "date": "日付",
    "decline": "拒否",
@@ -271,7 +271,7 @@
    "email-enrollAccount-subject": "__siteName__であなたのアカウントが作成されました",
    "email-enrollAccount-text": "こんにちは、__user__さん。\n\nサービスを開始するには、以下をクリックしてください。\n\n__url__\n\nよろしくお願いします。",
    "email-fail": "メールの送信に失敗しました",
-    "email-fail-text": "Error trying to send email",
+    "email-fail-text": "メールの送信中にエラーが発生しました",
    "email-invalid": "無効なメールアドレス",
    "email-invite": "メールで招待",
    "email-invite-subject": "__inviter__があなたを招待しています",
@@ -311,7 +311,7 @@
    "headerBarCreateBoardPopup-title": "ボードの作成",
    "home": "ホーム",
    "import": "インポート",
-    "link": "Link",
+    "link": "リンク",
    "import-board": "ボードをインポート",
    "import-board-c": "ボードをインポート",
    "import-board-title-trello": "Trelloからボードをインポート",
@@ -328,12 +328,12 @@
    "import-members-map": "Your imported board has some members. Please map the members you want to import to your users",
    "import-show-user-mapping": "メンバー紐付けの確認",
    "import-user-select": "Pick your existing user you want to use as this member",
-    "importMapMembersAddPopup-title": "Select member",
+    "importMapMembersAddPopup-title": "メンバーを選択",
    "info": "バージョン",
    "initials": "イニシャル",
    "invalid-date": "無効な日付",
-    "invalid-time": "Invalid time",
-    "invalid-user": "Invalid user",
+    "invalid-time": "無効な時間",
+    "invalid-user": "無効なユーザ",
    "joined": "参加しました",
    "just-invited": "このボードのメンバーに招待されています",
    "keyboard-shortcuts": "キーボード・ショートカット",
@@ -347,11 +347,11 @@
    "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 Archive",
+    "list-archive-cards": "リスト内の全カードをアーカイブする",
    "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.",
    "list-move-cards": "リストの全カードを移動する",
    "list-select-cards": "リストの全カードを選択",
-    "set-color-list": "Set Color",
+    "set-color-list": "色を選択",
    "listActionPopup-title": "操作一覧",
    "swimlaneActionPopup-title": "スイムレーン操作",
    "swimlaneAddPopup-title": "Add a Swimlane below",
@@ -658,35 +658,36 @@
    "r-d-check-one": "Check item",
    "r-d-uncheck-one": "Uncheck item",
    "r-d-check-of-list": "of checklist",
-    "r-d-add-checklist": "Add checklist",
-    "r-d-remove-checklist": "Remove checklist",
+    "r-d-add-checklist": "チェックリストを追加",
+    "r-d-remove-checklist": "チェックリストを削除",
    "r-by": "by",
-    "r-add-checklist": "Add checklist",
+    "r-add-checklist": "チェックリストを追加",
    "r-with-items": "with items",
-    "r-items-list": "item1,item2,item3",
-    "r-add-swimlane": "Add swimlane",
-    "r-swimlane-name": "swimlane name",
+    "r-items-list": "アイテム1、アイテム2、アイテム3",
+    "r-add-swimlane": "スイムレーンを追加",
+    "r-swimlane-name": "スイムレーン名",
    "r-board-note": "Note: leave a field empty to match every possible value.",
    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
-    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "r-when-a-card-is-moved": "カードが別のリストに移動したとき",
    "ldap": "LDAP",
    "oauth2": "OAuth2",
    "cas": "CAS",
-    "authentication-method": "Authentication method",
-    "authentication-type": "Authentication type",
+    "authentication-method": "認証方式",
+    "authentication-type": "認証タイプ",
    "custom-product-name": "Custom Product Name",
-    "layout": "Layout",
-    "hide-logo": "Hide Logo",
+    "layout": "レイアウト",
+    "hide-logo": "ロゴを隠す",
    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
    "error-undefined": "Something went wrong",
    "error-ldap-login": "An error occurred while trying to login",
    "display-authentication-method": "Display Authentication Method",
    "default-authentication-method": "Default Authentication Method",
-    "duplicate-board": "Duplicate Board",
+    "duplicate-board": "ボードの複製",
    "people-number": "The number of people is:",
-    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlaneDeletePopup-title": "スイムレーンを削除しますか？",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
-    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "restore-all": "全てをリストアする",
+    "delete-all": "全てを削除する",
+    "loading": "ローディング中です、しばらくお待ちください。"
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -31,8 +31,8 @@
    "act-importCard": "Zaimportowano kartę __card__ do listy __list__ na diagramie czynności __swimlane__ na tablicy __board__",
    "act-importList": "Zaimportowano listę __list__ na diagram czynności __swimlane__ do tablicy __board__",
    "act-joinMember": "Dodano użytkownika __member__ do karty __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
-    "act-moveCard": "przeniesiono kartę __card__ na tablicy __board__ z listy __oldList__ na diagramie czynności __oldSwimlane__ na listę __list__ na diagramie czynności __swimlane__",
-    "act-moveCardToOtherBoard": "Przeniesiono kartę __card__ z listy __oldList__ na diagramie czynności __oldSwimlane__ na tablicy __oldBoard__ do listy __listy__ na diagramie czynności __swimlane__ na tablicy __board__",
+    "act-moveCard": "przeniósł/a kartę __card__ na tablicy __board__ z listy __oldList__ na diagramie czynności __oldSwimlane__ na listę __list__ na diagramie czynności __swimlane__",
+    "act-moveCardToOtherBoard": "przeniósł/a kartę __card__ z listy __oldList__ na diagramie czynności __oldSwimlane__ na tablicy __oldBoard__ do listy __listy__ na diagramie czynności __swimlane__ na tablicy __board__",
    "act-removeBoardMember": "Usunięto użytkownika __member__ z tablicy __board__",
    "act-restoredCard": "Przywrócono kartę __card__ na listę __list__ na diagram czynności__ na tablicy __board__",
    "act-unjoinMember": "Usunięto użytkownika __member__ z karty __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__",
@@ -683,10 +683,11 @@
    "error-ldap-login": "Wystąpił błąd w trakcie logowania",
    "display-authentication-method": "Wyświetl metodę logowania",
    "default-authentication-method": "Domyślna metoda logowania",
-    "duplicate-board": "Duplicate Board",
-    "people-number": "The number of people is:",
-    "swimlaneDeletePopup-title": "Delete Swimlane ?",
-    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
-    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "duplicate-board": "Duplikuj tablicę",
+    "people-number": "Liczba użytkowników to:",
+    "swimlaneDeletePopup-title": "Usunąć diagram czynności?",
+    "swimlane-delete-pop": "Wszystkie akcje będą usunięte z widoku aktywności, nie można będzie przywrócić diagramu czynności.  Usunięcie jest nieodwracalne.",
+    "restore-all": "Przywróć wszystkie",
+    "delete-all": "Usuń wszystkie",
+    "loading": "Ładowanie, proszę czekać."
 }
@@ -685,8 +685,9 @@
    "default-authentication-method": "Método de Autenticação Padrão",
    "duplicate-board": "Duplicar Quadro",
    "people-number": "O número de pessoas é:",
-    "swimlaneDeletePopup-title": "Delete Swimlane ?",
-    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
-    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "swimlaneDeletePopup-title": "Excluir Raia?",
+    "swimlane-delete-pop": "Todas as ações serão excluídas da lista de atividades e você não poderá recuperar a raia. Não há como desfazer.",
+    "restore-all": "Restaurar tudo",
+    "delete-all": "Excluir tudo",
+    "loading": "Carregando, aguarde por favor."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -4,7 +4,7 @@
    "act-addAttachment": "прикрепил вложение __attachment__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
    "act-deleteAttachment": "удалил вложение __attachment__ из карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
    "act-addSubtask": "добавил подзадачу __subtask__ для карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
-    "act-addLabel": "Добавлена метка __label__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
+    "act-addLabel": "добавил метку __label__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
    "act-addedLabel": "Добавлена метка __label__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
    "act-removeLabel": "Снята метка __label__ с карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
    "act-removedLabel": "Снята метка __label__ с карточки __card__ в списке __list__ на дорожке __swimlane__ доски __board__",
@@ -137,7 +137,7 @@
    "board-archived": "Эта доска перемещена в архив.",
    "card-comments-title": "Комментарии (%s)",
    "card-delete-notice": "Это действие невозможно будет отменить. Все изменения, которые вы вносили в карточку будут потеряны.",
-    "card-delete-pop": "Все действия будут удалены из ленты активности участников и вы не сможете заново открыть карточку. Действие необратимо",
+    "card-delete-pop": "Все действия будут удалены из ленты активности участников, и вы не сможете заново открыть карточку. Действие необратимо",
    "card-delete-suggest-archive": "Вы можете переместить карточку в архив, чтобы убрать ее с доски, сохранив всю историю действий участников.",
    "card-due": "Выполнить к",
    "card-due-on": "Выполнить до",
@@ -148,7 +148,7 @@
    "card-edit-members": "Изменить участников",
    "card-labels-title": "Изменить метки для этой карточки.",
    "card-members-title": "Добавить или удалить с карточки участников доски.",
-    "card-start": "Дата начала",
+    "card-start": "В работе с",
    "card-start-on": "Начнётся с",
    "cardAttachmentsPopup-title": "Прикрепить из",
    "cardCustomField-datePopup-title": "Изменить дату",
@@ -358,7 +358,7 @@
    "listImportCardPopup-title": "Импортировать Trello карточку",
    "listMorePopup-title": "Поделиться",
    "link-list": "Ссылка на список",
-    "list-delete-pop": "Все действия будут удалены из ленты активности участников и вы не сможете восстановить список. Данное действие необратимо.",
+    "list-delete-pop": "Все действия будут удалены из ленты активности участников, и вы не сможете восстановить список. Данное действие необратимо.",
    "list-delete-suggest-archive": "Вы можете отправить список в Архив, чтобы убрать его с доски и при этом сохранить результаты.",
    "lists": "Списки",
    "swimlanes": "Дорожки",
@@ -534,7 +534,7 @@
    "active": "Действующий",
    "card-received": "Получено",
    "card-received-on": "Получено с",
-    "card-end": "Дата окончания",
+    "card-end": "Завершено",
    "card-end-on": "Завершится до",
    "editCardReceivedDatePopup-title": "Изменить дату получения",
    "editCardEndDatePopup-title": "Изменить дату завершения",
@@ -685,8 +685,9 @@
    "default-authentication-method": "Способ авторизации по умолчанию",
    "duplicate-board": "Клонировать доску",
    "people-number": "Количество человек:",
-    "swimlaneDeletePopup-title": "Delete Swimlane ?",
-    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
-    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "swimlaneDeletePopup-title": "Удалить дорожку?",
+    "swimlane-delete-pop": "Все действия будут удалены из ленты активности участников, и вы не сможете восстановить дорожку. Данное действие необратимо.",
+    "restore-all": "Восстановить все",
+    "delete-all": "Удалить все",
+    "loading": "Идет загрузка, пожалуйста подождите"
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -684,9 +684,10 @@
    "display-authentication-method": "Visa autentiseringsmetod",
    "default-authentication-method": "Standard autentiseringsmetod",
    "duplicate-board": "Dubbletttavla",
-    "people-number": "The number of people is:",
+    "people-number": "Antalet personer är:",
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
-    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "restore-all": "Återställ alla",
+    "delete-all": "Ta bort alla",
+    "loading": "Läser in, var god vänta."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -59,7 +59,7 @@
    "activity-checked-item": "checked %s in checklist %s of %s",
    "activity-unchecked-item": "unchecked %s in checklist %s of %s",
    "activity-checklist-added": "%s içine yapılacak listesi ekledi",
-    "activity-checklist-removed": "removed a checklist from %s",
+    "activity-checklist-removed": "%s Tarafından yapılacaklar listesi silinmiştir",
    "activity-checklist-completed": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
    "activity-checklist-item-added": "%s içinde %s yapılacak listesine öğe ekledi",
@@ -685,8 +685,9 @@
    "default-authentication-method": "Default Authentication Method",
    "duplicate-board": "Duplicate Board",
    "people-number": "The number of people is:",
-    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlaneDeletePopup-title": "Kulvar silinsin mi?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Hepsini sil",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -24,14 +24,14 @@
    "act-createList": "添加列表 __list__ 至看板 __board__",
    "act-addBoardMember": "添加成员 __member__ 到看板 __board__",
    "act-archivedBoard": "看板 __board__ 已被移入归档",
-    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedCard": "将看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 中的卡片 移动到归档中",
    "act-archivedList": "看板 __board__ 中的泳道 __swimlane__ 中的列表 __list__ 已被移入归档",
    "act-archivedSwimlane": "看板 __board__ 中的泳道 __swimlane__ 已被移入归档",
    "act-importBoard": "导入看板 __board__",
-    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
-    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
-    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
-    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-importCard": "已将卡片 __card__ 导入到 __board__ 看板中的 __swimlane__ 泳道中的 __list__ 列表中",
+    "act-importList": "已将列表导入到 __board__ 看板中的 __swimlane__  泳道中的 __list__  列表中",
+    "act-joinMember": "已将成员 __member__  添加到 __board__ 看板中的 __swimlane__ 泳道中的 __list__  列表中的 __card__ 卡片中",
+    "act-moveCard": "移动卡片 __card__ 到看板 __board__ 从列表 __oldList__ 泳道 __oldSwimlane__ 至列表 __list__ 泳道 __swimlane__",
    "act-moveCardToOtherBoard": "移动卡片 __card__ 从列表  __oldList__ 泳道 __oldSwimlane__ 看板  __oldBoard__ 至列表 __list__ 泳道 __swimlane__ 看板 __board__",
    "act-removeBoardMember": "从看板 __board__ 移除成员 __member__ ",
    "act-restoredCard": "恢复卡片 __card__ 至列表 __list__ 泳道 __swimlane__  看板 __board__",
@@ -685,8 +685,9 @@
    "default-authentication-method": "缺省认证方式",
    "duplicate-board": "复制看板",
    "people-number": "人数是：",
-    "swimlaneDeletePopup-title": "Delete Swimlane ?",
-    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
-    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "swimlaneDeletePopup-title": "是否删除泳道？",
+    "swimlane-delete-pop": "所有活动将从活动源中删除，您将无法恢复泳道。此操作无法撤销。",
+    "restore-all": "全部恢复",
+    "delete-all": "全部删除",
+    "loading": "加载中，请稍等。"
 }
@@ -0,0 +1,693 @@
+{
+    "accept": "Accept",
+    "act-activity-notify": "Activity Notification",
+    "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addedLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removedLabel": "Removed label __label__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklist": "added checklist __checklist__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addChecklistItem": "added checklist item __checklistItem__ to checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklist": "removed checklist __checklist__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeChecklistItem": "removed checklist item __checklistItem__ from checklist __checkList__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-checkedItem": "checked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncheckedItem": "unchecked __checklistItem__ of checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-completeChecklist": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-uncompleteChecklist": "uncompleted checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-addComment": "commented on card __card__: __comment__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createBoard": "created board __board__",
+    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createCard": "created card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createCustomField": "created custom field __customField__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-createList": "added list __list__ to board __board__",
+    "act-addBoardMember": "added member __member__ to board __board__",
+    "act-archivedBoard": "Board __board__ moved to Archive",
+    "act-archivedCard": "Card __card__ at list __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedList": "List __list__ at swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-archivedSwimlane": "Swimlane __swimlane__ at board __board__ moved to Archive",
+    "act-importBoard": "imported board __board__",
+    "act-importCard": "imported card  __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-importList": "imported list __list__ to swimlane __swimlane__ at board __board__",
+    "act-joinMember": "added member __member__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCardToOtherBoard": "moved card __card__ from list __oldList__ at swimlane __oldSwimlane__ at board __oldBoard__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-removeBoardMember": "removed member __member__ from board __board__",
+    "act-restoredCard": "restored card __card__ to list __list__ at swimlane __swimlane__ at board __board__",
+    "act-unjoinMember": "removed member __member__ from card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "act-withBoardTitle": "__board__",
+    "act-withCardTitle": "[__board__] __card__",
+    "actions": "Actions",
+    "activities": "Activities",
+    "activity": "Activity",
+    "activity-added": "added %s to %s",
+    "activity-archived": "%s moved to Archive",
+    "activity-attached": "attached %s to %s",
+    "activity-created": "created %s",
+    "activity-customfield-created": "created custom field %s",
+    "activity-excluded": "excluded %s from %s",
+    "activity-imported": "imported %s into %s from %s",
+    "activity-imported-board": "imported %s from %s",
+    "activity-joined": "joined %s",
+    "activity-moved": "moved %s from %s to %s",
+    "activity-on": "on %s",
+    "activity-removed": "removed %s from %s",
+    "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 checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted": "uncompleted the checklist %s of %s",
+    "activity-checklist-item-added": "added checklist item to '%s' in %s",
+    "activity-checklist-item-removed": "removed a checklist item from '%s' in %s",
+    "add": "Add",
+    "activity-checked-item-card": "checked %s in checklist %s",
+    "activity-unchecked-item-card": "unchecked %s in checklist %s",
+    "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+    "activity-checklist-uncompleted-card": "uncompleted the checklist %s",
+    "add-attachment": "Add Attachment",
+    "add-board": "Add Board",
+    "add-card": "Add Card",
+    "add-swimlane": "Add Swimlane",
+    "add-subtask": "Add Subtask",
+    "add-checklist": "Add Checklist",
+    "add-checklist-item": "Add an item to checklist",
+    "add-cover": "Add Cover",
+    "add-label": "Add Label",
+    "add-list": "Add List",
+    "add-members": "Add Members",
+    "added": "Added",
+    "addMemberPopup-title": "Members",
+    "admin": "Admin",
+    "admin-desc": "Can view and edit cards, remove members, and change settings for the board.",
+    "admin-announcement": "Announcement",
+    "admin-announcement-active": "Active System-Wide Announcement",
+    "admin-announcement-title": "Announcement from Administrator",
+    "all-boards": "All boards",
+    "and-n-other-card": "And __count__ other card",
+    "and-n-other-card_plural": "And __count__ other cards",
+    "apply": "Apply",
+    "app-is-offline": "Loading, please wait. Refreshing the page will cause data loss. If loading does not work, please check that server has not stopped.",
+    "archive": "Move to Archive",
+    "archive-all": "Move All to Archive",
+    "archive-board": "Move Board to Archive",
+    "archive-card": "Move Card to Archive",
+    "archive-list": "Move List to Archive",
+    "archive-swimlane": "Move Swimlane to Archive",
+    "archive-selection": "Move selection to Archive",
+    "archiveBoardPopup-title": "Move Board to Archive?",
+    "archived-items": "Archive",
+    "archived-boards": "Boards in Archive",
+    "restore-board": "Restore Board",
+    "no-archived-boards": "No Boards in Archive.",
+    "archives": "Archive",
+    "template": "Template",
+    "templates": "Templates",
+    "assign-member": "Assign member",
+    "attached": "attached",
+    "attachment": "Attachment",
+    "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.",
+    "attachmentDeletePopup-title": "Delete Attachment?",
+    "attachments": "Attachments",
+    "auto-watch": "Automatically watch boards when they are created",
+    "avatar-too-big": "The avatar is too large (70KB max)",
+    "back": "Back",
+    "board-change-color": "Change color",
+    "board-nb-stars": "%s stars",
+    "board-not-found": "Board not found",
+    "board-private-info": "This board will be <strong>private</strong>.",
+    "board-public-info": "This board will be <strong>public</strong>.",
+    "boardChangeColorPopup-title": "Change Board Background",
+    "boardChangeTitlePopup-title": "Rename Board",
+    "boardChangeVisibilityPopup-title": "Change Visibility",
+    "boardChangeWatchPopup-title": "Change Watch",
+    "boardMenuPopup-title": "Board Settings",
+    "boards": "Boards",
+    "board-view": "Board View",
+    "board-view-cal": "Calendar",
+    "board-view-swimlanes": "Swimlanes",
+    "board-view-lists": "Lists",
+    "bucket-example": "Like “Bucket List” for example",
+    "cancel": "Cancel",
+    "card-archived": "This card is moved to Archive.",
+    "board-archived": "This board is moved to Archive.",
+    "card-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 Archive to remove it from the board and preserve the activity.",
+    "card-due": "Due",
+    "card-due-on": "Due on",
+    "card-spent": "Spent Time",
+    "card-edit-attachments": "Edit attachments",
+    "card-edit-custom-fields": "Edit custom fields",
+    "card-edit-labels": "Edit labels",
+    "card-edit-members": "Edit members",
+    "card-labels-title": "Change the labels for the card.",
+    "card-members-title": "Add or remove members of the board from the card.",
+    "card-start": "Start",
+    "card-start-on": "Starts on",
+    "cardAttachmentsPopup-title": "Attach From",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
+    "cardDeletePopup-title": "Delete Card?",
+    "cardDetailsActionsPopup-title": "Card Actions",
+    "cardLabelsPopup-title": "Labels",
+    "cardMembersPopup-title": "Members",
+    "cardMorePopup-title": "More",
+    "cardTemplatePopup-title": "Create template",
+    "cards": "Cards",
+    "cards-count": "Cards",
+    "casSignIn": "Sign In with CAS",
+    "cardType-card": "Card",
+    "cardType-linkedCard": "Linked Card",
+    "cardType-linkedBoard": "Linked Board",
+    "change": "Change",
+    "change-avatar": "Change Avatar",
+    "change-password": "Change Password",
+    "change-permissions": "Change permissions",
+    "change-settings": "Change Settings",
+    "changeAvatarPopup-title": "Change Avatar",
+    "changeLanguagePopup-title": "Change Language",
+    "changePasswordPopup-title": "Change Password",
+    "changePermissionsPopup-title": "Change Permissions",
+    "changeSettingsPopup-title": "Change Settings",
+    "subtasks": "Subtasks",
+    "checklists": "Checklists",
+    "click-to-star": "Click to star this board.",
+    "click-to-unstar": "Click to unstar this board.",
+    "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 “Archive” button from the home header.",
+    "color-black": "black",
+    "color-blue": "blue",
+    "color-crimson": "crimson",
+    "color-darkgreen": "darkgreen",
+    "color-gold": "gold",
+    "color-gray": "gray",
+    "color-green": "green",
+    "color-indigo": "indigo",
+    "color-lime": "lime",
+    "color-magenta": "magenta",
+    "color-mistyrose": "mistyrose",
+    "color-navy": "navy",
+    "color-orange": "orange",
+    "color-paleturquoise": "paleturquoise",
+    "color-peachpuff": "peachpuff",
+    "color-pink": "pink",
+    "color-plum": "plum",
+    "color-purple": "purple",
+    "color-red": "red",
+    "color-saddlebrown": "saddlebrown",
+    "color-silver": "silver",
+    "color-sky": "sky",
+    "color-slateblue": "slateblue",
+    "color-white": "white",
+    "color-yellow": "yellow",
+    "unset-color": "Unset",
+    "comment": "Comment",
+    "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",
+    "searchElementPopup-title": "Search",
+    "copyCardPopup-title": "Copy Card",
+    "copyChecklistToManyCardsPopup-title": "Copy Checklist Template to Many Cards",
+    "copyChecklistToManyCardsPopup-instructions": "Destination Card Titles and Descriptions in this JSON format",
+    "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",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Date",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
+    "date": "Date",
+    "decline": "Decline",
+    "default-avatar": "Default avatar",
+    "delete": "Delete",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
+    "deleteLabelPopup-title": "Delete Label?",
+    "description": "Description",
+    "disambiguateMultiLabelPopup-title": "Disambiguate Label Action",
+    "disambiguateMultiMemberPopup-title": "Disambiguate Member Action",
+    "discard": "Discard",
+    "done": "Done",
+    "download": "Download",
+    "edit": "Edit",
+    "edit-avatar": "Change Avatar",
+    "edit-profile": "Edit Profile",
+    "edit-wip-limit": "Edit WIP Limit",
+    "soft-wip-limit": "Soft WIP Limit",
+    "editCardStartDatePopup-title": "Change start date",
+    "editCardDueDatePopup-title": "Change due date",
+    "editCustomFieldPopup-title": "Edit Field",
+    "editCardSpentTimePopup-title": "Change spent time",
+    "editLabelPopup-title": "Change Label",
+    "editNotificationPopup-title": "Edit Notification",
+    "editProfilePopup-title": "Edit Profile",
+    "email": "Email",
+    "email-enrollAccount-subject": "An account created for you on __siteName__",
+    "email-enrollAccount-text": "Hello __user__,\n\nTo start using the service, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-fail": "Sending email failed",
+    "email-fail-text": "Error trying to send email",
+    "email-invalid": "Invalid email",
+    "email-invite": "Invite via Email",
+    "email-invite-subject": "__inviter__ sent you an invitation",
+    "email-invite-text": "Dear __user__,\n\n__inviter__ invites you to join board \"__board__\" for collaborations.\n\nPlease follow the link below:\n\n__url__\n\nThanks.",
+    "email-resetPassword-subject": "Reset your password on __siteName__",
+    "email-resetPassword-text": "Hello __user__,\n\nTo reset your password, simply click the link below.\n\n__url__\n\nThanks.",
+    "email-sent": "Email sent",
+    "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": "Enable WIP Limit",
+    "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-email-taken": "Email has already been taken",
+    "export-board": "Export board",
+    "filter": "Filter",
+    "filter-cards": "Filter Cards",
+    "filter-clear": "Clear filter",
+    "filter-no-label": "No label",
+    "filter-no-member": "No member",
+    "filter-no-custom-fields": "No Custom Fields",
+    "filter-on": "Filter is on",
+    "filter-on-desc": "You are filtering cards on this board. Click here to edit filter.",
+    "filter-to-selection": "Filter to selection",
+    "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": "Full Name",
+    "header-logo-title": "Go back to your boards page.",
+    "hide-system-messages": "Hide system messages",
+    "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 previous export",
+    "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.",
+    "import-sandstorm-warning": "Imported board will delete all existing data on board and replace it with imported board.",
+    "from-trello": "From Trello",
+    "from-wekan": "From previous export",
+    "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 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 your users",
+    "import-show-user-mapping": "Review members mapping",
+    "import-user-select": "Pick your existing user you want to use as this member",
+    "importMapMembersAddPopup-title": "Select member",
+    "info": "Version",
+    "initials": "Initials",
+    "invalid-date": "Invalid date",
+    "invalid-time": "Invalid time",
+    "invalid-user": "Invalid user",
+    "joined": "joined",
+    "just-invited": "You are just invited to this board",
+    "keyboard-shortcuts": "Keyboard shortcuts",
+    "label-create": "Create Label",
+    "label-default": "%s label (default)",
+    "label-delete-pop": "There is no undo. This will remove this label from all cards and destroy its history.",
+    "labels": "Labels",
+    "language": "Language",
+    "last-admin-desc": "You can’t change roles because there must be at least one admin.",
+    "leave-board": "Leave Board",
+    "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 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",
+    "set-color-list": "Set Color",
+    "listActionPopup-title": "List Actions",
+    "swimlaneActionPopup-title": "Swimlane Actions",
+    "swimlaneAddPopup-title": "Add a Swimlane below",
+    "listImportCardPopup-title": "Import a Trello card",
+    "listMorePopup-title": "More",
+    "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 Archive to remove it from the board and preserve the activity.",
+    "lists": "Lists",
+    "swimlanes": "Swimlanes",
+    "log-out": "Log Out",
+    "log-in": "登入",
+    "loginPopup-title": "登入",
+    "memberMenuPopup-title": "Member Settings",
+    "members": "Members",
+    "menu": "Menu",
+    "move-selection": "Move selection",
+    "moveCardPopup-title": "Move Card",
+    "moveCardToBottom-title": "Move to Bottom",
+    "moveCardToTop-title": "Move to Top",
+    "moveSelectionPopup-title": "Move selection",
+    "multi-selection": "Multi-Selection",
+    "multi-selection-on": "Multi-Selection is on",
+    "muted": "Muted",
+    "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 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.",
+    "not-accepted-yet": "Invitation not accepted yet",
+    "notify-participate": "Receive updates to any cards you participate as creater or member",
+    "notify-watch": "Receive updates to any boards, lists, or cards you’re watching",
+    "optional": "optional",
+    "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": "Password",
+    "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)",
+    "participating": "Participating",
+    "preview": "Preview",
+    "previewAttachedImagePopup-title": "Preview",
+    "previewClipboardImagePopup-title": "Preview",
+    "private": "Private",
+    "private-desc": "This board is private. Only people added to the board can view and edit it.",
+    "profile": "Profile",
+    "public": "Public",
+    "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
+    "quick-access-description": "Star a board to add a shortcut in this bar.",
+    "remove-cover": "Remove Cover",
+    "remove-from-board": "Remove from Board",
+    "remove-label": "Remove Label",
+    "listDeletePopup-title": "Delete List ?",
+    "remove-member": "Remove Member",
+    "remove-member-from-card": "Remove from Card",
+    "remove-member-pop": "Remove __name__ (__username__) from __boardTitle__? The member will be removed from all cards on this board. They will receive a notification.",
+    "removeMemberPopup-title": "Remove Member?",
+    "rename": "Rename",
+    "rename-board": "Rename Board",
+    "restore": "Restore",
+    "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",
+    "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list",
+    "setWipLimitPopup-title": "Set WIP Limit",
+    "shortcut-assign-self": "Assign yourself to current card",
+    "shortcut-autocomplete-emoji": "Autocomplete emoji",
+    "shortcut-autocomplete-members": "Autocomplete members",
+    "shortcut-clear-filters": "Clear all filters",
+    "shortcut-close-dialog": "Close Dialog",
+    "shortcut-filter-my-cards": "Filter my cards",
+    "shortcut-show-shortcuts": "Bring up this shortcuts list",
+    "shortcut-toggle-filterbar": "Toggle Filter Sidebar",
+    "shortcut-toggle-sidebar": "Toggle Board Sidebar",
+    "show-cards-minimum-count": "Show cards count if list contains more than",
+    "sidebar-open": "Open Sidebar",
+    "sidebar-close": "Close Sidebar",
+    "signupPopup-title": "Create an Account",
+    "star-board-title": "Click to star this board. It will show up at top of your boards list.",
+    "starred-boards": "Starred Boards",
+    "starred-boards-description": "Starred boards show up at the top of your boards list.",
+    "subscribe": "Subscribe",
+    "team": "Team",
+    "this-board": "this board",
+    "this-card": "this card",
+    "spent-time-hours": "Spent time (hours)",
+    "overtime-hours": "Overtime (hours)",
+    "overtime": "Overtime",
+    "has-overtime-cards": "Has overtime cards",
+    "has-spenttime-cards": "Has spent time cards",
+    "time": "Time",
+    "title": "Title",
+    "tracking": "Tracking",
+    "tracking-info": "You will be notified of any changes to those cards you are involved as creator or member.",
+    "type": "Type",
+    "unassign-member": "Unassign member",
+    "unsaved-description": "You have an unsaved description.",
+    "unwatch": "Unwatch",
+    "upload": "Upload",
+    "upload-avatar": "Upload an avatar",
+    "uploaded-avatar": "Uploaded an avatar",
+    "username": "Username",
+    "view-it": "View it",
+    "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",
+    "welcome-board": "Welcome Board",
+    "welcome-swimlane": "Milestone 1",
+    "welcome-list1": "Basics",
+    "welcome-list2": "Advanced",
+    "card-templates-swimlane": "Card Templates",
+    "list-templates-swimlane": "List Templates",
+    "board-templates-swimlane": "Board Templates",
+    "what-to-do": "What do you want to do?",
+    "wipLimitErrorPopup-title": "Invalid WIP Limit",
+    "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
+    "wipLimitErrorPopup-dialog-pt2": "Please move some tasks out of this list, or set a higher WIP limit.",
+    "admin-panel": "Admin Panel",
+    "settings": "Settings",
+    "people": "People",
+    "registration": "Registration",
+    "disable-self-registration": "Disable Self-Registration",
+    "invite": "Invite",
+    "invite-people": "Invite People",
+    "to-boards": "To board(s)",
+    "email-addresses": "Email Addresses",
+    "smtp-host-description": "The address of the SMTP server that handles your emails.",
+    "smtp-port-description": "The port your SMTP server uses for outgoing emails.",
+    "smtp-tls-description": "Enable TLS support for SMTP server",
+    "smtp-host": "SMTP Host",
+    "smtp-port": "SMTP Port",
+    "smtp-username": "Username",
+    "smtp-password": "Password",
+    "smtp-tls": "TLS support",
+    "send-from": "From",
+    "send-smtp-test": "Send a test email to yourself",
+    "invitation-code": "Invitation Code",
+    "email-invite-register-subject": "__inviter__ sent you an invitation",
+    "email-invite-register-text": "Dear __user__,\n\n__inviter__ invites you to kanban board for collaborations.\n\nPlease follow the link below:\n__url__\n\nAnd your invitation code is: __icode__\n\nThanks.",
+    "email-smtp-test-subject": "SMTP Test Email",
+    "email-smtp-test-text": "You have successfully sent an email",
+    "error-invitation-code-not-exist": "Invitation code doesn't exist",
+    "error-notAuthorized": "You are not authorized to view this page.",
+    "outgoing-webhooks": "Outgoing Webhooks",
+    "outgoingWebhooksPopup-title": "Outgoing Webhooks",
+    "boardCardTitlePopup-title": "Card Title Filter",
+    "new-outgoing-webhook": "New Outgoing Webhook",
+    "no-name": "(Unknown)",
+    "Node_version": "Node version",
+    "OS_Arch": "OS Arch",
+    "OS_Cpus": "OS CPU Count",
+    "OS_Freemem": "OS Free Memory",
+    "OS_Loadavg": "OS Load Average",
+    "OS_Platform": "OS Platform",
+    "OS_Release": "OS Release",
+    "OS_Totalmem": "OS Total Memory",
+    "OS_Type": "OS Type",
+    "OS_Uptime": "OS Uptime",
+    "days": "days",
+    "hours": "hours",
+    "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",
+    "accounts-allowEmailChange": "Allow Email Change",
+    "accounts-allowUserNameChange": "Allow Username Change",
+    "createdAt": "Created at",
+    "verified": "Verified",
+    "active": "Active",
+    "card-received": "Received",
+    "card-received-on": "Received on",
+    "card-end": "End",
+    "card-end-on": "Ends on",
+    "editCardReceivedDatePopup-title": "Change received date",
+    "editCardEndDatePopup-title": "Change end date",
+    "setCardColorPopup-title": "Set color",
+    "setCardActionsColorPopup-title": "Choose a color",
+    "setSwimlaneColorPopup-title": "Choose a color",
+    "setListColorPopup-title": "Choose a color",
+    "assigned-by": "Assigned By",
+    "requested-by": "Requested By",
+    "board-delete-notice": "Deleting is permanent. You will lose all lists, cards and actions associated with this board.",
+    "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",
+    "queue": "Queue",
+    "subtask-settings": "Subtasks Settings",
+    "boardSubtaskSettingsPopup-title": "Board Subtasks Settings",
+    "show-subtasks-field": "Cards can have subtasks",
+    "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:",
+    "prefix-with-full-path": "Prefix with full path",
+    "prefix-with-parent": "Prefix with parent",
+    "subtext-with-full-path": "Subtext with full path",
+    "subtext-with-parent": "Subtext with parent",
+    "change-card-parent": "Change card's parent",
+    "parent-card": "Parent card",
+    "source-board": "Source board",
+    "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",
+    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
+    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "r-rule": "Rule",
+    "r-add-trigger": "Add trigger",
+    "r-add-action": "Add action",
+    "r-board-rules": "Board rules",
+    "r-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": "When a card",
+    "r-is": "is",
+    "r-is-moved": "is moved",
+    "r-added-to": "added to",
+    "r-removed-from": "Removed from",
+    "r-the-board": "the board",
+    "r-list": "list",
+    "set-filter": "Set Filter",
+    "r-moved-to": "Moved to",
+    "r-moved-from": "Moved from",
+    "r-archived": "Moved to Archive",
+    "r-unarchived": "Restored from Archive",
+    "r-a-card": "a card",
+    "r-when-a-label-is": "When a label is",
+    "r-when-the-label-is": "When the label is",
+    "r-list-name": "list name",
+    "r-when-a-member": "When a member is",
+    "r-when-the-member": "When the member",
+    "r-name": "name",
+    "r-when-a-attach": "When an attachment",
+    "r-when-a-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": "Add",
+    "r-remove": "Remove",
+    "r-label": "label",
+    "r-member": "member",
+    "r-remove-all": "Remove all members from the card",
+    "r-set-color": "Set color to",
+    "r-checklist": "checklist",
+    "r-check-all": "Check all",
+    "r-uncheck-all": "Uncheck all",
+    "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-create-card": "Create new card",
+    "r-in-list": "in list",
+    "r-in-swimlane": "in swimlane",
+    "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-by": "by",
+    "r-add-checklist": "Add checklist",
+    "r-with-items": "with items",
+    "r-items-list": "item1,item2,item3",
+    "r-add-swimlane": "Add swimlane",
+    "r-swimlane-name": "swimlane name",
+    "r-board-note": "Note: leave a field empty to match every possible value.",
+    "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
+    "r-when-a-card-is-moved": "When a card is moved to another list",
+    "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",
+    "add-custom-html-after-body-start": "Add Custom HTML after <body> start",
+    "add-custom-html-before-body-end": "Add Custom HTML before </body> end",
+    "error-undefined": "Something went wrong",
+    "error-ldap-login": "An error occurred while trying to login",
+    "display-authentication-method": "Display Authentication Method",
+    "default-authentication-method": "Default Authentication Method",
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is:",
+    "swimlaneDeletePopup-title": "Delete Swimlane ?",
+    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
+    "restore-all": "Restore all",
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
+}
@@ -688,5 +688,6 @@
    "swimlaneDeletePopup-title": "Delete Swimlane ?",
    "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
    "restore-all": "Restore all",
-    "delete-all": "Delete all"
+    "delete-all": "Delete all",
+    "loading": "Loading, please wait."
 }
@@ -867,6 +867,22 @@ if (Meteor.isServer) {
      } else throw new Meteor.Error('error-board-doesNotExist');
    },
  });
+
+  Meteor.methods({
+    archiveBoard(boardId) {
+      check(boardId, String);
+      const board = Boards.findOne(boardId);
+      if (board) {
+        const userId = Meteor.userId();
+        const index = board.memberIndex(userId);
+        if (index >= 0) {
+          board.archive();
+          return true;
+        } else throw new Meteor.Error('error-board-notAMember');
+      } else throw new Meteor.Error('error-board-doesNotExist');
+    },
+  });
+
 }

 if (Meteor.isServer) {
@@ -172,7 +172,7 @@ export class Exporter {
    };
    result.users = Users.find(byUserIds, userFields).fetch().map((user) => {
      // user avatar is stored as a relative url, we export absolute
-      if (user.profile.avatarUrl) {
+      if ((user.profile || {}).avatarUrl) {
        user.profile.avatarUrl = FlowRouter.url(user.profile.avatarUrl);
      }
      return user;
@@ -168,17 +168,17 @@ Swimlanes.helpers({

  isListTemplatesSwimlane() {
    const user = Users.findOne(Meteor.userId());
-    return user.profile.listTemplatesSwimlaneId === this._id;
+    return (user.profile || {}).listTemplatesSwimlaneId === this._id;
  },

  isCardTemplatesSwimlane() {
    const user = Users.findOne(Meteor.userId());
-    return user.profile.cardTemplatesSwimlaneId === this._id;
+    return (user.profile || {}).cardTemplatesSwimlaneId === this._id;
  },

  isBoardTemplatesSwimlane() {
    const user = Users.findOne(Meteor.userId());
-    return user.profile.boardTemplatesSwimlaneId === this._id;
+    return (user.profile || {}).boardTemplatesSwimlaneId === this._id;
  },

  remove() {
@@ -238,6 +238,19 @@ Users.allow({
    const user = Users.findOne(userId);
    return user && Meteor.user().isAdmin;
  },
+  remove(userId, doc) {
+    const adminsNumber = Users.find({ isAdmin: true }).count();
+    const { isAdmin } = Users.findOne({ _id: userId }, { fields: { 'isAdmin': 1 } });
+
+    // Prevents remove of the only one administrator
+    if (adminsNumber === 1 && isAdmin && userId === doc._id) {
+      return false;
+    }
+
+    // If it's the user or an admin
+    return userId === doc._id || isAdmin;
+  },
+  fetch: [],
 });

 // Search a user in the complete server database by its name or username. This
@@ -288,32 +301,32 @@ Users.helpers({
  },

  starredBoards() {
-    const {starredBoards = []} = this.profile;
+    const {starredBoards = []} = this.profile || {};
    return Boards.find({archived: false, _id: {$in: starredBoards}});
  },

  hasStarred(boardId) {
-    const {starredBoards = []} = this.profile;
+    const {starredBoards = []} = this.profile || {};
    return _.contains(starredBoards, boardId);
  },

  invitedBoards() {
-    const {invitedBoards = []} = this.profile;
+    const {invitedBoards = []} = this.profile || {};
    return Boards.find({archived: false, _id: {$in: invitedBoards}});
  },

  isInvitedTo(boardId) {
-    const {invitedBoards = []} = this.profile;
+    const {invitedBoards = []} = this.profile || {};
    return _.contains(invitedBoards, boardId);
  },

  hasTag(tag) {
-    const {tags = []} = this.profile;
+    const {tags = []} = this.profile || {};
    return _.contains(tags, tag);
  },

  hasNotification(activityId) {
-    const {notifications = []} = this.profile;
+    const {notifications = []} = this.profile || {};
    return _.contains(notifications, activityId);
  },

@@ -323,7 +336,7 @@ Users.helpers({
  },

  getEmailBuffer() {
-    const {emailBuffer = []} = this.profile;
+    const {emailBuffer = []} = this.profile || {};
    return emailBuffer;
  },

@@ -358,11 +371,15 @@ Users.helpers({
  },

  getTemplatesBoardId() {
-    return this.profile.templatesBoardId;
+    return (this.profile || {}).templatesBoardId;
  },

  getTemplatesBoardSlug() {
-    return Boards.findOne(this.profile.templatesBoardId).slug;
+    return (Boards.findOne((this.profile || {}).templatesBoardId) || {}).slug;
+  },
+
+  remove() {
+    User.remove({ _id: this._id});
  },
 });

@@ -673,6 +690,23 @@ if (Meteor.isServer) {
    }, {unique: true});
  });

+  // OLD WAY THIS CODE DID WORK: When user is last admin of board,
+  // if admin is removed, board is removed.
+  // NOW THIS IS COMMENTED OUT, because other board users still need to be able
+  // to use that board, and not have board deleted.
+  // Someone can be later changed to be admin of board, by making change to database.
+  // TODO: Add UI for changing someone as board admin.
+  //Users.before.remove((userId, doc) => {
+  //  Boards
+  //    .find({members: {$elemMatch: {userId: doc._id, isAdmin: true}}})
+  //    .forEach((board) => {
+  //      // If only one admin for the board
+  //      if (board.members.filter((e) => e.isAdmin).length === 1) {
+  //        Boards.remove(board._id);
+  //      }
+  //    });
+  //});
+
  // Each board document contains the de-normalized number of users that have
  // starred it. If the user star or unstar a board, we need to update this
  // counter.
@@ -1,6 +1,6 @@
 {
  "name": "wekan",
-  "version": "v2.64.0",
+  "version": "v2.68.0",
  "description": "Open-Source kanban",
  "private": true,
  "scripts": {
@@ -1,41 +1,44 @@
 import ldapjs from 'ldapjs';
 import util from 'util';
 import Bunyan from 'bunyan';
-import { log_debug, log_info, log_warn, log_error } from './logger';
+import {log_debug, log_info, log_warn, log_error} from './logger';
+

 export default class LDAP {
-  constructor(){
+  constructor() {
    this.ldapjs = ldapjs;

    this.connected = false;

    this.options = {
-      host: this.constructor.settings_get('LDAP_HOST'),
-      port: this.constructor.settings_get('LDAP_PORT'),
-      Reconnect: this.constructor.settings_get('LDAP_RECONNECT'),
-      timeout: this.constructor.settings_get('LDAP_TIMEOUT'),
-      connect_timeout: this.constructor.settings_get('LDAP_CONNECT_TIMEOUT'),
-      idle_timeout: this.constructor.settings_get('LDAP_IDLE_TIMEOUT'),
-      encryption: this.constructor.settings_get('LDAP_ENCRYPTION'),
-      ca_cert: this.constructor.settings_get('LDAP_CA_CERT'),
-      reject_unauthorized: this.constructor.settings_get('LDAP_REJECT_UNAUTHORIZED') || false,
-      Authentication: this.constructor.settings_get('LDAP_AUTHENTIFICATION'),
-      Authentication_UserDN: this.constructor.settings_get('LDAP_AUTHENTIFICATION_USERDN'),
-      Authentication_Password: this.constructor.settings_get('LDAP_AUTHENTIFICATION_PASSWORD'),
-      Authentication_Fallback: this.constructor.settings_get('LDAP_LOGIN_FALLBACK'),
-      BaseDN: this.constructor.settings_get('LDAP_BASEDN'),
-      Internal_Log_Level: this.constructor.settings_get('INTERNAL_LOG_LEVEL'),
-      User_Search_Filter: this.constructor.settings_get('LDAP_USER_SEARCH_FILTER'),
-      User_Search_Scope: this.constructor.settings_get('LDAP_USER_SEARCH_SCOPE'),
-      User_Search_Field: this.constructor.settings_get('LDAP_USER_SEARCH_FIELD'),
-      Search_Page_Size: this.constructor.settings_get('LDAP_SEARCH_PAGE_SIZE'),
-      Search_Size_Limit: this.constructor.settings_get('LDAP_SEARCH_SIZE_LIMIT'),
-      group_filter_enabled: this.constructor.settings_get('LDAP_GROUP_FILTER_ENABLE'),
-      group_filter_object_class: this.constructor.settings_get('LDAP_GROUP_FILTER_OBJECTCLASS'),
-      group_filter_group_id_attribute: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE'),
+      host                               : this.constructor.settings_get('LDAP_HOST'),
+      port                               : this.constructor.settings_get('LDAP_PORT'),
+      Reconnect                          : this.constructor.settings_get('LDAP_RECONNECT'),
+      timeout                            : this.constructor.settings_get('LDAP_TIMEOUT'),
+      connect_timeout                    : this.constructor.settings_get('LDAP_CONNECT_TIMEOUT'),
+      idle_timeout                       : this.constructor.settings_get('LDAP_IDLE_TIMEOUT'),
+      encryption                         : this.constructor.settings_get('LDAP_ENCRYPTION'),
+      ca_cert                            : this.constructor.settings_get('LDAP_CA_CERT'),
+      reject_unauthorized                : this.constructor.settings_get('LDAP_REJECT_UNAUTHORIZED') || false,
+      Authentication                     : this.constructor.settings_get('LDAP_AUTHENTIFICATION'),
+      Authentication_UserDN              : this.constructor.settings_get('LDAP_AUTHENTIFICATION_USERDN'),
+      Authentication_Password            : this.constructor.settings_get('LDAP_AUTHENTIFICATION_PASSWORD'),
+      Authentication_Fallback            : this.constructor.settings_get('LDAP_LOGIN_FALLBACK'),
+      BaseDN                             : this.constructor.settings_get('LDAP_BASEDN'),
+      Internal_Log_Level                 : this.constructor.settings_get('INTERNAL_LOG_LEVEL'),
+      User_Authentication                : this.constructor.settings_get('LDAP_USER_AUTHENTICATION'),
+      User_Attributes                    : this.constructor.settings_get('LDAP_USER_ATTRIBUTES'),
+      User_Search_Filter                 : this.constructor.settings_get('LDAP_USER_SEARCH_FILTER'),
+      User_Search_Scope                  : this.constructor.settings_get('LDAP_USER_SEARCH_SCOPE'),
+      User_Search_Field                  : this.constructor.settings_get('LDAP_USER_SEARCH_FIELD'),
+      Search_Page_Size                   : this.constructor.settings_get('LDAP_SEARCH_PAGE_SIZE'),
+      Search_Size_Limit                  : this.constructor.settings_get('LDAP_SEARCH_SIZE_LIMIT'),
+      group_filter_enabled               : this.constructor.settings_get('LDAP_GROUP_FILTER_ENABLE'),
+      group_filter_object_class          : this.constructor.settings_get('LDAP_GROUP_FILTER_OBJECTCLASS'),
+      group_filter_group_id_attribute    : this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE'),
      group_filter_group_member_attribute: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE'),
-      group_filter_group_member_format: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT'),
-      group_filter_group_name: this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_NAME'),
+      group_filter_group_member_format   : this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT'),
+      group_filter_group_name            : this.constructor.settings_get('LDAP_GROUP_FILTER_GROUP_NAME'),
    };
  }

@@ -52,14 +55,16 @@ export default class LDAP {
      log_warn(`Lookup for unset variable: ${name}`);
    }
  }
+
  connectSync(...args) {
-    if (!this._connectSync) {
+     if (!this._connectSync) {
      this._connectSync = Meteor.wrapAsync(this.connectAsync, this);
    }
    return this._connectSync(...args);
  }

  searchAllSync(...args) {
+
    if (!this._searchAllSync) {
      this._searchAllSync = Meteor.wrapAsync(this.searchAllAsync, this);
    }
@@ -72,19 +77,19 @@ export default class LDAP {
    let replied = false;

    const connectionOptions = {
-      url: `${ this.options.host }:${ this.options.port }`,
-      timeout: this.options.timeout,
+      url           : `${this.options.host}:${this.options.port}`,
+      timeout       : this.options.timeout,
      connectTimeout: this.options.connect_timeout,
-      idleTimeout: this.options.idle_timeout,
-      reconnect: this.options.Reconnect,
+      idleTimeout   : this.options.idle_timeout,
+      reconnect     : this.options.Reconnect,
    };

    if (this.options.Internal_Log_Level !== 'disabled') {
      connectionOptions.log = new Bunyan({
-        name: 'ldapjs',
+        name     : 'ldapjs',
        component: 'client',
-        stream: process.stderr,
-        level: this.options.Internal_Log_Level,
+        stream   : process.stderr,
+        level    : this.options.Internal_Log_Level,
      });
    }

@@ -95,8 +100,8 @@ export default class LDAP {
    if (this.options.ca_cert && this.options.ca_cert !== '') {
      // Split CA cert into array of strings
      const chainLines = this.constructor.settings_get('LDAP_CA_CERT').split('\n');
-      let cert = [];
-      const ca = [];
+      let cert         = [];
+      const ca         = [];
      chainLines.forEach((line) => {
        cert.push(line);
        if (line.match(/-END CERTIFICATE-/)) {
@@ -108,14 +113,14 @@ export default class LDAP {
    }

    if (this.options.encryption === 'ssl') {
-      connectionOptions.url = `ldaps://${ connectionOptions.url }`;
+      connectionOptions.url        = `ldaps://${connectionOptions.url}`;
      connectionOptions.tlsOptions = tlsOptions;
    } else {
-      connectionOptions.url = `ldap://${ connectionOptions.url }`;
+      connectionOptions.url = `ldap://${connectionOptions.url}`;
    }

    log_info('Connecting', connectionOptions.url);
-    log_debug(`connectionOptions${  util.inspect(connectionOptions)}`);
+    log_debug(`connectionOptions${util.inspect(connectionOptions)}`);

    this.client = ldapjs.createClient(connectionOptions);

@@ -189,23 +194,42 @@ export default class LDAP {

    if (this.options.User_Search_Filter !== '') {
      if (this.options.User_Search_Filter[0] === '(') {
-        filter.push(`${ this.options.User_Search_Filter }`);
+        filter.push(`${this.options.User_Search_Filter}`);
      } else {
-        filter.push(`(${ this.options.User_Search_Filter })`);
+        filter.push(`(${this.options.User_Search_Filter})`);
      }
    }

-    const usernameFilter = this.options.User_Search_Field.split(',').map((item) => `(${ item }=${ username })`);
+    const usernameFilter = this.options.User_Search_Field.split(',').map((item) => `(${item}=${username})`);

    if (usernameFilter.length === 0) {
      log_error('LDAP_LDAP_User_Search_Field not defined');
    } else if (usernameFilter.length === 1) {
-      filter.push(`${ usernameFilter[0] }`);
+      filter.push(`${usernameFilter[0]}`);
    } else {
-      filter.push(`(|${ usernameFilter.join('') })`);
+      filter.push(`(|${usernameFilter.join('')})`);
    }

-    return `(&${ filter.join('') })`;
+    return `(&${filter.join('')})`;
+  }
+
+  bindUserIfNecessary(username, password) {
+
+    if (this.domainBinded === true) {
+      return;
+    }
+
+    if (!this.options.User_Authentication) {
+      return;
+    }
+
+
+    if (!this.options.BaseDN) throw new Error('BaseDN is not provided');
+
+    const userDn = `uid=${username},${this.options.BaseDN}`;
+
+    this.bindSync(userDn, password);
+    this.domainBinded = true;
  }

  bindIfNecessary() {
@@ -218,22 +242,24 @@ export default class LDAP {
    }

    log_info('Binding UserDN', this.options.Authentication_UserDN);
+
    this.bindSync(this.options.Authentication_UserDN, this.options.Authentication_Password);
    this.domainBinded = true;
  }

  searchUsersSync(username, page) {
    this.bindIfNecessary();
-
    const searchOptions = {
-      filter: this.getUserFilter(username),
-      scope: this.options.User_Search_Scope || 'sub',
+      filter   : this.getUserFilter(username),
+      scope    : this.options.User_Search_Scope || 'sub',
      sizeLimit: this.options.Search_Size_Limit,
    };

+    if (!!this.options.User_Attributes) searchOptions.attributes = this.options.User_Attributes.split(',');
+
    if (this.options.Search_Page_Size > 0) {
      searchOptions.paged = {
-        pageSize: this.options.Search_Page_Size,
+        pageSize : this.options.Search_Page_Size,
        pagePause: !!page,
      };
    }
@@ -266,11 +292,11 @@ export default class LDAP {
      Unique_Identifier_Field.forEach((item) => {
        filters.push(new this.ldapjs.filters.EqualityFilter({
          attribute: item,
-          value: new Buffer(id, 'hex'),
+          value    : new Buffer(id, 'hex'),
        }));
      });

-      filter = new this.ldapjs.filters.OrFilter({filters});
+      filter = new this.ldapjs.filters.OrFilter({ filters });
    }

    const searchOptions = {
@@ -300,7 +326,7 @@ export default class LDAP {

    const searchOptions = {
      filter: this.getUserFilter(username),
-      scope: this.options.User_Search_Scope || 'sub',
+      scope : this.options.User_Search_Scope || 'sub',
    };

    log_info('Searching user', username);
@@ -320,7 +346,7 @@ export default class LDAP {
    return result[0];
  }

-  getUserGroups(username, ldapUser){
+  getUserGroups(username, ldapUser) {
    if (!this.options.group_filter_enabled) {
      return true;
    }
@@ -328,13 +354,13 @@ export default class LDAP {
    const filter = ['(&'];

    if (this.options.group_filter_object_class !== '') {
-      filter.push(`(objectclass=${ this.options.group_filter_object_class })`);
+      filter.push(`(objectclass=${this.options.group_filter_object_class})`);
    }

    if (this.options.group_filter_group_member_attribute !== '') {
      const format_value = ldapUser[this.options.group_filter_group_member_format];
-      if( format_value ) {
-        filter.push(`(${ this.options.group_filter_group_member_attribute }=${ format_value })`);
+      if (format_value) {
+        filter.push(`(${this.options.group_filter_group_member_attribute}=${format_value})`);
      }
    }

@@ -342,7 +368,7 @@ export default class LDAP {

    const searchOptions = {
      filter: filter.join('').replace(/#{username}/g, username),
-      scope: 'sub',
+      scope : 'sub',
    };

    log_debug('Group list filter LDAP:', searchOptions.filter);
@@ -354,11 +380,11 @@ export default class LDAP {
    }

    const grp_identifier = this.options.group_filter_group_id_attribute || 'cn';
-    const groups = [];
+    const groups         = [];
    result.map((item) => {
-      groups.push( item[ grp_identifier ] );
+      groups.push(item[grp_identifier]);
    });
-    log_debug(`Groups: ${  groups.join(', ')}`);
+    log_debug(`Groups: ${groups.join(', ')}`);
    return groups;

  }
@@ -373,24 +399,24 @@ export default class LDAP {
    const filter = ['(&'];

    if (this.options.group_filter_object_class !== '') {
-      filter.push(`(objectclass=${ this.options.group_filter_object_class })`);
+      filter.push(`(objectclass=${this.options.group_filter_object_class})`);
    }

    if (this.options.group_filter_group_member_attribute !== '') {
      const format_value = ldapUser[this.options.group_filter_group_member_format];
-      if( format_value ) {
-        filter.push(`(${ this.options.group_filter_group_member_attribute }=${ format_value })`);
+      if (format_value) {
+        filter.push(`(${this.options.group_filter_group_member_attribute}=${format_value})`);
      }
    }

    if (this.options.group_filter_group_id_attribute !== '') {
-      filter.push(`(${ this.options.group_filter_group_id_attribute }=${ this.options.group_filter_group_name })`);
+      filter.push(`(${this.options.group_filter_group_id_attribute}=${this.options.group_filter_group_name})`);
    }
    filter.push(')');

    const searchOptions = {
      filter: filter.join('').replace(/#{username}/g, username),
-      scope: 'sub',
+      scope : 'sub',
    };

    log_debug('Group filter LDAP:', searchOptions.filter);
@@ -426,15 +452,17 @@ export default class LDAP {
  searchAllPaged(BaseDN, options, page) {
    this.bindIfNecessary();

-    const processPage = ({entries, title, end, next}) => {
+    const processPage = ({ entries, title, end, next }) => {
      log_info(title);
      // Force LDAP idle to wait the record processing
      this.client._updateIdle(true);
-      page(null, entries, {end, next: () => {
-        // Reset idle timer
-        this.client._updateIdle();
-        next && next();
-      }});
+      page(null, entries, {
+        end, next: () => {
+          // Reset idle timer
+          this.client._updateIdle();
+          next && next();
+        }
+      });
    };

    this.client.search(BaseDN, options, (error, res) => {
@@ -461,7 +489,7 @@ export default class LDAP {
          processPage({
            entries,
            title: 'Internal Page',
-            end: false,
+            end  : false,
          });
          entries = [];
        }
@@ -473,14 +501,14 @@ export default class LDAP {
          processPage({
            entries,
            title: 'Final Page',
-            end: true,
+            end  : true,
          });
        } else if (entries.length) {
          log_info('Page');
          processPage({
            entries,
            title: 'Page',
-            end: false,
+            end  : false,
            next,
          });
          entries = [];
@@ -492,7 +520,7 @@ export default class LDAP {
          processPage({
            entries,
            title: 'Final Page',
-            end: true,
+            end  : true,
          });
          entries = [];
        }
@@ -547,7 +575,7 @@ export default class LDAP {
  }

  disconnect() {
-    this.connected = false;
+    this.connected    = false;
    this.domainBinded = false;
    log_info('Disconecting');
    this.client.unbind();
@@ -41,28 +41,38 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
  let ldapUser;

  try {
-    ldap.connectSync();
-    const users = ldap.searchUsersSync(loginRequest.username);

-    if (users.length !== 1) {
-      log_info('Search returned', users.length, 'record(s) for', loginRequest.username);
-      throw new Error('User not Found');
-    }
+      ldap.connectSync();
+
+     if (!!LDAP.settings_get('LDAP_USER_AUTHENTICATION')) {
+        ldap.bindUserIfNecessary(loginRequest.username, loginRequest.ldapPass);
+       ldapUser = ldap.searchUsersSync(loginRequest.username)[0];
+       } else {
+
+       const users = ldap.searchUsersSync(loginRequest.username);
+
+       if (users.length !== 1) {
+         log_info('Search returned', users.length, 'record(s) for', loginRequest.username);
+         throw new Error('User not Found');
+       }
+
+       if (ldap.authSync(users[0].dn, loginRequest.ldapPass) === true) {
+         if (ldap.isUserInGroup(loginRequest.username, users[0])) {
+           ldapUser = users[0];
+         } else {
+           throw new Error('User not in a valid group');
+         }
+       } else {
+         log_info('Wrong password for', loginRequest.username);
+       }
+     }
+

-    if (ldap.authSync(users[0].dn, loginRequest.ldapPass) === true) {
-      if (ldap.isUserInGroup(loginRequest.username, users[0])) {
-        ldapUser = users[0];
-      } else {
-        throw new Error('User not in a valid group');
-      }
-    } else {
-      log_info('Wrong password for', loginRequest.username);
-    }
  } catch (error) {
-    log_error(error);
+     log_error(error);
  }

-  if (ldapUser === undefined) {
+  if (!ldapUser) {
    if (LDAP.settings_get('LDAP_LOGIN_FALLBACK') === true) {
      return fallbackDefaultAccountSystem(self, loginRequest.username, loginRequest.ldapPass);
    }
@@ -76,8 +86,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {

  const Unique_Identifier_Field = getLdapUserUniqueID(ldapUser);
  let user;
-
-  // Attempt to find user by unique identifier
+   // Attempt to find user by unique identifier

  if (Unique_Identifier_Field) {
    userQuery = {
@@ -88,14 +97,14 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
    log_debug('userQuery', userQuery);

    user = Meteor.users.findOne(userQuery);
-  }
+   }

  // Attempt to find user by username

  let username;
  let email;

-  if (LDAP.settings_get('LDAP_USERNAME_FIELD') !== '') {
+   if (LDAP.settings_get('LDAP_USERNAME_FIELD') !== '') {
    username = slug(getLdapUsername(ldapUser));
  } else {
    username = slug(loginRequest.username);
@@ -105,6 +114,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
    email = getLdapEmail(ldapUser);
  }

+
  if (!user) {
    if(email && LDAP.settings_get('LDAP_EMAIL_MATCH_REQUIRE') === true) {
      if(LDAP.settings_get('LDAP_EMAIL_MATCH_VERIFIED') === true) {
@@ -13,12 +13,12 @@ OAuth.registerService('oidc', 2, null, function (query) {
  if (debug) console.log('XXX: userinfo:', userinfo);

  var serviceData = {};
-  serviceData.id = userinfo[process.env.OAUTH2_ID_MAP] || userinfo[id];
-  serviceData.username = userinfo[process.env.OAUTH2_USERNAME_MAP] || userinfo[uid];
-  serviceData.fullname = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo[displayName];
+  serviceData.id = userinfo[process.env.OAUTH2_ID_MAP] || userinfo["id"];
+  serviceData.username = userinfo[process.env.OAUTH2_USERNAME_MAP] || userinfo["uid"];
+  serviceData.fullname = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo["displayName"];
  serviceData.accessToken = accessToken;
  serviceData.expiresAt = expiresAt;
-  serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo[email];
+  serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo["email"];

  if (accessToken) {
    var tokenContent = getTokenContent(accessToken);
@@ -31,8 +31,8 @@ OAuth.registerService('oidc', 2, null, function (query) {
  if (debug) console.log('XXX: serviceData:', serviceData);

  var profile = {};
-  profile.name = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo[displayName];
-  profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo[email];
+  profile.name = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo["displayName"];
+  profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo["email"];
  if (debug) console.log('XXX: profile:', profile);

  return {
@@ -146,3 +146,6 @@ tx pull -f -l zh_CN

 echo "Chinese (Taiwan)"
 tx pull -f -l zh_TW
+
+echo "Chinese (Hong Kong)"
+tx pull -f -l zh_HK
@@ -191,6 +191,8 @@
        # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
        # example :  export LDAP_REJECT_UNAUTHORIZED=true
        #export LDAP_REJECT_UNAUTHORIZED=false
+        # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
+        #export LDAP_USER_AUTHENTICATION=true
        # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
        # example :  export LDAP_USER_SEARCH_FILTER=
        #export LDAP_USER_SEARCH_FILTER=
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
    appTitle = (defaultText = "Wekan"),
    # The name of the app as it is displayed to the user.

-    appVersion = 266,
+    appVersion = 270,
    # Increment this for every release.

-    appMarketingVersion = (defaultText = "2.64.0~2019-04-23"),
+    appMarketingVersion = (defaultText = "2.68.0~2019-05-10"),
    # Human-readable presentation of the app version.

    minUpgradableAppVersion = 0,
@@ -10,7 +10,7 @@ Meteor.publish('boards', function() {

  // Defensive programming to verify that starredBoards has the expected
  // format -- since the field is in the `profile` a user can modify it.
-  const {starredBoards = []} = Users.findOne(this.userId).profile;
+  const {starredBoards = []} = Users.findOne(this.userId).profile || {};
  check(starredBoards, [String]);

  return Boards.find({
@@ -1,3 +1,5 @@
+import { FastRender } from 'meteor/staringatlights:fast-render';
+
 FastRender.onAllRoutes(function() {
  this.subscribe('boards');
 });
@@ -3,7 +3,7 @@
 # All supported keys are defined here together with descriptions and default values

 # list of supported keys
-keys="DEBUG MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW EMAIL_NOTIFICATION_TIMEOUT CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_EMAIL_MAP LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE 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 LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD"
+keys="DEBUG MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW EMAIL_NOTIFICATION_TIMEOUT CORS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_EMAIL_MAP LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE 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 LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD"

 # default values
 DESCRIPTION_DEBUG="Debug OIDC OAuth2 etc. Example: sudo snap set wekan debug='true'"
@@ -250,6 +250,10 @@ DESCRIPTION_LDAP_REJECT_UNAUTHORIZED="Reject Unauthorized Certificate"
 DEFAULT_LDAP_REJECT_UNAUTHORIZED="false"
 KEY_LDAP_REJECT_UNAUTHORIZED="ldap-reject-unauthorized"

+DESCRIPTION_LDAP_USER_AUTHENTICATION="Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key)."
+DEFAULT_LDAP_USER_AUTHENTICATION="false"
+KEY_LDAP_USER_AUTHENTICATION="ldap-user-authentication"
+
 DESCRIPTION_LDAP_USER_SEARCH_FILTER="Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed"
 DEFAULT_LDAP_USER_SEARCH_FILTER=""
 KEY_LDAP_USER_SEARCH_FILTER="ldap-user-search-filter"
@@ -234,6 +234,9 @@ echo -e "Ldap Reject Unauthorized."
 echo -e "Reject Unauthorized Certificate:"
 echo -e "\t$ snap set $SNAP_NAME ldap-reject-unauthorized='true'"
 echo -e "\n"
+echo -e "Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key)."
+echo -e "\t$ snap set $SNAP_NAME ldap-user-authentication='true'"
+echo -e "\n"
 echo -e "Ldap User Search Filter."
 echo -e "Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed:"
 echo -e "\t$ snap set $SNAP_NAME ldap-user-search-filter=''"
@@ -173,6 +173,9 @@ REM # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
 REM # example : LDAP_REJECT_UNAUTHORIZED=true
 REM SET LDAP_REJECT_UNAUTHORIZED=false

+REM # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
+REM SET LDAP_USER_AUTHENTICATION=true
+
 REM # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
 REM # example : LDAP_USER_SEARCH_FILTER=
 REM SET LDAP_USER_SEARCH_FILTER=
@@ -210,6 +210,8 @@ function wekan_repo_check(){
      # LDAP_REJECT_UNAUTHORIZED : Reject Unauthorized Certificate
      # example :  export LDAP_REJECT_UNAUTHORIZED=true
      #export LDAP_REJECT_UNAUTHORIZED=false
+      # Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key).
+      #export LDAP_USER_AUTHENTICATION=true
      # LDAP_USER_SEARCH_FILTER : Optional extra LDAP filters. Don't forget the outmost enclosing parentheses if needed
      # example :  export LDAP_USER_SEARCH_FILTER=
      #export LDAP_USER_SEARCH_FILTER=
Author	SHA1	Message	Date
Lauri Ojansivu	3eef42eee0	v2.68	2019-05-10 23:18:12 +03:00
Lauri Ojansivu	38d0ad74a9	Update changelog.	2019-05-10 23:13:20 +03:00
Lauri Ojansivu	3bbc805ee4	Option to login to the LDAP server with the user's own username and password, instead of an administrator key. Default: false (use administrator key). With new setting: LDAP_USER_AUTHENTICATION=true Added to Snap, Docker and Source. Thanks to xet7 ! Related https://github.com/wekan/wekan/pull/2399	2019-05-10 23:04:51 +03:00
Lauri Ojansivu	c37a454bd5	Merge branch 'thiagofernando-devel' into devel	2019-05-10 22:23:15 +03:00
Lauri Ojansivu	6f98be5608	Merge branch 'devel' of https://github.com/thiagofernando/wekan into thiagofernando-devel	2019-05-10 22:21:50 +03:00
Lauri Ojansivu	ab4dab2ade	v2.67	2019-05-10 21:01:34 +03:00
Lauri Ojansivu	88ffddfeba	Update changelog.	2019-05-10 20:58:35 +03:00
Thiago Fernando	36f148a7cb	Update loginHandler.js additional option to login in ldap server with user account	2019-05-10 14:58:19 -03:00
Thiago Fernando	fd1af07e43	Update ldap.js	2019-05-10 14:56:07 -03:00
Lauri Ojansivu	fca87b53f0	Update changelog.	2019-05-10 20:55:35 +03:00
Thiago Fernando	ce0473480b	Merge pull request #1 from wekan/devel ldap changes	2019-05-10 14:54:25 -03:00
Lauri Ojansivu	828f6ea321	- Add Feature: Move board to Archive button at each board at All Boards page. Thanks to xet7 ! Related #2389	2019-05-10 20:50:53 +03:00
Lauri Ojansivu	7ff4067e88	v2.66	2019-05-09 16:32:34 +03:00
Lauri Ojansivu	491d27638a	Delete user feature.	2019-05-09 16:24:13 +03:00
Lauri Ojansivu	e1b016cf3d	Prevent data loss. Thanks to xet7 !	2019-05-09 16:17:53 +03:00
Lauri Ojansivu	c850669777	Merge pull request #2384 from Akuket/origin/edge Delete user feature	2019-05-09 16:06:17 +03:00
Lauri Ojansivu	04c7372a4e	Update changelog.	2019-05-09 16:02:54 +03:00
Lauri Ojansivu	64ee60a008	Fix missing profile checks. Thanks to justinr1234 !	2019-05-09 14:32:38 +03:00
Lauri Ojansivu	434ed895ed	Merge pull request #2395 from guyzyl/devel Fixed RTL issue #884	2019-05-09 14:24:35 +03:00
Guy Zylberberg	1bdc1017d6	Fixed RTL issue #884	2019-05-08 21:30:38 +03:00
Lauri Ojansivu	6218d8c7ed	Update translations.	2019-05-08 18:20:49 +03:00
Lauri Ojansivu	c250554177	Update translations. Add Chinese (Hong Kong).	2019-05-06 20:57:01 +03:00
Lauri Ojansivu	de772a8c3b	Update changelog.	2019-04-29 01:18:17 +03:00
Lauri Ojansivu	23f1cf5f49	Update translations.	2019-04-29 01:17:52 +03:00
Lauri Ojansivu	723fa11a74	Merge pull request #2385 from faust64/patch-1 fix(oidc): can not log in	2019-04-26 23:08:45 +03:00
Lauri Ojansivu	94b602e167	Update translations.	2019-04-26 23:07:38 +03:00
Samuel	b17359ec6f	fix(oidc): can not log in Trying to configure wekan authenticating against LemonLDAP-NG, I used to read about errors like the following: ``` XXX: getUserInfo response: { sub: 'demoone' } XXX: userinfo: { sub: 'demoone' } {"line":"431","file":"oauth.js","message":"Error in OAuth Server: id is not defined","time":{"$date":1556286530412},"level":"warn"} Exception while invoking method 'login' { stack: 'ReferenceError: id is not defined\n at Object.handleOauthRequest (packages/wekan-oidc.js:39:68)\n at OAuth._requestHandlers.(anonymous function) (packages/oauth2.js:27:31)\n at middleware (packages/oauth.js:203:5)\n at packages/oauth.js:176:5', source: 'method' } ``` Looking at the sources, that error message seems to be right: we have several references to `id`, `uid`, `displayName` or `email`, which are not defined. Probably a typo, assuming we meant these to be strings. Applying that patch, I confirm I can finally log in: ``` XXX: getUserInfo response: { sub: 'demoone' } XXX: userinfo: { sub: 'demoone' } XXX: serviceData: { id: undefined, username: undefined, fullname: undefined, accessToken: 'e57dc4e9e81cc98c279db3ed08b1c72f', expiresAt: 1556298699213, email: undefined } XXX: profile: { name: undefined, email: undefined } ``` All the credit goes to @pcurie .	2019-04-26 18:21:42 +02:00
guillaume	cdef8a33e4	Delete user feature	2019-04-26 17:53:48 +02:00
Lauri Ojansivu	11a91bfc78	Update translations.	2019-04-24 16:12:29 +03:00
Lauri Ojansivu	aeb3dd0220	v2.65	2019-04-24 14:40:04 +03:00
Lauri Ojansivu	9647a33209	Update translations.	2019-04-24 14:01:38 +03:00
Lauri Ojansivu	2d966863e3	Merge branch 'Akuket-edge' into edge	2019-04-24 13:51:00 +03:00
Lauri Ojansivu	a66632f767	Update translations.	2019-04-24 13:41:29 +03:00
Lauri Ojansivu	1c2ee631f4	Update changelog.	2019-04-24 13:37:19 +03:00
guillaume	259ff3436f	fix lints	2019-04-24 12:35:00 +02:00
Lauri Ojansivu	a750ecaafd	- Remove from card menu, because they also exist at card: members, labels, attachments, dates received/start/due/end. Thanks to sfahrenholz, jrsupplee and xet7 ! Closes #2242, related https://community.vanila.io/?t=517527b6-3d84-4e9d-b2ec-6f560a9cfdf7	2019-04-24 13:32:36 +03:00
guillaume	8b3601248d	Loading authentication page	2019-04-24 12:28:11 +02:00