summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.devcontainer/Dockerfile2
-rw-r--r--.meteor/.finished-upgraders1
-rw-r--r--.meteor/packages6
-rw-r--r--.meteor/release2
-rw-r--r--.meteor/versions16
-rw-r--r--.travis.yml2
-rw-r--r--CHANGELOG.md19
-rw-r--r--Dockerfile2
-rw-r--r--client/components/activities/comments.js3
-rw-r--r--client/components/users/userHeader.js34
-rw-r--r--docker-compose.yml8
-rw-r--r--i18n/de.i18n.json4
-rw-r--r--i18n/fa.i18n.json2
-rw-r--r--i18n/he.i18n.json4
-rw-r--r--i18n/nl.i18n.json70
-rw-r--r--i18n/sl.i18n.json4
-rw-r--r--rebuild-wekan.bat4
-rwxr-xr-xrebuild-wekan.sh2
-rwxr-xr-xreleases/sandstorm-make-spk.sh2
-rwxr-xr-xreleases/snap-install.sh2
-rwxr-xr-xsnap-src/bin/config2
-rwxr-xr-xsnap-src/bin/wekan-help8
-rw-r--r--snapcraft.yaml2
-rwxr-xr-xstacksmith/user-scripts/build.sh3
-rw-r--r--torodb-postgresql/docker-compose.yml8
25 files changed, 104 insertions, 108 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c2be3595..fa17ff1f 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
ENV \
DEBUG=false \
- NODE_VERSION=8.16.2 \
+ NODE_VERSION=8.17.0 \
METEOR_RELEASE=1.8.1 \
USE_EDGE=false \
METEOR_EDGE=1.5-beta.17 \
diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders
index 8f397c7d..bc5b50f7 100644
--- a/.meteor/.finished-upgraders
+++ b/.meteor/.finished-upgraders
@@ -17,3 +17,4 @@ notices-for-facebook-graph-api-2
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
1.7-split-underscore-from-meteor-base
+1.8.3-split-jquery-from-blaze
diff --git a/.meteor/packages b/.meteor/packages
index 7fa85bee..8d25f206 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -6,9 +6,9 @@
meteor-base@1.4.0
# Build system
-ecmascript@0.13.0
+ecmascript@0.13.2
standard-minifier-css@1.5.4
-standard-minifier-js@2.5.0
+standard-minifier-js@2.5.2
mquandalle:jade
# Polyfills
@@ -75,7 +75,7 @@ horka:swipebox
dynamic-import@0.5.1
staringatlights:fast-render
-accounts-password@1.5.1
+accounts-password@1.5.2
cfs:gridfs
rzymek:fullcalendar
momentjs:moment@2.22.2
diff --git a/.meteor/release b/.meteor/release
index 250a263b..bfccdc2c 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.8.2
+METEOR@1.8.3
diff --git a/.meteor/versions b/.meteor/versions
index 2b21c42e..ce5a6635 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,7 +1,7 @@
3stack:presence@1.1.2
accounts-base@1.4.5
accounts-oauth@1.1.16
-accounts-password@1.5.1
+accounts-password@1.5.2
aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0
@@ -12,11 +12,11 @@ allow-deny@1.1.0
arillo:flow-router-helpers@0.5.2
audit-argument-checks@1.0.7
autoupdate@1.6.0
-babel-compiler@7.4.0
+babel-compiler@7.4.2
babel-runtime@1.4.0
base64@1.0.12
binary-heap@1.0.11
-blaze@2.3.3
+blaze@2.3.4
blaze-tools@1.0.10
boilerplate-generator@1.6.0
browser-policy-common@1.0.11
@@ -57,11 +57,11 @@ deps@1.0.12
diff-sequence@1.1.1
dynamic-import@0.5.1
easylogic:summernote@0.8.8
-ecmascript@0.13.0
+ecmascript@0.13.2
ecmascript-runtime@0.7.0
ecmascript-runtime-client@0.9.0
ecmascript-runtime-server@0.8.0
-ejson@1.1.0
+ejson@1.1.1
email@1.2.3
es5-shim@4.8.0
fastclick@1.0.13
@@ -91,7 +91,7 @@ logging@1.1.20
lucasantoniassi:accounts-lockout@1.0.0
matb33:collection-hooks@0.9.1
matteodem:easy-search@1.6.4
-mdg:meteor-apm-agent@3.2.3
+mdg:meteor-apm-agent@3.2.5
mdg:validation-error@0.5.1
meteor@1.9.3
meteor-base@1.4.0
@@ -102,7 +102,7 @@ meteorhacks:picker@1.0.3
meteorhacks:subs-manager@1.6.4
meteorspark:util@0.2.0
minifier-css@1.4.3
-minifier-js@2.5.0
+minifier-js@2.5.1
minifiers@1.1.8-faster-rebuild.0
minimongo@1.4.5
mobile-status-bar@1.0.14
@@ -168,7 +168,7 @@ spacebars@1.0.15
spacebars-compiler@1.1.3
srp@1.0.12
standard-minifier-css@1.5.4
-standard-minifier-js@2.5.0
+standard-minifier-js@2.5.2
staringatlights:fast-render@3.2.0
staringatlights:inject-data@2.3.0
tap:i18n@1.8.2
diff --git a/.travis.yml b/.travis.yml
index 6f0a9e0a..68bd678a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ sudo: required
env:
TRAVIS_DOCKER_COMPOSE_VERSION: 1.24.0
- TRAVIS_NODE_VERSION: 8.16.2
+ TRAVIS_NODE_VERSION: 8.17.0
TRAVIS_NPM_VERSION: latest
before_install:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e619d7b8..5ca82ea4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,20 @@
# Upcoming Wekan release
-This release fixes the following bugs:
+This release adds the following updates:
+
+- [Upgrade to Meteor 1.8.3 and Node 8.17.0. Update release scripts. Fix ldap background sync documentation part 2](https://github.com/wekan/wekan/commit/782d0b620988628f40f50f9cd824f6652cfb0dd9).
+
+and fixes the following bugs:
- [Fix: Don't add a blank space for empty custom fields on minicards](https://github.com/wekan/wekan/commit/e2a374f0aad8489a84d6de9966c281a812b5eca3).
Thanks to roobre and xet7.
- [Fix: Allow to set empty card title, AssignedBy and RequestedBy](https://github.com/wekan/wekan/commit/25561946edf37351f67cf7500902dde7d9114d2f).
Thanks to justinr1234 and xet7.
+- [Fix comment text disappearing when clicking outside of comment text area.
+ Fix lint error.](https://github.com/wekan/wekan/commit/3b3950369ce07aa9e6fc4ab1bef9fb8a4993e398).
+ Thanks to xet7.
+- [Fix ldap background sync documentation](https://github.com/wekan/wekan/pull/2855).
+ Thanks to koelle25.
Thanks to above GitHub users for their contributions and translators for their translations.
@@ -116,7 +125,7 @@ This release adds the following new features:
mode](https://github.com/wekan/wekan/commits/77f8b76d4e13c35ea3451622176bbb69a4d39a32).
Thanks to whowillcare.
- Allow user to sort Lists in Board by his own preference boardadmin can star
- list [1](https://github.com/wekan/wekan/commit/bc2a20f04e32607f8488a9cecd815647fb43e40e),
+ list [1](https://github.com/wekan/wekan/commit/bc2a20f04e32607f8488a9cecd815647fb43e40e),
[2](https://github.com/wekan/wekan/commit/bc2a20f04e32607f8488a9cecd815647fb43e40e).
Thanks to whowillcare.
- [Allowing user to filter list in Filter function not just cards
@@ -233,7 +242,7 @@ This release adds the following new features:
NOTIFY_DUE_DAYS_BEFORE_AND_AFTER = 2,0 it means notification will be sent on both due day and two days before.
Thanks to whowillcare.
- [Added modifications the help files, related to NOTIFY_DUE_DAYS_BEFORE_AND_AFTER](https://github.com/wekan/wekan/pull/2740).
- Thanks to whowillcare.
+ Thanks to whowillcare.
and fixes the following bugs:
@@ -284,7 +293,7 @@ This release adds the following new features:
- [More Mobile and Desktop drag handles for Swimlanes/Lists/Cards. Part 1](https://github.com/wekan/wekan/commit/ff550e91103115e7b731dd80c4588b93b2d4c64f).
Thanks to xet7.
-
+
Thanks to above GitHub users for their contributions and translators for their translations.
# v3.40 2019-09-11 Wekan release
@@ -693,7 +702,7 @@ This release fixes the following bugs:
- [Add missing dependencies back and revert deleting phantomjs](https://github.com/wekan/wekan/commit/32e9aa0ddaf1b015825b8c62ad17ed74b449e4b1).
Thanks to whowillcare and xet7.
-
+
Thanks to above GitHub users for their contributions and translators for their translations.
# v3.09 2019-08-07 Wekan release
diff --git a/Dockerfile b/Dockerfile
index 41df2126..62c60390 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ LABEL maintainer="wekan"
# ENV BUILD_DEPS="paxctl"
ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-essential git ca-certificates python3" \
DEBUG=false \
- NODE_VERSION=v8.16.2 \
+ NODE_VERSION=v8.17.0 \
METEOR_RELEASE=1.8.1 \
USE_EDGE=false \
METEOR_EDGE=1.5-beta.17 \
diff --git a/client/components/activities/comments.js b/client/components/activities/comments.js
index 95084646..50ca019b 100644
--- a/client/components/activities/comments.js
+++ b/client/components/activities/comments.js
@@ -16,9 +16,6 @@ BlazeComponent.extendComponent({
events() {
return [
{
- 'click .js-new-comment:not(.focus)'() {
- commentFormIsOpen.set(true);
- },
'submit .js-new-comment-form'(evt) {
const input = this.getInput();
const text = input.val().trim();
diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js
index e0c6218e..5f36ef54 100644
--- a/client/components/users/userHeader.js
+++ b/client/components/users/userHeader.js
@@ -180,24 +180,20 @@ Template.changeSettingsPopup.helpers({
currentUser = Meteor.user();
if (currentUser) {
return (currentUser.profile || {}).showDesktopDragHandles;
+ } else if (cookies.has('showDesktopDragHandles')) {
+ return true;
} else {
- if (cookies.has('showDesktopDragHandles')) {
- return true;
- } else {
- return false;
- }
+ return false;
}
},
hiddenSystemMessages() {
currentUser = Meteor.user();
if (currentUser) {
return (currentUser.profile || {}).hasHiddenSystemMessages;
+ } else if (cookies.has('hasHiddenSystemMessages')) {
+ return true;
} else {
- if (cookies.has('hasHiddenSystemMessages')) {
- return true;
- } else {
- return false;
- }
+ return false;
}
},
showCardsCountAt() {
@@ -205,8 +201,6 @@ Template.changeSettingsPopup.helpers({
if (currentUser) {
return Meteor.user().getLimitToShowCardsCount();
} else {
- import { Cookies } from 'meteor/ostrio:cookies';
- const cookies = new Cookies();
return cookies.get('limitToShowCardsCount');
}
},
@@ -217,24 +211,20 @@ Template.changeSettingsPopup.events({
currentUser = Meteor.user();
if (currentUser) {
Meteor.call('toggleDesktopDragHandles');
+ } else if (cookies.has('showDesktopDragHandles')) {
+ cookies.remove('showDesktopDragHandles');
} else {
- if (cookies.has('showDesktopDragHandles')) {
- cookies.remove('showDesktopDragHandles');
- } else {
- cookies.set('showDesktopDragHandles', 'true');
- }
+ cookies.set('showDesktopDragHandles', 'true');
}
},
'click .js-toggle-system-messages'() {
currentUser = Meteor.user();
if (currentUser) {
Meteor.call('toggleSystemMessages');
+ } else if (cookies.has('hasHiddenSystemMessages')) {
+ cookies.remove('hasHiddenSystemMessages');
} else {
- if (cookies.has('hasHiddenSystemMessages')) {
- cookies.remove('hasHiddenSystemMessages');
- } else {
- cookies.set('hasHiddenSystemMessages', 'true');
- }
+ cookies.set('hasHiddenSystemMessages', 'true');
}
},
'click .js-apply-show-cards-at'(event, templateInstance) {
diff --git a/docker-compose.yml b/docker-compose.yml
index a0e641c1..2d5f747d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -440,10 +440,10 @@ services:
# If the sync of the users should be done in the background
#- LDAP_BACKGROUND_SYNC=false
#
- # At which interval does the background task sync in milliseconds.
- # Leave this unset, so it uses default, and does not crash.
- # https://github.com/wekan/wekan/issues/2354#issuecomment-515305722
- - LDAP_BACKGROUND_SYNC_INTERVAL=''
+ # At which interval does the background task sync.
+ # The format must be as specified in:
+ # https://bunkat.github.io/later/parsers.html#text
+ #- LDAP_BACKGROUND_SYNC_INTERVAL='every 1 hour'
#
#- LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
#
diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index ac4c7173..3704b5b9 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -223,8 +223,8 @@
"comment-only-desc": "Kann Karten nur kommentieren.",
"no-comments": "Keine Kommentare",
"no-comments-desc": "Kann keine Kommentare und Aktivitäten sehen.",
- "worker": "Worker",
- "worker-desc": "Can only move cards, assign itself to card and comment.",
+ "worker": "Arbeiter",
+ "worker-desc": "Kann nur Karten verschieben, sich selbst zuweisen und kommentieren.",
"computer": "Computer",
"confirm-subtask-delete-dialog": "Wollen Sie die Teilaufgabe wirklich löschen?",
"confirm-checklist-delete-dialog": "Wollen Sie die Checkliste wirklich löschen?",
diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json
index e35cca5f..9b5f686c 100644
--- a/i18n/fa.i18n.json
+++ b/i18n/fa.i18n.json
@@ -699,7 +699,7 @@
"r-swimlane-name": "نام مسیر شناور",
"r-board-note": "نکته: برای نمایش موارد ممکن کادر را خالی بگذارید.",
"r-checklist-note": "نکته: چک‌لیست‌ها باید توسط کاما از یک‌دیگر جدا شوند.",
- "r-when-a-card-is-moved": "دمانی که یک کارت به لیست دیگری منتقل شد",
+ "r-when-a-card-is-moved": "زمانی که یک کارت به لیست دیگری منتقل شد",
"r-set": "Set",
"r-update": "Update",
"r-datefield": "date field",
diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json
index 44a940a7..e364d884 100644
--- a/i18n/he.i18n.json
+++ b/i18n/he.i18n.json
@@ -223,8 +223,8 @@
"comment-only-desc": "ניתן להגיב על כרטיסים בלבד.",
"no-comments": "אין הערות",
"no-comments-desc": "לא ניתן לצפות בתגובות ובפעילויות.",
- "worker": "Worker",
- "worker-desc": "Can only move cards, assign itself to card and comment.",
+ "worker": "עובד/ת",
+ "worker-desc": "אפשר רק להעביר כרטיסים, להקצות כרטיסים לעצמו/ה ולהגיב.",
"computer": "מחשב",
"confirm-subtask-delete-dialog": "למחוק את תת המשימה?",
"confirm-checklist-delete-dialog": "למחוק את רשימת המשימות?",
diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json
index 7a27894e..179d3291 100644
--- a/i18n/nl.i18n.json
+++ b/i18n/nl.i18n.json
@@ -1,45 +1,45 @@
{
"accept": "Accepteren",
"act-activity-notify": "Activiteiten Notificatie",
- "act-addAttachment": "bijlage __attachment__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-deleteAttachment": "bijlage __attachment__ verwijderd op kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
- "act-addSubtask": "subtaak __subtask__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-addLabel": "Label __label__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-addedLabel": "Label __label__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-removeLabel": "Label __label__ verwijderd van kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
- "act-removedLabel": "Label __label__ verwijderd van kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
- "act-addChecklist": "checklist __checklist__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-addChecklistItem": "checklist item __checklistItem__ toegevoegd aan checklist __checklist__ op kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-removeChecklist": "checklist __checklist__ verwijderd van kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
- "act-removeChecklistItem": "checklist item __checklistItem__ verwijderd van checklist __checkList__ op kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
- "act-checkedItem": "__checklistItem__ aangevinkt van checklist __checklist__ op kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-uncheckedItem": "__checklistItem__ uitgevinkt van checklist __checklist__ op kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
- "act-completeChecklist": "checklist __checklist__ afgewerkt op kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-uncompleteChecklist": "checklist __checklist__ onafgewerkt op kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
+ "act-addAttachment": "heeft bijlage __attachment__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-deleteAttachment": "heeft bijlage __attachment__ verwijderd op kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
+ "act-addSubtask": "heeft subtaak __subtask__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-addLabel": "heeft label __label__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-addedLabel": "heeft label __label__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-removeLabel": "heeft label __label__ verwijderd van kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
+ "act-removedLabel": "heeft label __label__ verwijderd van kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
+ "act-addChecklist": "heeft checklist __checklist__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-addChecklistItem": "heeft checklist item __checklistItem__ toegevoegd aan checklist __checklist__ op kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-removeChecklist": "heeft checklist __checklist__ verwijderd van kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
+ "act-removeChecklistItem": "heeft checklist item __checklistItem__ verwijderd van checklist __checkList__ op kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
+ "act-checkedItem": "heeft __checklistItem__ aangevinkt van checklist __checklist__ op kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-uncheckedItem": "heeft __checklistItem__ uitgevinkt van checklist __checklist__ op kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
+ "act-completeChecklist": "heeft checklist __checklist__ afgewerkt op kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-uncompleteChecklist": "heeft checklist __checklist__ onafgewerkt op kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
"act-addComment": "heeft aantekening toegevoegd aan kaart __card__: __comment__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
"act-editComment": "heeft aantekening gewijzigd op kaart __card__: __comment__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
"act-deleteComment": "heeft aantekening verwijderd van kaart __card__: __comment__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
"act-createBoard": "bord __board__ aangemaakt",
"act-createSwimlane": "swimlane __swimlane__ aangemaakt op bord __board__",
- "act-createCard": "kaart __card__ aangemaakt in lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-createCustomField": "maatwerkveld __customField__ aangemaakt op bord __board__",
- "act-deleteCustomField": "maatwerkveld __customField__ verwijderd van bord __board__",
- "act-setCustomField": "maatwerkveld gewijzigd __customField__: __customFieldValue__ op kaart __card__ in lijst __list__ uit swimlane __swimlane__ op bord __board__",
+ "act-createCard": "heeft kaart __card__ aangemaakt in lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-createCustomField": "heeft maatwerkveld __customField__ aangemaakt op bord __board__",
+ "act-deleteCustomField": "heeft maatwerkveld __customField__ verwijderd van bord __board__",
+ "act-setCustomField": "heeft maatwerkveld gewijzigd __customField__: __customFieldValue__ op kaart __card__ in lijst __list__ uit swimlane __swimlane__ op bord __board__",
"act-createList": "lijst __list__ toegevoegd aan bord __board__",
- "act-addBoardMember": "lid __member__ toegevoegd aan bord __board__",
+ "act-addBoardMember": "heeft lid __member__ toegevoegd aan bord __board__",
"act-archivedBoard": "Bord __board__ verplaatst naar Archief",
- "act-archivedCard": "Kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__ verplaatst naar Archief",
+ "act-archivedCard": "heeft kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__ verplaatst naar Archief",
"act-archivedList": "Lijst __list__ uit swimlane __swimlane__ op bord __board__ verplaatst naar Archief",
"act-archivedSwimlane": "Swimlane __swimlane__ op bord __board__ verplaatst naar Archief",
"act-importBoard": "bord __board__ geïmporteerd",
- "act-importCard": "kaart __card__ geïmporteerd in lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-importCard": "heeft kaart __card__ geïmporteerd in lijst __list__ in swimlane __swimlane__ op bord __board__",
"act-importList": "lijst __list__ geïmporteerd in swimlane __swimlane__ op bord __board__",
- "act-joinMember": "lid __member__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-joinMember": "heeft lid __member__ toegevoegd aan kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
"act-moveCard": "heeft kaart __card__ verplaatst op bord __board__ van lijst __oldList__ uit swimlane __oldSwimlane__ naar lijst __list__ in swimlane __swimlane__",
- "act-moveCardToOtherBoard": "kaart __card__ verplaatst van lijst __oldList__ uit swimlane __oldSwimlane__ op bord __oldBoard__ naar lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-removeBoardMember": "lid __member__ verwijderd van bord __board__",
- "act-restoredCard": "kaart __card__ teruggehaald naar lijst __list__ in swimlane __swimlane__ op bord __board__",
- "act-unjoinMember": "lid __member__ verwijderd van kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
+ "act-moveCardToOtherBoard": "heeft kaart __card__ verplaatst van lijst __oldList__ uit swimlane __oldSwimlane__ op bord __oldBoard__ naar lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-removeBoardMember": "heeft lid __member__ verwijderd van bord __board__",
+ "act-restoredCard": "heeft kaart __card__ teruggehaald naar lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "act-unjoinMember": "heeft lid __member__ verwijderd van kaart __card__ van lijst __list__ uit swimlane __swimlane__ op bord __board__",
"act-withBoardTitle": "__board__",
"act-withCardTitle": "[__board__] __card__",
"actions": "Acties",
@@ -64,14 +64,14 @@
"activity-unchecked-item": "%s uitgevinkt in checklist %s van %s",
"activity-checklist-added": "checklist toegevoegd aan %s",
"activity-checklist-removed": "checklist verwijderd van %s",
- "activity-checklist-completed": "checklist __checklist__ afgewerkt op kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "activity-checklist-completed": "heeft checklist __checklist__ afgewerkt op kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
"activity-checklist-uncompleted": "checklist %s onafgewerkt van %s",
"activity-checklist-item-added": "checklist item toegevoegd aan '%s' in '%s'",
"activity-checklist-item-removed": "checklist item verwijderd van '%s' in %s",
"add": "Toevoegen",
"activity-checked-item-card": "%s aangevinkt in checklist %s",
"activity-unchecked-item-card": "%s uitgevinkt in checklist %s",
- "activity-checklist-completed-card": "checklist __checklist__ afgewerkt op kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
+ "activity-checklist-completed-card": "heeft checklist __checklist__ afgewerkt op kaart __card__ van lijst __list__ in swimlane __swimlane__ op bord __board__",
"activity-checklist-uncompleted-card": "checklist %s onafgewerkt",
"activity-editComment": "aantekening gewijzigd %s",
"activity-deleteComment": "aantekening verwijderd %s",
@@ -154,7 +154,7 @@
"card-edit-custom-fields": "Wijzig maatwerkvelden",
"card-edit-labels": "Wijzig labels",
"card-edit-members": "Wijzig leden",
- "card-labels-title": "Wijzig de labels vam de kaart.",
+ "card-labels-title": "Wijzig de labels van de kaart.",
"card-members-title": "Voeg of verwijder leden van het bord toe aan de kaart.",
"card-start": "Begin",
"card-start-on": "Begint op",
@@ -223,8 +223,8 @@
"comment-only-desc": "Kan alleen op kaarten aantekenen.",
"no-comments": "Geen aantekeningen",
"no-comments-desc": "Zie geen aantekeningen of activiteiten.",
- "worker": "Worker",
- "worker-desc": "Can only move cards, assign itself to card and comment.",
+ "worker": "Medewerker",
+ "worker-desc": "Kan alleen kaarten verplaatsen, zichzelf aan kaarten koppelen en aantekeningen maken.",
"computer": "Computer",
"confirm-subtask-delete-dialog": "Weet je zeker dat je de subtaak wilt verwijderen?",
"confirm-checklist-delete-dialog": "Weet je zeker dat je de checklist wilt verwijderen?",
@@ -732,9 +732,9 @@
"loading": "Laden, even geduld.",
"previous_as": "laatste keer was",
"act-a-dueAt": "heeft vervaldatum gewijzigd naar \nOp: __timeValue__\nKaart: __card__\noude vervaldatum was __timeOldValue__",
- "act-a-endAt": "einddatum gewijzigd naar __timeValue__ van (__timeOldValue__)",
- "act-a-startAt": "begindatum gewijzigd naar __timeValue__ van (__timeOldValue__)",
- "act-a-receivedAt": "ontvangstdatum gewijzigd naar __timeValue__ van (__timeOldValue__)",
+ "act-a-endAt": "heeft einddatum gewijzigd naar __timeValue__ van (__timeOldValue__)",
+ "act-a-startAt": "heeft begindatum gewijzigd naar __timeValue__ van (__timeOldValue__)",
+ "act-a-receivedAt": "heeft ontvangstdatum gewijzigd naar __timeValue__ van (__timeOldValue__)",
"a-dueAt": "vervaldatum gewijzigd naar",
"a-endAt": "einddatum gewijzigd naar",
"a-startAt": "begindatum gewijzigd naar",
diff --git a/i18n/sl.i18n.json b/i18n/sl.i18n.json
index c148ec21..f3e30e82 100644
--- a/i18n/sl.i18n.json
+++ b/i18n/sl.i18n.json
@@ -223,8 +223,8 @@
"comment-only-desc": "Lahko komentirate samo na karticah.",
"no-comments": "Ni komentarjev",
"no-comments-desc": "Ne morete videti komentarjev in dejavnosti.",
- "worker": "Worker",
- "worker-desc": "Can only move cards, assign itself to card and comment.",
+ "worker": "Delavec",
+ "worker-desc": "Lahko samo premikam kartice, se dodelim na kartico in komentiram.",
"computer": "Računalnik",
"confirm-subtask-delete-dialog": "Ste prepričani, da želite izbrisati podopravilo?",
"confirm-checklist-delete-dialog": "Ste prepričani, da želite izbrisati kontrolni seznam?",
diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat
index 346a4aec..486289c1 100644
--- a/rebuild-wekan.bat
+++ b/rebuild-wekan.bat
@@ -13,8 +13,8 @@ REM Install chocolatey
choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor
-curl -O https://nodejs.org/dist/v8.16.2/node-v8.16.2-x64.msi
-call node-v8.16.2-x64.msi
+curl -O https://nodejs.org/dist/v8.17.0/node-v8.17.0-x64.msi
+call node-v8.17.0-x64.msi
call npm config -g set msvs_version 2015
call meteor npm config -g set msvs_version 2015
diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh
index 8381e170..03279ce7 100755
--- a/rebuild-wekan.sh
+++ b/rebuild-wekan.sh
@@ -79,7 +79,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 8.16.2
+ sudo n 8.17.0
#curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
#sudo apt-get install -y nodejs
elif [[ "$OSTYPE" == "darwin"* ]]; then
diff --git a/releases/sandstorm-make-spk.sh b/releases/sandstorm-make-spk.sh
index 8db2a4c3..ade97666 100755
--- a/releases/sandstorm-make-spk.sh
+++ b/releases/sandstorm-make-spk.sh
@@ -1 +1 @@
-meteor-spk pack wekan-1.11.spk
+meteor-spk pack wekan-$1.spk
diff --git a/releases/snap-install.sh b/releases/snap-install.sh
index bdb0b7a2..75567e16 100755
--- a/releases/snap-install.sh
+++ b/releases/snap-install.sh
@@ -1 +1 @@
-sudo snap install --dangerous wekan_1.23-17-g9c94ea5_amd64.snap
+sudo snap install --dangerous wekan_*.snap
diff --git a/snap-src/bin/config b/snap-src/bin/config
index 21e2608d..8f1bfabd 100755
--- a/snap-src/bin/config
+++ b/snap-src/bin/config
@@ -278,7 +278,7 @@ DESCRIPTION_LDAP_BACKGROUND_SYNC="If the sync of the users should be done in the
DEFAULT_LDAP_BACKGROUND_SYNC="false"
KEY_LDAP_BACKGROUND_SYNC="ldap-background-sync"
-DESCRIPTION_LDAP_BACKGROUND_SYNC_INTERVAL="At which interval does the background task sync in milliseconds"
+DESCRIPTION_LDAP_BACKGROUND_SYNC_INTERVAL="At which interval does the background task sync"
DEFAULT_LDAP_BACKGROUND_SYNC_INTERVAL=""
KEY_LDAP_BACKGROUND_SYNC_INTERVAL="ldap-background-sync-interval"
diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index 6df3a1b4..1dc952b2 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -295,10 +295,10 @@ echo -e "If the sync of the users should be done in the background:"
echo -e "\t$ snap set $SNAP_NAME ldap-background-sync='true'"
echo -e "\n"
echo -e "Ldap Background Sync Interval."
-echo -e "At which interval does the background task sync in milliseconds."
-echo -e "Leave this unset, so it uses default, and does not crash."
-echo -e "https://github.com/wekan/wekan/issues/2354#issuecomment-515305722"
-echo -e "\t$ snap set $SNAP_NAME ldap-background-sync-interval=''"
+echo -e "At which interval does the background task sync."
+echo -e "The format must be as specified in: https://bunkat.github.io/later/parsers.html#text"
+echo -e "Default is empty '' that is same as 'every 1 hour'"
+echo -e "\t$ snap set $SNAP_NAME ldap-background-sync-interval='every 1 hour'"
echo -e "\n"
echo -e "Ldap Background Sync Keep Existant Users Updated."
echo -e "\t$ snap set $SNAP_NAME ldap-background-sync-keep-existant-users-updated='true'"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 41f1585c..2f965fe1 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -81,7 +81,7 @@ parts:
wekan:
source: .
plugin: nodejs
- node-engine: 8.16.2
+ node-engine: 8.17.0
node-packages:
- node-gyp
- node-pre-gyp
diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh
index 23dc7f84..8a7ba3e3 100755
--- a/stacksmith/user-scripts/build.sh
+++ b/stacksmith/user-scripts/build.sh
@@ -2,14 +2,13 @@
set -euxo pipefail
BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA"
-NODE_VERSION=v8.16.2
+NODE_VERSION=v8.17.0
#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
NPM_VERSION=latest
FIBERS_VERSION=4.0.1
ARCHITECTURE=linux-x64
-#NODE_VERSION=v10.14.1
sudo yum groupinstall -y 'Development Tools'
sudo yum install -y http://opensource.wandisco.com/centos/7/git/x86_64/wandisco-git-release-7-2.noarch.rpm
diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml
index 550752a5..7a7ad9c8 100644
--- a/torodb-postgresql/docker-compose.yml
+++ b/torodb-postgresql/docker-compose.yml
@@ -396,10 +396,10 @@ services:
# example : LDAP_BACKGROUND_SYNC=true
#- LDAP_BACKGROUND_SYNC=false
#
- # LDAP_BACKGROUND_SYNC_INTERVAL : At which interval does the background task sync in milliseconds
- # Leave this unset, so it uses default, and does not crash.
- # https://github.com/wekan/wekan/issues/2354#issuecomment-515305722
- - LDAP_BACKGROUND_SYNC_INTERVAL=''
+ # At which interval does the background task sync.
+ # The format must be as specified in:
+ # https://bunkat.github.io/later/parsers.html#text
+ #- LDAP_BACKGROUND_SYNC_INTERVAL='every 1 hour'
#
# LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED :
# example : LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=true
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-01 20:17:44 +0000