Explorar o código

Upgrade to Meteor 1.8.3 and Node 8.17.0.
Update release scripts.
Fix ldap background sync documentation part 2.

Thanks to xet7 !

Lauri Ojansivu %!s(int64=5) %!d(string=hai) anos
pai
achega
782d0b6209

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

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

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

+ 1 - 1
.meteor/release

@@ -1 +1 @@
-METEOR@1.8.2
+METEOR@1.8.3

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

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

+ 1 - 1
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 \

+ 2 - 2
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
       #

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

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

+ 1 - 1
releases/sandstorm-make-spk.sh

@@ -1 +1 @@
-meteor-spk pack wekan-1.11.spk
+meteor-spk pack wekan-$1.spk

+ 1 - 1
releases/snap-install.sh

@@ -1 +1 @@
-sudo snap install --dangerous wekan_1.23-17-g9c94ea5_amd64.snap
+sudo snap install --dangerous wekan_*.snap

+ 1 - 1
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"
 

+ 4 - 4
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'"

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

+ 1 - 2
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

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