diff options
-rw-r--r-- | .meteor/packages | 30 | ||||
-rw-r--r-- | .meteor/release | 2 | ||||
-rw-r--r-- | .meteor/versions | 96 | ||||
-rw-r--r-- | Dockerfile | 8 | ||||
-rw-r--r-- | models/attachments.js | 4 | ||||
-rw-r--r-- | package.json | 4 | ||||
-rw-r--r-- | snapcraft.yaml | 8 |
7 files changed, 82 insertions, 70 deletions
diff --git a/.meteor/packages b/.meteor/packages index 0bbe54df..8e2f5784 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.0.4 +meteor-base@1.2.0 # Build system -ecmascript@0.7.2 -stylus@2.513.9 -standard-minifier-css@1.3.4 -standard-minifier-js@2.0.0 +ecmascript@0.9.0 +stylus@2.513.13 +standard-minifier-css@1.3.5 +standard-minifier-js@2.2.0 mquandalle:jade # Polyfills @@ -17,18 +17,16 @@ es5-shim@4.6.15 # Collections aldeed:collection2 -cfs:gridfs cfs:standard-packages cottz:publish-relations dburles:collection-helpers idmontie:migrations matb33:collection-hooks matteodem:easy-search -mongo@1.1.16 +mongo@1.3.1 mquandalle:collection-mutations # Account system -accounts-password@1.3.5 kenton:accounts-sandstorm service-configuration@1.0.11 useraccounts:unstyled @@ -38,9 +36,9 @@ useraccounts:flow-routing check@1.2.5 jquery@1.11.10 random@1.0.10 -reactive-dict@1.1.8 +reactive-dict@1.2.0 session@1.1.7 -tracker@1.1.2 +tracker@1.1.3 underscore@1.0.10 3stack:presence alethes:pages @@ -48,7 +46,6 @@ 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 @@ -56,7 +53,7 @@ mquandalle:moment ongoworks:speakingurl raix:handlebar-helpers tap:i18n -http +http@1.3.0 # UI components blaze @@ -74,10 +71,15 @@ templates:tabs verron:autosize simple:json-routes rajit:bootstrap3-datepicker -kadira:flow-router -shell-server@0.2.3 +shell-server@0.3.0 simple:rest-accounts-password useraccounts:core email@1.2.3 horka:swipebox +dynamic-import@0.2.0 +staringatlights:fast-render +staringatlights:flow-router + mixmax:smart-disconnect +accounts-password@1.5.0 +cfs:gridfs diff --git a/.meteor/release b/.meteor/release index 605b4e1f..56a7a07f 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.4.4.1 +METEOR@1.6.0.1 diff --git a/.meteor/versions b/.meteor/versions index e3f904be..90e6394d 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,23 +1,23 @@ -3stack:presence@1.0.5 -accounts-base@1.2.16 -accounts-password@1.3.5 +3stack:presence@1.1.2 +accounts-base@1.4.0 +accounts-password@1.5.0 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.0.9 +allow-deny@1.1.0 arillo:flow-router-helpers@0.5.2 audit-argument-checks@1.0.7 autoupdate@1.3.12 -babel-compiler@6.18.2 -babel-runtime@1.0.1 +babel-compiler@6.24.7 +babel-runtime@1.1.1 base64@1.0.10 binary-heap@1.0.10 blaze@2.3.2 blaze-tools@1.0.10 -boilerplate-generator@1.0.11 +boilerplate-generator@1.3.1 caching-compiler@1.1.9 caching-html-compiler@1.1.2 callback-hook@1.0.10 @@ -27,7 +27,7 @@ cfs:collection@0.5.5 cfs:collection-filters@0.2.4 cfs:data-man@0.0.6 cfs:file@0.1.17 -cfs:gridfs@0.0.33 +cfs:gridfs@0.0.34 cfs:http-methods@0.0.32 cfs:http-publish@0.0.13 cfs:power-queue@0.9.11 @@ -40,19 +40,23 @@ cfs:upload-http@0.0.20 cfs:worker@0.1.4 check@1.2.5 chuangbo:cookie@1.1.0 -coffeescript@1.12.3_1 -cottz:publish-relations@2.0.7 +coffeescript@1.12.7_3 +coffeescript-compiler@1.12.7_3 +cottz:publish-relations@2.0.8 dburles:collection-helpers@1.1.0 -ddp@1.2.5 -ddp-client@1.3.4 -ddp-common@1.2.8 +ddp@1.4.0 +ddp-client@2.2.0 +ddp-common@1.3.0 ddp-rate-limiter@1.0.7 -ddp-server@1.3.14 +ddp-server@2.1.1 deps@1.0.12 diff-sequence@1.0.7 -ecmascript@0.7.3 -ecmascript-runtime@0.3.15 -ejson@1.0.13 +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 email@1.2.3 es5-shim@4.6.15 fastclick@1.0.13 @@ -62,41 +66,40 @@ horka:swipebox@1.0.2 hot-code-push@1.0.4 html-tools@1.0.11 htmljs@1.0.11 -http@1.2.12 +http@1.3.0 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.6.0 +kenton:accounts-sandstorm@0.7.0 launch-screen@1.1.1 livedata@1.0.18 -localstorage@1.0.12 -logging@1.1.17 +localstorage@1.2.0 +logging@1.1.19 matb33:collection-hooks@0.8.4 matteodem:easy-search@1.6.4 mdg:validation-error@0.5.1 -meteor@1.6.1 -meteor-base@1.0.4 +meteor@1.8.2 +meteor-base@1.2.0 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.0.0 +minifier-js@2.2.2 minifiers@1.1.8-faster-rebuild.0 -minimongo@1.0.21 +minimongo@1.4.3 mixmax:smart-disconnect@0.0.4 mobile-status-bar@1.0.14 -modules@0.8.2 -modules-runtime@0.7.10 -mongo@1.1.16 +modules@0.11.0 +modules-runtime@0.9.1 +mongo@1.3.1 +mongo-dev-server@1.1.0 mongo-id@1.0.6 mongo-livedata@1.0.12 mousetrap:mousetrap@1.4.6_1 @@ -109,24 +112,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.2 -npm-mongo@2.2.24 +npm-bcrypt@0.9.3 +npm-mongo@2.2.33 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.6.1 +peerlibrary:computed-field@0.7.0 peerlibrary:reactive-field@0.3.0 perak:markdown@1.0.5 -promise@0.8.8 +promise@0.10.0 raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.5 -rajit:bootstrap3-datepicker@1.6.4 +rajit:bootstrap3-datepicker@1.7.1 random@1.0.10 rate-limit@1.0.8 -reactive-dict@1.1.8 +reactive-dict@1.2.0 reactive-var@1.0.11 reload@1.1.11 retry@1.0.9 @@ -135,26 +138,29 @@ seriousm:emoji-continued@1.4.0 service-configuration@1.0.11 session@1.1.7 sha@1.0.9 -shell-server@0.2.3 +shell-server@0.3.1 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.9 +softwarerero:accounts-t9n@1.3.11 spacebars@1.0.15 -spacebars-compiler@1.1.2 +spacebars-compiler@1.1.3 srp@1.0.10 -standard-minifier-css@1.3.4 -standard-minifier-js@2.0.0 -stylus@2.513.9 +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 tap:i18n@1.8.2 templates:tabs@2.3.0 templating@1.3.2 -templating-compiler@1.3.2 +templating-compiler@1.3.3 templating-runtime@1.3.2 templating-tools@1.1.2 -tracker@1.1.2 +tracker@1.1.3 ui@1.0.13 underscore@1.0.10 url@1.1.0 @@ -162,6 +168,6 @@ useraccounts:core@1.14.2 useraccounts:flow-routing@1.14.2 useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 -webapp@1.3.15 +webapp@1.4.0 webapp-hashing@1.0.9 zimme:active-route@2.3.2 @@ -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:-v4.8.7} -ENV METEOR_RELEASE ${METEOR_RELEASE:-1.4.4.1} +ENV NODE_VERSION ${NODE_VERSION:-v8.9.3} +ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV USE_EDGE ${USE_EDGE:-false} ENV METEOR_EDGE ${METEOR_EDGE:-1.5-beta.17} -ENV NPM_VERSION ${NPM_VERSION:-4.6.1} -ENV FIBERS_VERSION ${FIBERS_VERSION:-1.0.15} +ENV NPM_VERSION ${NPM_VERSION:-5.5.1} +ENV FIBERS_VERSION ${FIBERS_VERSION:-2.0.0} ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64} ENV SRC_PATH ${SRC_PATH:-./} diff --git a/models/attachments.js b/models/attachments.js index 560bec99..a966e250 100644 --- a/models/attachments.js +++ b/models/attachments.js @@ -1,3 +1,5 @@ +try { + Attachments = new FS.Collection('attachments', { stores: [ @@ -25,6 +27,8 @@ Attachments = new FS.Collection('attachments', { ], }); +} catch (err) { console.log(err); throw err; } + if (Meteor.isServer) { Attachments.allow({ insert(userId, doc) { diff --git a/package.json b/package.json index 0341eab0..2a6bdb16 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,8 @@ }, "dependencies": { "babel-runtime": "^6.23.0", - "bcrypt": "^1.0.2", - "bson": "^1.0.4", + "bcrypt": "^1.0.3", + "bson-ext": "^1.0.5", "es6-promise": "^4.1.0", "meteor-node-stubs": "^0.2.6", "os": "^0.1.1", diff --git a/snapcraft.yaml b/snapcraft.yaml index 5bfdf056..a2524d25 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -70,12 +70,12 @@ parts: wekan: source: . plugin: nodejs - node-engine: 4.8.7 + node-engine: 8.9.3 node-packages: - - npm@4.6.1 + - npm@5.5.1 - node-gyp - node-pre-gyp - - fibers@1.0.15 + - fibers@2.0.0 build-packages: - ca-certificates - python @@ -91,7 +91,7 @@ parts: paxctl -mC `which node` echo "Installing meteor" curl https://install.meteor.com/ -o install_meteor.sh - sed -i "s|RELEASE=.*|RELEASE=\"1.4.4.1\"|g" install_meteor.sh + sed -i "s|RELEASE=.*|RELEASE=\"1.6.0.1\"|g" install_meteor.sh chmod +x install_meteor.sh sh install_meteor.sh rm install_meteor.sh |