summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-12-20 16:03:46 +0200
committerLauri Ojansivu <x@xet7.org>2019-12-20 16:03:46 +0200
commit782d0b620988628f40f50f9cd824f6652cfb0dd9 (patch)
tree7af06a090aef2f9242c9a0afc7c9f1ce104ca021
parent8dcd360f939febef3dc6bc0a1f3eac38664b2815 (diff)
downloadwekan-782d0b620988628f40f50f9cd824f6652cfb0dd9.tar.gz
wekan-782d0b620988628f40f50f9cd824f6652cfb0dd9.tar.bz2
wekan-782d0b620988628f40f50f9cd824f6652cfb0dd9.zip
Upgrade to Meteor 1.8.3 and Node 8.17.0.
Update release scripts. Fix ldap background sync documentation part 2. Thanks to xet7 !
-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--Dockerfile2
-rw-r--r--docker-compose.yml4
-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
17 files changed, 34 insertions, 34 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/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/docker-compose.yml b/docker-compose.yml
index 7d8b3453..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.
+ # 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_INTERVAL='every 1 hour'
#
#- LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED=false
#
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