summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-12-12 13:58:46 +0200
committerLauri Ojansivu <x@xet7.org>2017-12-12 13:58:46 +0200
commit8dd6255ebf7f3743b42eed670ab6bf2103321827 (patch)
treedfdc903cff568a54f0a97a5ce97eff41a88542c4
parent7a943f99e3453fcd68d778d5fe8c55c805015e94 (diff)
downloadwekan-8dd6255ebf7f3743b42eed670ab6bf2103321827.tar.gz
wekan-8dd6255ebf7f3743b42eed670ab6bf2103321827.tar.bz2
wekan-8dd6255ebf7f3743b42eed670ab6bf2103321827.zip
Revert back to Meteor v1.4, Node v4.8.6 and MongoDB v3.2.18
-rw-r--r--.meteor/packages29
-rw-r--r--.meteor/release2
-rw-r--r--.meteor/versions95
-rw-r--r--.travis.yml4
-rw-r--r--Dockerfile9
-rw-r--r--package.json14
-rw-r--r--snapcraft.yaml14
7 files changed, 81 insertions, 86 deletions
diff --git a/.meteor/packages b/.meteor/packages
index 6a40d59b..7e67c10d 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -3,13 +3,13 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.
-meteor-base@1.2.0
+meteor-base@1.0.4
# Build system
-ecmascript@0.9.0
-stylus@2.513.13
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.0
+ecmascript@0.7.2
+stylus@2.513.9
+standard-minifier-css@1.3.4
+standard-minifier-js@2.0.0
mquandalle:jade
# Polyfills
@@ -24,11 +24,11 @@ dburles:collection-helpers
idmontie:migrations
matb33:collection-hooks
matteodem:easy-search
-mongo@1.3.0
+mongo@1.1.16
mquandalle:collection-mutations
# Account system
-accounts-password@1.5.0
+accounts-password@1.3.5
kenton:accounts-sandstorm
service-configuration@1.0.11
useraccounts:unstyled
@@ -38,9 +38,9 @@ useraccounts:flow-routing
check@1.2.5
jquery@1.11.10
random@1.0.10
-reactive-dict@1.2.0
+reactive-dict@1.1.8
session@1.1.7
-tracker@1.1.3
+tracker@1.1.2
underscore@1.0.10
3stack:presence
alethes:pages
@@ -48,6 +48,7 @@ arillo:flow-router-helpers
audit-argument-checks@1.0.7
kadira:blaze-layout
kadira:dochead
+meteorhacks:fast-render
meteorhacks:picker
meteorhacks:subs-manager
mquandalle:autofocus
@@ -55,7 +56,7 @@ mquandalle:moment
ongoworks:speakingurl
raix:handlebar-helpers
tap:i18n
-http@1.3.0
+http
# UI components
blaze
@@ -73,13 +74,9 @@ templates:tabs
verron:autosize
simple:json-routes
rajit:bootstrap3-datepicker
-shell-server@0.3.0
+kadira:flow-router
+shell-server@0.2.3
simple:rest-accounts-password
useraccounts:core
email@1.2.3
horka:swipebox
-dynamic-import
-staringatlights:fast-render
-staringatlights:flow-router
-
-mixmax:smart-disconnect
diff --git a/.meteor/release b/.meteor/release
index 0fa8d22d..605b4e1f 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.6
+METEOR@1.4.4.1
diff --git a/.meteor/versions b/.meteor/versions
index 2711db9e..38ee1e3f 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,23 +1,23 @@
-3stack:presence@1.1.2
-accounts-base@1.4.0
-accounts-password@1.5.0
+3stack:presence@1.0.5
+accounts-base@1.2.16
+accounts-password@1.3.5
aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0
aldeed:schema-index@1.1.1
aldeed:simple-schema@1.5.3
alethes:pages@1.8.6
-allow-deny@1.1.0
+allow-deny@1.0.9
arillo:flow-router-helpers@0.5.2
audit-argument-checks@1.0.7
autoupdate@1.3.12
-babel-compiler@6.24.7
-babel-runtime@1.1.1
+babel-compiler@6.18.2
+babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
blaze@2.3.2
blaze-tools@1.0.10
-boilerplate-generator@1.3.1
+boilerplate-generator@1.0.11
caching-compiler@1.1.9
caching-html-compiler@1.1.2
callback-hook@1.0.10
@@ -40,23 +40,19 @@ cfs:upload-http@0.0.20
cfs:worker@0.1.4
check@1.2.5
chuangbo:cookie@1.1.0
-coffeescript@1.12.7_3
-coffeescript-compiler@1.12.7_3
-cottz:publish-relations@2.0.8
+coffeescript@1.12.3_1
+cottz:publish-relations@2.0.7
dburles:collection-helpers@1.1.0
-ddp@1.4.0
-ddp-client@2.2.0
-ddp-common@1.3.0
+ddp@1.2.5
+ddp-client@1.3.4
+ddp-common@1.2.8
ddp-rate-limiter@1.0.7
-ddp-server@2.1.1
+ddp-server@1.3.14
deps@1.0.12
diff-sequence@1.0.7
-dynamic-import@0.2.1
-ecmascript@0.9.0
-ecmascript-runtime@0.5.0
-ecmascript-runtime-client@0.5.0
-ecmascript-runtime-server@0.5.0
-ejson@1.1.0
+ecmascript@0.7.3
+ecmascript-runtime@0.3.15
+ejson@1.0.13
email@1.2.3
es5-shim@4.6.15
fastclick@1.0.13
@@ -66,40 +62,40 @@ horka:swipebox@1.0.2
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
-http@1.3.0
+http@1.2.12
id-map@1.0.9
idmontie:migrations@1.0.3
jquery@1.11.10
kadira:blaze-layout@2.3.0
kadira:dochead@1.5.0
kadira:flow-router@2.12.1
-kenton:accounts-sandstorm@0.7.0
+kenton:accounts-sandstorm@0.6.0
launch-screen@1.1.1
livedata@1.0.18
-localstorage@1.2.0
-logging@1.1.19
+localstorage@1.0.12
+logging@1.1.17
matb33:collection-hooks@0.8.4
matteodem:easy-search@1.6.4
mdg:validation-error@0.5.1
-meteor@1.8.2
-meteor-base@1.2.0
+meteor@1.6.1
+meteor-base@1.0.4
meteor-platform@1.2.6
meteorhacks:aggregate@1.3.0
meteorhacks:collection-utils@1.2.0
+meteorhacks:fast-render@2.16.0
+meteorhacks:inject-data@2.0.0
meteorhacks:meteorx@1.4.1
meteorhacks:picker@1.0.3
meteorhacks:subs-manager@1.6.4
meteorspark:util@0.2.0
minifier-css@1.2.16
-minifier-js@2.2.2
+minifier-js@2.0.0
minifiers@1.1.8-faster-rebuild.0
-minimongo@1.4.3
-mixmax:smart-disconnect@0.0.4
+minimongo@1.0.21
mobile-status-bar@1.0.14
-modules@0.11.0
-modules-runtime@0.9.1
-mongo@1.3.0
-mongo-dev-server@1.1.0
+modules@0.8.2
+modules-runtime@0.7.10
+mongo@1.1.16
mongo-id@1.0.6
mongo-livedata@1.0.12
mousetrap:mousetrap@1.4.6_1
@@ -112,24 +108,24 @@ mquandalle:jquery-ui-drag-drop-sort@0.2.0
mquandalle:moment@1.0.1
mquandalle:mousetrap-bindglobal@0.0.1
mquandalle:perfect-scrollbar@0.6.5_2
-npm-bcrypt@0.9.3
-npm-mongo@2.2.33
+npm-bcrypt@0.9.2
+npm-mongo@2.2.24
observe-sequence@1.0.16
ongoworks:speakingurl@1.1.0
ordered-dict@1.0.9
peerlibrary:assert@0.2.5
peerlibrary:base-component@0.16.0
peerlibrary:blaze-components@0.15.1
-peerlibrary:computed-field@0.7.0
+peerlibrary:computed-field@0.6.1
peerlibrary:reactive-field@0.3.0
perak:markdown@1.0.5
-promise@0.10.0
+promise@0.8.8
raix:eventemitter@0.1.3
raix:handlebar-helpers@0.2.5
-rajit:bootstrap3-datepicker@1.7.1
+rajit:bootstrap3-datepicker@1.6.4
random@1.0.10
rate-limit@1.0.8
-reactive-dict@1.2.0
+reactive-dict@1.1.8
reactive-var@1.0.11
reload@1.1.11
retry@1.0.9
@@ -138,29 +134,26 @@ seriousm:emoji-continued@1.4.0
service-configuration@1.0.11
session@1.1.7
sha@1.0.9
-shell-server@0.3.1
+shell-server@0.2.3
simple:authenticate-user-by-token@1.0.1
simple:json-routes@2.1.0
simple:rest-accounts-password@1.1.2
simple:rest-bearer-token-parser@1.0.1
simple:rest-json-error-handler@1.0.1
-softwarerero:accounts-t9n@1.3.11
+softwarerero:accounts-t9n@1.3.9
spacebars@1.0.15
-spacebars-compiler@1.1.3
+spacebars-compiler@1.1.2
srp@1.0.10
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.3
-staringatlights:fast-render@2.16.5
-staringatlights:flow-router@2.12.2
-staringatlights:inject-data@2.0.5
-stylus@2.513.13
+standard-minifier-css@1.3.4
+standard-minifier-js@2.0.0
+stylus@2.513.9
tap:i18n@1.8.2
templates:tabs@2.3.0
templating@1.3.2
-templating-compiler@1.3.3
+templating-compiler@1.3.2
templating-runtime@1.3.2
templating-tools@1.1.2
-tracker@1.1.3
+tracker@1.1.2
ui@1.0.13
underscore@1.0.10
url@1.1.0
@@ -168,6 +161,6 @@ useraccounts:core@1.14.2
useraccounts:flow-routing@1.14.2
useraccounts:unstyled@1.14.2
verron:autosize@3.0.8
-webapp@1.4.0
+webapp@1.3.15
webapp-hashing@1.0.9
zimme:active-route@2.3.2
diff --git a/.travis.yml b/.travis.yml
index 47c1d1a0..bad4d10e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ sudo: required
env:
TRAVIS_DOCKER_COMPOSE_VERSION: 1.12.0
- TRAVIS_NODE_VERSION: 6.12.2
- TRAVIS_NPM_VERSION: 5.6.0
+ TRAVIS_NODE_VERSION: 4.8.4
+ TRAVIS_NPM_VERSION: 4.6.1
before_install:
- sudo apt-get update -y
diff --git a/Dockerfile b/Dockerfile
index f8a39388..f8027594 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,12 +15,12 @@ ARG SRC_PATH
# paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates gcc-4.9 paxctl"
ENV GOSU_VERSION=1.10
-ENV NODE_VERSION ${NODE_VERSION:-v6.12.2}
-ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0}
+ENV NODE_VERSION ${NODE_VERSION:-v4.8.6}
+ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.4.1}
ENV USE_EDGE ${USE_EDGE:-false}
ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17}
-ENV NPM_VERSION ${NPM_VERSION:-5.6.0}
-ENV FIBERS_VERSION ${FIBERS_VERSION:-2.0.0}
+ENV NPM_VERSION ${NPM_VERSION:-4.6.1}
+ENV FIBERS_VERSION ${FIBERS_VERSION:-1.0.15}
ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64}
ENV SRC_PATH ${SRC_PATH:-./}
@@ -106,6 +106,7 @@ RUN \
mkdir -p /home/wekan/app/packages && \
chown wekan:wekan --recursive /home/wekan && \
cd /home/wekan/app/packages && \
+ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \
gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
cd /home/wekan/.meteor && \
diff --git a/package.json b/package.json
index 0ec6913f..46e7d234 100644
--- a/package.json
+++ b/package.json
@@ -20,17 +20,15 @@
},
"homepage": "https://wekan.github.io",
"devDependencies": {
- "eslint": "^4.11.0"
+ "eslint": "^2.0.0"
},
"dependencies": {
- "babel-runtime": "^6.26.0",
- "bcrypt": "^1.0.3",
+ "babel-runtime": "^6.23.0",
+ "bcrypt": "^1.0.2",
"bson": "^1.0.4",
- "es6-promise": "^4.1.1",
- "fibers": "^2.0.0",
- "meteor-node-stubs": "^0.3.2",
+ "es6-promise": "^4.1.0",
+ "meteor-node-stubs": "^0.2.6",
"os": "^0.1.1",
- "phantomjs-prebuilt": "^2.1.16",
- "xss": "^0.3.4"
+ "xss": "^0.3.3"
}
}
diff --git a/snapcraft.yaml b/snapcraft.yaml
index e574be1f..e4466544 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -70,12 +70,12 @@ parts:
wekan:
source: .
plugin: nodejs
- node-engine: 6.12.2
+ node-engine: 4.8.4
node-packages:
- - npm@5.6.0
+ - npm@4.6.1
- node-gyp
- node-pre-gyp
- - fibers@2.0.0
+ - fibers@1.0.15
build-packages:
- python
- g++
@@ -88,10 +88,16 @@ parts:
rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
echo "installing meteor first"
curl https://install.meteor.com/ -o install_meteor.sh
- sed -i "s|RELEASE=.*|RELEASE=\"1.6\"|g" install_meteor.sh
+ sed -i "s|RELEASE=.*|RELEASE=\"1.4.4.1\"|g" install_meteor.sh
chmod +x install_meteor.sh
sh install_meteor.sh
rm install_meteor.sh
+ mkdir packages
+ cd packages
+ git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+ git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+ sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/.meteor/packages/meteor-useraccounts-core/package.js
+ cd ..
build: |
rm -rf package-lock.json .build
meteor add standard-minifier-js --allow-superuser