v5.85

fix issue #4222

.devcontainer/Dockerfile

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ENV \
     DEBUG=false \
-    NODE_VERSION=v12.22.7 \
+    NODE_VERSION=v12.22.8 \
     METEOR_RELEASE=1.10.2 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \

.future-snap/broken-snapcraft.yaml

@@ -81,7 +81,7 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 12.22.7
+        node-engine: 12.22.8
         node-packages:
             - node-gyp
             - node-pre-gyp

.future-snap/snapcraft.yaml

@@ -83,7 +83,7 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 12.22.7
+        node-engine: 12.22.8
         node-packages:
             - node-gyp
             - node-pre-gyp

.gitignore

@@ -38,3 +38,4 @@ ehthumbs.db
 # Helm chart
 # Chart dependencies
 /helm/wekan/**/*.tgz
+/helm/wekan/charts

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 
 env:
   TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
-  TRAVIS_NODE_VERSION: 12.22.7
+  TRAVIS_NODE_VERSION: 12.22.8
   TRAVIS_NPM_VERSION: latest
 
 before_install:

CHANGELOG.md

@@ -1,5 +1,45 @@
 [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac)
 
+# v5.85 2021-12-17 WeKan ® release
+
+This release adds the following updates:
+
+- [Updated to Node.js v12.22.8](https://github.com/wekan/wekan/commit/5ad9ee1de6446e3b2f3e4a5df207d12de76e1b95).
+  Thanks to Node.js developers.
+
+and fixes the following bugs:
+
+- [Fix mobile card details for Modern Dark theme](https://github.com/wekan/wekan/pull/4240).
+  Thanks to jghaanstra.
+- [Fixed undefinded added member to board](https://github.com/wekan/wekan/pull/4245).
+  Thanks to Emile840.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v5.84 2021-12-15 WeKan ® release
+
+This release adds the following new features:
+
+- [Kubernetes 1.22 support and basic helm test](https://github.com/wekan/wekan/pull/4208).
+  Thanks to varac.
+- [Added Helm Chart usage docs](https://github.com/wekan/wekan/pull/4224).
+  Thanks to varac.
+- [Add full name if exists in `email-invite-subject` for user to invite](https://github.com/wekan/wekan/pull/4226).
+  Thanks to Emile840.
+- [Sort Organizations, Teams and People](https://github.com/wekan/wekan/pull/4232).
+  Thanks to Emile840.
+
+and fixes the following bugs:
+
+- [List title doesn't overlap with hamburger menu anymore](https://github.com/wekan/wekan/pull/4203).
+  Thanks to mfilser.
+- [Fix legal notice traduction bug when refreshing sign in page](https://github.com/wekan/wekan/pull/4217).
+  Thanks to Emile840.
+- [Fix: Clicking to view Lists or Swimlanes Archive adds temporarily many empty Lists to board](https://github.com/wekan/wekan/pull/4221).
+  Thanks to Ben0it-T.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v5.83 2021-11-30 WeKan ® release
 
 This release adds to following new improvements:

Dockerfile

@@ -12,7 +12,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
     DEBUG=false \
-    NODE_VERSION=v12.22.7 \
+    NODE_VERSION=v12.22.8 \
     METEOR_RELEASE=1.10.2 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \

Dockerfile.arm64v8

@@ -4,7 +4,7 @@ FROM amd64/alpine:3.7 AS builder
 ENV QEMU_VERSION=v4.2.0-6 \
     QEMU_ARCHITECTURE=aarch64 \
     NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.22.7 \
+    NODE_VERSION=v12.22.8 \
     WEKAN_VERSION=latest  \
     WEKAN_ARCHITECTURE=arm64
 
@@ -40,7 +40,7 @@ LABEL maintainer="wekan"
 # Set the environment variables (defaults where required)
 ENV QEMU_ARCHITECTURE=aarch64 \
     NODE_ARCHITECTURE=linux-arm64 \
-    NODE_VERSION=v12.22.7 \
+    NODE_VERSION=v12.22.8 \
     NODE_ENV=production \
     NPM_VERSION=latest \
     WITH_API=true \

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v5.83.0"
+appVersion: "v5.85.0"
 files:
   userUploads:
     - README.md

client/components/boards/boardColors.styl

@@ -956,17 +956,24 @@ setBoardClear(color1,color2)
 
   /* Card Details */
   .card-details
-    position: absolute
-    top: 30px
-    left: calc(50% - 384px)
-    width: 768px
-    max-height: calc(100% - 60px)
     background-color: #454545
     color: #cccccc
     box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19)
     border: 1px solid #111111
     z-index: 100 !important
 
+  @media screen and (max-width: 800px)
+    .card-details
+      width: 98%
+
+  @media screen and (min-width: 801px)
+    .card-details
+      position: absolute
+      top: 30px
+      left: calc(50% - 384px)
+      width: 768px
+      max-height: calc(100% - 60px)
+
   .card-details
     scrollbar-width: thin
     scrollbar-color: #343434 #999999

client/components/boards/boardsList.js

@@ -89,7 +89,7 @@ BlazeComponent.extendComponent({
   },
   teamsDatas() {
     if(Meteor.user().teams)
-      return Meteor.user().teams;
+      return Meteor.user().teams.sort((a, b) => a.teamDisplayName.localeCompare(b.teamDisplayName));
     else
       return [];
   },
@@ -101,7 +101,7 @@ BlazeComponent.extendComponent({
   },
   orgsDatas() {
     if(Meteor.user().orgs)
-      return Meteor.user().orgs;
+      return Meteor.user().orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName));
     else
       return [];
   },

client/components/lists/list.styl

@@ -85,11 +85,7 @@
     color: #a6a6a6
 
   .list-header-menu
-    position: absolute
-    padding: 27px 19px
-    margin-top: 1px
-    top: -7px
-    right: 3px
+    float: right
 
   .list-header-plus-top
     color: #a6a6a6
@@ -100,7 +96,8 @@
 
   .cardCount
     color: #8c8c8c
-    font-size: 0.8em
+    font-size: 12px
+    font-weight: bold
 
 .list-header .list-header-plus-top, .js-open-list-menu, .list-header-menu a
     color #4d4d4d
@@ -160,18 +157,6 @@
     float: left
 
 @media screen and (max-width: 800px)
-  .list-header-menu
-    position: absolute
-    padding: 27px 19px
-    margin-top: 1px
-    top: -7px
-    margin-right: 7px
-    right: -3px
-
-  .list-header
-    .list-header-name
-      margin-left: 1.4rem
-
   .mini-list
     flex: 0 0 60px
     height: auto
@@ -215,7 +200,6 @@
     display: flex
     align-items: center
     .list-header-left-icon
-      display: inline
       padding: 7px
       padding-right: 27px
       margin-top: 1px
@@ -238,6 +222,30 @@
       right: 10px
       font-size: 24px
 
+  .list-header
+    display: grid
+    grid-template-columns: 30px 5fr 1fr
+    .list-header-left-icon
+      display: grid
+      grid-row: 1/3
+      grid-column: 1
+    .list-header-name
+      grid-row: 1
+      grid-column: 2
+      align-self: end
+    .cardCount
+      grid-row: 2
+      grid-column: 2
+      align-self: start
+    .list-header-menu
+      grid-row: 1/3
+      grid-column: 3
+    .inlined-form
+      grid-row: 1/3
+      grid-column: 1/4
+    .edit-controls
+      align-items: initial
+
 .link-board-wrapper
   display: flex
   align-items: baseline

client/components/lists/listHeader.jade

@@ -18,9 +18,9 @@ template(name="listHeader")
          span(class="{{#if exceededWipLimit}}highlight{{/if}}") {{cards.count}}
          |/#{wipLimit.value})
 
-        if showCardsCountForList cards.count
-          | 
-          span(class="cardCount") {{cardsCount}} {{cardsCountForListIsOne cards.count}}
+      if showCardsCountForList cards.count
+        span.cardCount {{cardsCount}} {{cardsCountForListIsOne cards.count}}
+
       if isMiniScreen
         if currentList
           if isWatching

client/components/main/layouts.jade

@@ -50,9 +50,11 @@ template(name="userFormsLayout")
           +connectionMethod(authenticationMethod=currentSetting.defaultAuthenticationMethod)
         if isLegalNoticeLinkExist
           div#legalNoticeDiv
-            span {{_ 'acceptance_of_our_legalNotice'}}
-            a.at-link(href="{{currentSetting.legalNotice}}", target="_blank", rel="noopener noreferrer")
+            span#legalNoticeSpan {{_ 'acceptance_of_our_legalNotice'}}
+            a#legalNoticeAtLink.at-link(href="{{currentSetting.legalNotice}}", target="_blank", rel="noopener noreferrer")
               | {{_ 'legalNotice'}}
+          if getLegalNoticeWithWritTraduction
+            div
         div.at-form-lang
           select.select-lang.js-userform-set-language
             each languages

client/components/main/layouts.js

@@ -86,6 +86,18 @@ Template.userFormsLayout.helpers({
       return false;
   },
 
+  getLegalNoticeWithWritTraduction(){
+    let spanLegalNoticeElt = $("#legalNoticeSpan");
+    if(spanLegalNoticeElt != null && spanLegalNoticeElt != undefined){
+      spanLegalNoticeElt.html(TAPi18n.__('acceptance_of_our_legalNotice', {}, T9n.getLanguage() || 'en'));
+    }
+    let atLinkLegalNoticeElt = $("#legalNoticeAtLink");
+    if(atLinkLegalNoticeElt != null && atLinkLegalNoticeElt != undefined){
+      atLinkLegalNoticeElt.html(TAPi18n.__('legalNotice', {}, T9n.getLanguage() || 'en'));
+    }
+    return true;
+  },
+
   isLoading() {
     return Template.instance().isLoading.get();
   },

client/components/settings/peopleBody.js

@@ -144,6 +144,7 @@ BlazeComponent.extendComponent({
   },
   orgList() {
     const orgs = Org.find(this.findOrgsOptions.get(), {
+      sort: { orgDisplayName: 1 },
       fields: { _id: true },
     });
     this.numberOrgs.set(orgs.count(false));
@@ -151,6 +152,7 @@ BlazeComponent.extendComponent({
   },
   teamList() {
     const teams = Team.find(this.findTeamsOptions.get(), {
+      sort: { teamDisplayName: 1 },
       fields: { _id: true },
     });
     this.numberTeams.set(teams.count(false));
@@ -158,6 +160,7 @@ BlazeComponent.extendComponent({
   },
   peopleList() {
     const users = Users.find(this.findUsersOptions.get(), {
+      sort: { username: 1 },
       fields: { _id: true },
     });
     this.numberPeople.set(users.count(false));
@@ -251,10 +254,10 @@ Template.editUserPopup.helpers({
     return Template.instance().authenticationMethods.get();
   },
   orgsDatas() {
-    return Org.find({}, {sort: { createdAt: -1 }});
+    return Org.find({}, {sort: { orgDisplayName: 1 }});
   },
   teamsDatas() {
-    return Team.find({}, {sort: { createdAt: -1 }});
+    return Team.find({}, {sort: { teamDisplayName: 1 }});
   },
   isSelected(match) {
     const userId = Template.instance().data.userId;
@@ -324,10 +327,10 @@ Template.newUserPopup.helpers({
     return Template.instance().authenticationMethods.get();
   },
   orgsDatas() {
-    return Org.find({}, {sort: { createdAt: -1 }});
+    return Org.find({}, {sort: { orgDisplayName: 1 }});
   },
   teamsDatas() {
-    return Team.find({}, {sort: { createdAt: -1 }});
+    return Team.find({}, {sort: { teamDisplayName: 1 }});
   },
   isSelected(match) {
     const userId = Template.instance().data.userId;
@@ -417,7 +420,7 @@ BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({
   onCreated() {},
   teamsDatas() {
-    return Team.find({}, {sort: { createdAt: -1 }});
+    return Team.find({}, {sort: { teamDisplayName: 1 }});
   },
   events() {
     return [

client/components/sidebar/sidebar.js

@@ -1325,8 +1325,7 @@ BlazeComponent.extendComponent({
 
 Template.addBoardOrgPopup.helpers({
   orgsDatas() {
-    // return Org.find({}, {sort: { createdAt: -1 }});
-    let orgs = Org.find({}, {sort: { createdAt: -1 }});
+    let orgs = Org.find({}, {sort: { orgDisplayName: 1 }});
     return orgs;
   },
 });
@@ -1499,7 +1498,7 @@ BlazeComponent.extendComponent({
 
 Template.addBoardTeamPopup.helpers({
   teamsDatas() {
-    let teams = Team.find({}, {sort: { createdAt: -1 }});
+    let teams = Team.find({}, {sort: { teamDisplayName: 1 }});
     return teams;
   },
 });

client/components/sidebar/sidebarArchives.js

@@ -1,4 +1,4 @@
-archivedRequested = false;
+//archivedRequested = false;
 const subManager = new SubsManager();
 
 BlazeComponent.extendComponent({
@@ -13,7 +13,7 @@ BlazeComponent.extendComponent({
       const currentBoardId = Session.get('currentBoard');
       if (!currentBoardId) return;
       const handle = subManager.subscribe('board', currentBoardId, true);
-      archivedRequested = true;
+      //archivedRequested = true;
       Tracker.nonreactive(() => {
         Tracker.autorun(() => {
           this.isArchiveReady.set(handle.ready());

client/components/swimlanes/swimlanes.js

@@ -148,8 +148,8 @@ BlazeComponent.extendComponent({
   },
   visible(list) {
     if (list.archived) {
-      // Show archived list only when filter archive is on or archive is selected
-      if (!(Filter.archive.isSelected() || archivedRequested)) {
+      // Show archived list only when filter archive is on
+      if (!Filter.archive.isSelected()) {
         return false;
       }
     }
@@ -280,8 +280,8 @@ BlazeComponent.extendComponent({
   },
   visible(list) {
     if (list.archived) {
-      // Show archived list only when filter archive is on or archive is selected
-      if (!(Filter.archive.isSelected() || archivedRequested)) {
+      // Show archived list only when filter archive is on
+      if (!Filter.archive.isSelected()) {
         return false;
       }
     }

helm/wekan/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "5.83"
+appVersion: "5.85"
 dependencies:
   - condition: mongodb.enabled
     name: mongodb
@@ -21,4 +21,4 @@ name: wekan
 sources:
   - https://github.com/wekan/wekan
 type: application
-version: 1.1.0
+version: 1.1.1

helm/wekan/README.md

@@ -1,12 +1,38 @@
-# Helm Chart for Wekan
+# WeKan ® - Open Source kanban
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```bash
+helm repo add wekan https://wekan.github.io/charts
+helm install my-release wekan/wekan
+```
+
+These commands deploy Wekan on the Kubernetes cluster in the default configuration.
+
+Tip: List all releases using `helm list`
+
+For all available values see `helm show values wekan/wekan`.
+
+## Uninstalling the Chart
+
+To uninstall/delete the my-release deployment:
+
+```bash
+helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and
+deletes the release.
 
 ## Features
 
-o Uses a MongoDB replica set by default - this allows fault-tolerant
+* Uses a MongoDB replica set by default - this allows fault-tolerant
   and scalable MongoDB deployment (or just set the replicas to 1 for
   a single server install)
 
-o Optional Horizontal Pod Autoscaler (HPA), so that your Wekan pods
+* Optional Horizontal Pod Autoscaler (HPA), so that your Wekan pods
   will scale automatically with increased CPU load.
 
 ## The configurable values (values.yaml)
@@ -19,7 +45,9 @@ Scaling Wekan:
 
 replicaCount: 1
 ```
-**replicaCount** Will set the initial number of replicas for the Wekan pod (and container)
+
+**replicaCount** will set the initial number of replicas for the Wekan pod
+(and container)
 
 ```yaml
 ## Configure an horizontal pod autoscaler
@@ -34,13 +62,17 @@ autoscaling:
     ##
     targetCPUUtilizationPercentage: 80
 ```
-This section (if *enabled* is set to **true**) will enable the Kubernetes Horizontal Pod Autoscaler (HPA).
 
-**minReplicas:** this is the minimum number of pods to scale down to (We recommend setting this to the same value as **replicaCount**).
+This section (if *enabled* is set to **true**) will enable the Kubernetes
+Horizontal Pod Autoscaler (HPA).
+
+**minReplicas:** this is the minimum number of pods to scale down to
+(We recommend setting this to the same value as **replicaCount**).
 
 **maxReplicas:** this is the maximum number of pods to scale up to.
 
-**targetCPUUtilizationPercentage:** This is the CPU at which the HPA will scale-out the number of Wekan pods.
+**targetCPUUtilizationPercentage:** This is the CPU at which the HPA will
+scale-out the number of Wekan pods.
 
 ```yaml
 mongodb-replicaset:
@@ -55,11 +87,16 @@ mongodb-replicaset:
 
 This section controls the scale of the MongoDB redundant Replica Set.
 
-**replicas:** This is the number of MongoDB instances to include in the set. You can set this to 1 for a single server - this will still allow you to scale-up later with a helm upgrade.
+**replicas:** This is the number of MongoDB instances to include in the set.
+You can set this to 1 for a single server - this will still allow you to
+scale-up later with a helm upgrade.
 
 ### Install OCP route
-If you use this chart to deploy Wekan on an OCP cluster, you can create route instead of ingress with following command:
 
-``` bash
-$ helm template --set route.enabled=true,ingress.enabled=false values.yaml . | oc apply -f-
+If you use this chart to deploy Wekan on an OCP cluster, you can create route
+instead of ingress with following command:
+
+```bash
+helm template --set route.enabled=true,ingress.enabled=false values.yaml . | \
+  oc apply -f-
 ```

helm/wekan/charts/.gitkeep

@@ -1 +0,0 @@
-

helm/wekan/templates/ingress.yaml

@@ -2,7 +2,8 @@
 {{- $fullName := include "wekan.fullname" . -}}
 {{- $servicePort := .Values.service.port -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: networking.k8s.io/v1beta1
+{{- $ingressPathType := .Values.ingress.pathtype -}}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -27,17 +28,17 @@ spec:
       secretName: {{ .secretName }}
   {{- end }}
 {{- end }}
-  backend:
-    serviceName: {{ $fullName }}
-    servicePort: 8080
   rules:
   {{- range .Values.ingress.hosts }}
     - host: {{ . }}
       http:
         paths:
           - path: {{ $ingressPath }}
+            pathType: {{ $ingressPathType }}
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: 8080
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: 8080
   {{- end }}
 {{- end }}

helm/wekan/templates/tests/test-http.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ template "wekan.fullname" . }}-test-http"
+  labels:
+    app: {{ template "wekan.name" . }}
+    chart: {{ template "wekan.chart" . }}
+    component: wekan
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget', '-O', '/dev/stdout']
+      args: ['{{ template "wekan.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never

helm/wekan/values.yaml

@@ -14,7 +14,7 @@ serviceAccounts:
 ##
 image:
   repository: quay.io/wekan/wekan
-  tag: v5.83
+  tag: v5.85
   pullPolicy: IfNotPresent
 
 ## Configuration for wekan component
@@ -56,6 +56,7 @@ ingress:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   path: /*
+  pathtype: ImplementationSpecific
   # This must match 'endpoint', unless your client supports different
   # hostnames.
   hosts: [ wekan.local ]

i18n/de.i18n.json

@@ -281,8 +281,8 @@
     "worker-desc": "Kann Karten nur verschieben, sich selbst zuweisen und kommentieren.",
     "computer": "Computer",
     "confirm-subtask-delete-dialog": "Wollen Sie die Teilaufgabe wirklich löschen?",
-    "confirm-checklist-delete-popup": "Are you sure you want to delete the checklist?",
-    "checklistDeletePopup-title": "Delete Checklist?",
+    "confirm-checklist-delete-popup": "Wollen Sie diese Checkliste wirklich löschen?",
+    "checklistDeletePopup-title": "Checkliste löschen?",
     "copy-card-link-to-clipboard": "Kopiere Link zur Karte in die Zwischenablage",
     "copy-text-to-clipboard": "Text in die Zwischenablage kopieren",
     "linkCardPopup-title": "Karte verknüpfen",

i18n/fr.i18n.json

@@ -344,7 +344,7 @@
     "email-invalid": "Adresse e-mail incorrecte.",
     "email-invite": "Inviter par e-mail",
     "email-invite-subject": "__inviter__ vous a envoyé une invitation",
-    "email-invite-text": "Cher __user__,\n\n__inviter__ vous invite à rejoindre le tableau \"__board__\" pour collaborer.\n\nVeuillez suivre le lien ci-dessous :\n\n__url__\n\nMerci.",
+    "email-invite-text": "Cher/Chère __user__,\n\n__inviter__ vous invite à rejoindre le tableau \"__board__\" pour collaborer.\n\nVeuillez suivre le lien ci-dessous :\n\n__url__\n\nMerci.",
     "email-resetPassword-subject": "Réinitialiser votre mot de passe sur __siteName__",
     "email-resetPassword-text": "Bonjour __user__,\n\nPour réinitialiser votre mot de passe, cliquez sur le lien ci-dessous.\n\n__url__\n\nMerci.",
     "email-sent": "Courriel envoyé",
@@ -626,7 +626,7 @@
     "send-smtp-test": "Envoyer un mail de test à vous-même",
     "invitation-code": "Code d'invitation",
     "email-invite-register-subject": "__inviter__ vous a envoyé une invitation",
-    "email-invite-register-text": "Cher __user__,\n\n__inviter__ vous invite à le rejoindre sur le tableau kanban pour collaborer.\n\nVeuillez suivre le lien ci-dessous :\n__url__\n\nVotre code d'invitation est : __icode__\n\nMerci.",
+    "email-invite-register-text": "Cher/Chère __user__,\n\n__inviter__ vous invite à le rejoindre sur le tableau kanban pour collaborer.\n\nVeuillez suivre le lien ci-dessous :\n__url__\n\nVotre code d'invitation est : __icode__\n\nMerci.",
     "email-smtp-test-subject": "E-mail de test SMTP",
     "email-smtp-test-text": "Vous avez envoyé un mail avec succès",
     "error-invitation-code-not-exist": "Ce code d'invitation n'existe pas.",
@@ -856,7 +856,7 @@
     "act-a-endAt": "Modification de la date de fin de __timeOldValue__ à __timeValue__",
     "act-a-startAt": "Modification de la date de début de __timeOldValue__ à __timeValue__",
     "act-a-receivedAt": "Modification de la date de réception de __timeOldValue__ à __timeValue__",
-    "a-dueAt": "Echéance modifiée à ",
+    "a-dueAt": "Echéance modifiée à",
     "a-endAt": "Date de fin modifiée à",
     "a-startAt": "Date de début modifiée à",
     "a-receivedAt": "Date de réception modifiée à",
@@ -869,9 +869,9 @@
     "act-pastdue": "rappelle que l'échéance (__timeValue__) de __card__  est passée",
     "act-duenow": "rappelle que l'échéance (__timeValue__) de __card__ est maintenant",
     "act-atUserComment": "Vous avez été mentionné dans [__board__] __list__/__card__",
-    "delete-user-confirm-popup": "Êtes-vous sûr de vouloir supprimer ce compte ? Cela est irréversible. ",
-    "delete-team-confirm-popup": "Êtes-vous sûr de vouloir supprimer cette équipe ? Cela est irréversible. ",
-    "delete-org-confirm-popup": "Êtes-vous sûr de vouloir supprimer cette organisation ? Cela est irréversible. ",
+    "delete-user-confirm-popup": "Êtes-vous sûr de vouloir supprimer ce compte ? Cela est irréversible.",
+    "delete-team-confirm-popup": "Êtes-vous sûr de vouloir supprimer cette équipe ? Cela est irréversible.",
+    "delete-org-confirm-popup": "Êtes-vous sûr de vouloir supprimer cette organisation ? Cela est irréversible.",
     "accounts-allowUserDelete": "Autoriser les utilisateurs à supprimer leur compte",
     "hide-minicard-label-text": "Cacher l'étiquette de la minicarte",
     "show-desktop-drag-handles": "Voir les poignées de déplacement du bureau",
@@ -1001,7 +1001,7 @@
     "previous-page": "Page précédente",
     "heading-notes": "Remarques",
     "globalSearch-instructions-heading": "Instructions de recherche",
-    "globalSearch-instructions-description": "Les recherches peuvent inclure des opérateurs pour affiner le résultat. Les opérateurs sont précisés en écrivant l'opérateur suivi d'une valeur séparé par un deux-point. Par exemple, une spécification comme `liste:Bloqué` limiterait le résultat aux cartes qui contiennent une liste appelée *Bloqué*. Si la valeur contient des espaces ou des caractères spéciaux, elle doit être entourée d'apostrophes (par ex. `__operator_list__:\"À valider\"`). ",
+    "globalSearch-instructions-description": "Les recherches peuvent inclure des opérateurs pour affiner le résultat. Les opérateurs sont précisés en écrivant l'opérateur suivi d'une valeur séparé par un deux-point. Par exemple, une spécification comme `liste:Bloqué` limiterait le résultat aux cartes qui contiennent une liste appelée *Bloqué*. Si la valeur contient des espaces ou des caractères spéciaux, elle doit être entourée d'apostrophes (par ex. `__operator_list__:\"À valider\"`).",
     "globalSearch-instructions-operators": "Opérateurs disponibles :",
     "globalSearch-instructions-operator-board": "`__operator_board__:<titre>` - cartes dont le tableau correspond à *<titre>*",
     "globalSearch-instructions-operator-list": "`__operator_list__:<titre>` - cartes dont les listes correspondent à *<titre>*",

i18n/pt.i18n.json

@@ -81,7 +81,7 @@
     "activity-endDate": "editou a data de fim para %s de %s",
     "add-attachment": "Adicionar Anexo",
     "add-board": "Adicionar Quadro",
-    "add-template": "Add Template",
+    "add-template": "Adicionar Modelo",
     "add-card": "Adicionar Cartão",
     "add-card-to-top-of-list": "Adicionar Cartão no Topo da Lista",
     "add-card-to-bottom-of-list": "Adicionar Cartão no Fundo da Lista",
@@ -162,7 +162,7 @@
     "card-delete-pop": "Todas as acções serão removidas do feed de atividade e não poderá reabrir o cartão. Não é reversível.",
     "card-delete-suggest-archive": "Pode mover um cartão para o Arquivo para removê-lo do quadro e preservar a atividade.",
     "card-archive-pop": "Card will not be visible at this list after archiving card.",
-    "card-archive-suggest-cancel": "You can later restore card from Archive.",
+    "card-archive-suggest-cancel": "Tu podes restaurar o cartão do arquivo posteriormente.",
     "card-due": "Data limite",
     "card-due-on": "Data limite em",
     "card-spent": "Tempo Gasto",
@@ -205,13 +205,13 @@
     "poker-unsure": "?",
     "poker-finish": "Finalizar",
     "poker-result-votes": "Votos",
-    "poker-result-who": "Who",
+    "poker-result-who": "Quem",
     "poker-replay": "Replay",
     "set-estimation": "Definir Estimativa",
     "deletePokerPopup-title": "Delete planning poker?",
     "poker-delete-pop": "Deleting is permanent. You will lose all actions associated with this planning poker.",
     "cardDeletePopup-title": "Apagar Cartão?",
-    "cardArchivePopup-title": "Archive Card?",
+    "cardArchivePopup-title": "Arquivar Cartão?",
     "cardDetailsActionsPopup-title": "Acções do Cartão",
     "cardLabelsPopup-title": "Etiquetas",
     "cardMembersPopup-title": "Membros",
@@ -274,7 +274,7 @@
     "comment-only": "Apenas comentários",
     "comment-only-desc": "Pode comentar apenas em cartões.",
     "comment-delete": "Are you sure you want to delete the comment?",
-    "deleteCommentPopup-title": "Delete comment?",
+    "deleteCommentPopup-title": "Eliminar comentário?",
     "no-comments": "Sem comentários",
     "no-comments-desc": "Não pode ver comentários nem actividades.",
     "worker": "Trabalhador",
@@ -282,9 +282,9 @@
     "computer": "Computador",
     "confirm-subtask-delete-dialog": "Tem certeza que deseja apagar a sub-tarefa?",
     "confirm-checklist-delete-popup": "Are you sure you want to delete the checklist?",
-    "checklistDeletePopup-title": "Delete Checklist?",
+    "checklistDeletePopup-title": "Eliminar lista de verificação?",
     "copy-card-link-to-clipboard": "Copiar a ligação do cartão para a área de transferência",
-    "copy-text-to-clipboard": "Copy text to clipboard",
+    "copy-text-to-clipboard": "Copiar texto para a área de transferência",
     "linkCardPopup-title": "Ligar Cartão",
     "searchElementPopup-title": "Procurar",
     "copyCardPopup-title": "Copiar o cartão",
@@ -331,7 +331,7 @@
     "editCardStartDatePopup-title": "Alterar a data de início",
     "editCardDueDatePopup-title": "Alterar a data limite",
     "editCustomFieldPopup-title": "Editar Campo",
-    "addReactionPopup-title": "Add reaction",
+    "addReactionPopup-title": "Adicionar reação",
     "editCardSpentTimePopup-title": "Alterar o tempo gasto",
     "editLabelPopup-title": "Alterar a Etiqueta",
     "editNotificationPopup-title": "Editar a Notificação",
@@ -378,8 +378,8 @@
     "exportBoardPopup-title": "Exportar quadro",
     "exportCardPopup-title": "Exportar cartão",
     "sort": "Ordenar",
-    "sorted": "Sorted",
-    "remove-sort": "Remove sort",
+    "sorted": "Ordenado",
+    "remove-sort": "Remover ordenação",
     "sort-desc": "Clique para ordenar a Lista",
     "list-sort-by": "Ordenar a Lista por:",
     "list-label-modifiedAt": "Data do Último Acesso",
@@ -670,7 +670,7 @@
     "accounts-allowEmailChange": "Permitir Alteração do E-mail",
     "accounts-allowUserNameChange": "Permitir Alteração de Nome de Utilizador",
     "tableVisibilityMode-allowPrivateOnly": "Boards visibility: Allow private boards only",
-    "tableVisibilityMode": "Boards visibility",
+    "tableVisibilityMode": "Visibilidade do Quadro",
     "createdAt": "Criado em",
     "modifiedAt": "Modificado em",
     "verified": "Verificado",
@@ -1076,32 +1076,32 @@
     "minimize-card": "Minimizar Cartão",
     "delete-org-warning-message": "Não pode apagar esta organização, tem no mínimo um utilizador associado",
     "delete-team-warning-message": "Não pode apagar esta equipa, tem no mínimo um utilizador associado",
-    "subject": "Subject",
-    "details": "Details",
+    "subject": "Assunto",
+    "details": "Detalhes",
     "carbon-copy": "Carbon Copy (Cc:)",
     "ticket": "Ticket",
     "tickets": "Tickets",
-    "ticket-number": "Ticket Number",
-    "open": "Open",
-    "pending": "Pending",
-    "closed": "Closed",
-    "resolved": "Resolved",
-    "cancelled": "Cancelled",
-    "history": "History",
-    "request": "Request",
-    "requests": "Requests",
-    "help-request": "Help Request",
-    "editCardSortOrderPopup-title": "Change Sorting",
-    "cardDetailsPopup-title": "Card Details",
-    "add-teams": "Add teams",
+    "ticket-number": "Número do ticket",
+    "open": "Aberto",
+    "pending": "Pendente",
+    "closed": "Fechado",
+    "resolved": "Resolvido",
+    "cancelled": "Cancelado",
+    "history": "Histórico",
+    "request": "Pedido",
+    "requests": "Pedidos",
+    "help-request": "Pedido de ajuda",
+    "editCardSortOrderPopup-title": "Alterar ordenação",
+    "cardDetailsPopup-title": "Detalhes do cartão",
+    "add-teams": "Adicionar equipas",
     "add-teams-label": "Added teams are displayed below:",
     "remove-team-from-table": "Are you sure you want to remove this team from the board ?",
-    "confirm-btn": "Confirm",
+    "confirm-btn": "Confirmar",
     "remove-btn": "Remover",
-    "filter-card-title-label": "Filter by card title",
+    "filter-card-title-label": "Filtrar por título do cartão",
     "invite-people-success": "Invitation to register sent with success",
     "invite-people-error": "Error while sending invitation to register",
-    "can-invite-if-same-mailDomainName": "Email domain name",
+    "can-invite-if-same-mailDomainName": "Nome do domínio do e-mail",
     "to-create-teams-contact-admin": "To create teams, please contact the administrator.",
     "Node_heap_total_heap_size": "Node heap: total heap size",
     "Node_heap_total_heap_size_executable": "Node heap: total heap size executable",
@@ -1118,12 +1118,12 @@
     "Node_memory_usage_heap_total": "Node memory usage: total size of the allocated heap",
     "Node_memory_usage_heap_used": "Node memory usage: actual memory used",
     "Node_memory_usage_external": "Node memory usage: external",
-    "add-organizations": "Add organizations",
+    "add-organizations": "Adicionar organizações",
     "add-organizations-label": "Added organizations are displayed below:",
     "remove-organization-from-board": "Are you sure you want to remove this organization from this board ?",
     "to-create-organizations-contact-admin": "To create organizations, please contact administrator.",
     "custom-legal-notice-link-url": "Custom legal notice page URL",
     "acceptance_of_our_legalNotice": "By continuing, you accept our",
     "legalNotice": "legal notice",
-    "copied": "Copied!"
+    "copied": "Copiado!"
 }

i18n/zh-CN.i18n.json

@@ -281,8 +281,8 @@
     "worker-desc": "只能移动卡片，分配给卡片和评论",
     "computer": "从本机上传",
     "confirm-subtask-delete-dialog": "确定要删除子任务吗？",
-    "confirm-checklist-delete-popup": "Are you sure you want to delete the checklist?",
-    "checklistDeletePopup-title": "Delete Checklist?",
+    "confirm-checklist-delete-popup": "确定要删除清单吗？",
+    "checklistDeletePopup-title": "删除待办清单？",
     "copy-card-link-to-clipboard": "复制卡片链接到剪贴板",
     "copy-text-to-clipboard": "复制文本到剪贴板",
     "linkCardPopup-title": "链接卡片",

models/org.js

@@ -217,7 +217,7 @@ if (Meteor.isServer) {
   // Index for Organization name.
   Meteor.startup(() => {
     // Org._collection._ensureIndex({ name: -1 });
-    Org._collection._ensureIndex({ orgDisplayName: -1 });
+    Org._collection._ensureIndex({ orgDisplayName: 1 });
   });
 }
 

models/settings.js

@@ -227,7 +227,8 @@ if (Meteor.isServer) {
     try {
       const fullName = Users.findOne(icode.authorId)
                   && Users.findOne(icode.authorId).profile
-                  && Users.findOne(icode.authorId).profile !== undefined ?  Users.findOne(icode.authorId).profile.fullname : "";
+                  && Users.findOne(icode.authorId).profile !== undefined
+                  && Users.findOne(icode.authorId).profile.fullname ?  Users.findOne(icode.authorId).profile.fullname : "";
 
       const params = {
         email: icode.email,
@@ -273,6 +274,20 @@ if (Meteor.isServer) {
     }
   }
 
+  function isNonAdminAllowedToSendMail(currentUser){
+    const currSett = Settings.findOne({});
+    let isAllowed = false;
+    if(currSett && currSett != undefined && currSett.disableRegistration && currSett.mailDomainName !== undefined && currSett.mailDomainName != ""){
+      for(let i = 0; i < currentUser.emails.length; i++) {
+        if(currentUser.emails[i].address.endsWith(currSett.mailDomainName)){
+          isAllowed = true;
+          break;
+        }
+      }
+    }
+    return isAllowed;
+  }
+
   function isLdapEnabled() {
     return (
       process.env.LDAP_ENABLE === 'true' || process.env.LDAP_ENABLE === true
@@ -303,7 +318,7 @@ if (Meteor.isServer) {
       check(boards, [String]);
 
       const user = Users.findOne(Meteor.userId());
-      if (!user.isAdmin) {
+      if (!user.isAdmin && !isNonAdminAllowedToSendMail(user)) {
         rc = -1;
         throw new Meteor.Error('not-allowed');
       }

models/team.js

@@ -214,7 +214,7 @@ if (Meteor.isServer) {
 if (Meteor.isServer) {
   // Index for Team name.
   Meteor.startup(() => {
-    Team._collection._ensureIndex({ teamDisplayName: -1 });
+    Team._collection._ensureIndex({ teamDisplayName: 1 });
   });
 }
 

models/users.js

@@ -521,7 +521,7 @@ Users.helpers({
   },
   orgsUserBelongs() {
     if (this.orgs) {
-      return this.orgs.map(function(org){return org.orgDisplayName}).join(',');
+      return this.orgs.map(function(org){return org.orgDisplayName}).sort().join(',');
     }
     return '';
   },
@@ -533,7 +533,7 @@ Users.helpers({
   },
   teamsUserBelongs() {
     if (this.teams) {
-      return this.teams.map(function(team){ return team.teamDisplayName}).join(',');
+      return this.teams.map(function(team){ return team.teamDisplayName}).sort().join(',');
     }
     return '';
   },
@@ -1242,9 +1242,10 @@ if (Meteor.isServer) {
       }
 
       try {
-        const fullName = inviter.profile !== undefined ?  inviter.profile.fullname : "";
+        const fullName = inviter.profile !== undefined && inviter.profile.fullname !== undefined ?  inviter.profile.fullname : "";
+        const userFullName = user.profile !== undefined && user.profile.fullname !== undefined ?  user.profile.fullname : "";
         const params = {
-          user: user.username,
+          user: userFullName != "" ? userFullName + " (" + user.username + " )" : user.username,
           inviter: fullName != "" ? fullName + " (" + inviter.username + " )" : inviter.username,
           board: board.title,
           url: board.absoluteUrl(),
@@ -1682,10 +1683,20 @@ if (Meteor.isServer) {
     // If ldap, bypass the inviation code if the self registration isn't allowed.
     // TODO : pay attention if ldap field in the user model change to another content ex : ldap field to connection_type
     if (doc.authenticationMethod !== 'ldap' && disableRegistration) {
-      const invitationCode = InvitationCodes.findOne({
-        code: doc.profile.icode,
-        valid: true,
-      });
+      let invitationCode = null;
+      if(doc.authenticationMethod.toLowerCase() == 'oauth2')
+      { // OIDC authentication mode
+        invitationCode = InvitationCodes.findOne({
+          email: doc.emails[0].address.toLowerCase(),
+          valid: true,
+        });
+      }
+      else{
+        invitationCode = InvitationCodes.findOne({
+          code: doc.profile.icode,
+          valid: true,
+        });
+      }
       if (!invitationCode) {
         throw new Meteor.Error('error-invitation-code-not-exist');
       } else {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.83.0",
+  "version": "v5.85.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v5.83.0",
+  "version": "v5.85.0",
   "description": "Open-Source kanban",
   "private": true,
   "repository": {

public/api/wekan.html

@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Wekan REST API v5.83</title>
+    <title>Wekan REST API v5.85</title>
 
     <style>
     </style>
@@ -1555,7 +1555,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.83">Wekan REST API v5.83</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v5.85">Wekan REST API v5.85</a>
             
           </li>
         
@@ -2128,7 +2128,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v5.83</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v5.85</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>

public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v5.83
+  version: v5.85
   description: |
     The REST API allows you to control and extend Wekan with ease.
 

rebuild-wekan.bat

@@ -18,8 +18,8 @@ REM Install chocolatey
 
 choco install -y git curl python2 dotnet4.5.2 nano mongodb-4 mongoclient
 
-curl -O https://nodejs.org/dist/v12.22.7/node-v12.22.7-x64.msi
-call node-v12.22.7-x64.msi
+curl -O https://nodejs.org/dist/v12.22.8/node-v12.22.8-x64.msi
+call node-v12.22.8-x64.msi
 
 call npm config -g set msvs_version 2015
 call meteor npm config -g set msvs_version 2015

rebuild-wekan.sh

@@ -30,7 +30,7 @@ do
 			#curl -0 -L https://npmjs.org/install.sh | sudo sh
 			#sudo chown -R $(id -u):$(id -g) $HOME/.npm
 			#sudo npm -g install n
-			#sudo n 12.22.7
+			#sudo n 12.22.8
 		elif [[ "$OSTYPE" == "darwin"* ]]; then
 		        echo "macOS";
 			pause '1) Install XCode 2) Install Node 12.x from https://nodejs.org/en/ 3) Press [Enter] key to continue.'

sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 583,
+    appVersion = 585,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "5.83.0~2021-11-30"),
+    appMarketingVersion = (defaultText = "5.85.0~2021-12-17"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

snapcraft.yaml

@@ -1,5 +1,5 @@
 name: wekan
-version: '5.83'
+version: '5.85'
 summary: Open Source kanban
 description: |
    WeKan ® is an Open Source and collaborative kanban board application.
@@ -80,7 +80,7 @@ parts:
     wekan:
         source: .
         plugin: nodejs
-        node-engine: 12.22.7
+        node-engine: 12.22.8
         node-packages:
             - node-gyp
             - node-pre-gyp

stacksmith/user-scripts/build.sh

@@ -2,7 +2,7 @@
 set -euxo pipefail
 
 BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA"
-NODE_VERSION=v12.22.7
+NODE_VERSION=v12.22.8
 #METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer
 USE_EDGE=false
 METEOR_EDGE=1.5-beta.17