From ebe42b43587dd990f393718f3edc2296cb57016f Mon Sep 17 00:00:00 2001 From: Brylie Christopher Oxley Date: Thu, 30 Mar 2017 12:29:20 +0300 Subject: meteor update all packages --- .meteor/.finished-upgraders | 3 + .meteor/packages | 39 +++++----- .meteor/release | 2 +- .meteor/versions | 179 ++++++++++++++++++++++---------------------- package.json | 2 + 5 files changed, 117 insertions(+), 108 deletions(-) diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders index 7bd71978..a8020370 100644 --- a/.meteor/.finished-upgraders +++ b/.meteor/.finished-upgraders @@ -12,3 +12,6 @@ notices-for-facebook-graph-api-2 1.2.0-breaking-changes 1.3.0-split-minifiers-package 1.3.5-remove-old-dev-bundle-link +1.4.0-remove-old-dev-bundle-link +1.4.1-add-shell-server-package +1.4.3-split-account-service-packages diff --git a/.meteor/packages b/.meteor/packages index 7ede4008..6d0d4805 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -3,17 +3,17 @@ # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -meteor-base +meteor-base@1.0.4 # Build system -ecmascript -stylus -standard-minifier-css -standard-minifier-js +ecmascript@0.6.3 +stylus@2.513.9 +standard-minifier-css@1.3.4 +standard-minifier-js@1.2.3 mquandalle:jade # Polyfills -es5-shim +es5-shim@4.6.15 # Collections aldeed:collection2 @@ -24,30 +24,30 @@ dburles:collection-helpers idmontie:migrations matb33:collection-hooks matteodem:easy-search -mongo +mongo@1.1.16 mquandalle:collection-mutations # Account system -accounts-password +accounts-password@1.3.4 kenton:accounts-sandstorm -service-configuration +service-configuration@1.0.11 useraccounts:core useraccounts:unstyled useraccounts:flow-routing -email +email@1.1.18 # Utilities -check -jquery -random -reactive-dict -session -tracker -underscore +check@1.2.5 +jquery@1.11.10 +random@1.0.10 +reactive-dict@1.1.8 +session@1.1.7 +tracker@1.1.2 +underscore@1.0.10 3stack:presence alethes:pages arillo:flow-router-helpers -audit-argument-checks +audit-argument-checks@1.0.7 kadira:blaze-layout kadira:dochead meteorhacks:fast-render @@ -61,7 +61,7 @@ tap:i18n # UI components blaze -reactive-var +reactive-var@1.0.11 fortawesome:fontawesome mousetrap:mousetrap mquandalle:jquery-textcomplete @@ -76,3 +76,4 @@ verron:autosize simple:json-routes rajit:bootstrap3-datepicker kadira:flow-router +shell-server diff --git a/.meteor/release b/.meteor/release index fcf9d2d7..31ce024f 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.3.5.1 +METEOR@1.4.3.2 diff --git a/.meteor/versions b/.meteor/versions index 4ca2f780..225b3caf 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,26 +1,26 @@ 3stack:presence@1.0.5 -accounts-base@1.2.8 -accounts-password@1.1.13 -aldeed:collection2@2.9.1 -aldeed:collection2-core@1.1.1 -aldeed:schema-deny@1.0.1 -aldeed:schema-index@1.0.1 +accounts-base@1.2.15 +accounts-password@1.3.4 +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.5 arillo:flow-router-helpers@0.5.2 audit-argument-checks@1.0.7 -autoupdate@1.2.11 -babel-compiler@6.8.5 -babel-runtime@0.1.9_1 -base64@1.0.9 -binary-heap@1.0.9 -blaze@2.1.8 -blaze-tools@1.0.9 -boilerplate-generator@1.0.9 -caching-compiler@1.0.6 -caching-html-compiler@1.0.6 -callback-hook@1.0.9 +autoupdate@1.3.12 +babel-compiler@6.14.1 +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.0.11 +caching-compiler@1.1.9 +caching-html-compiler@1.1.2 +callback-hook@1.0.10 cfs:access-point@0.1.49 cfs:base-package@0.0.30 cfs:collection@0.5.5 @@ -38,64 +38,64 @@ cfs:storage-adapter@0.2.3 cfs:tempstore@0.1.5 cfs:upload-http@0.0.20 cfs:worker@0.1.4 -check@1.2.3 +check@1.2.5 chuangbo:cookie@1.1.0 -coffeescript@1.1.4 -cottz:publish-relations@2.0.6 -dburles:collection-helpers@1.0.4 +coffeescript@1.12.3_1 +cottz:publish-relations@2.0.7 +dburles:collection-helpers@1.1.0 ddp@1.2.5 -ddp-client@1.2.9 -ddp-common@1.2.6 -ddp-rate-limiter@1.0.5 -ddp-server@1.2.10 +ddp-client@1.3.3 +ddp-common@1.2.8 +ddp-rate-limiter@1.0.7 +ddp-server@1.3.13 deps@1.0.12 -diff-sequence@1.0.6 -ecmascript@0.4.8 -ecmascript-runtime@0.2.12 -ejson@1.0.12 -email@1.0.16 -es5-shim@4.5.13 -fastclick@1.0.12 -fortawesome:fontawesome@4.5.0 -geojson-utils@1.0.9 +diff-sequence@1.0.7 +ecmascript@0.6.3 +ecmascript-runtime@0.3.15 +ejson@1.0.13 +email@1.1.18 +es5-shim@4.6.15 +fastclick@1.0.13 +fortawesome:fontawesome@4.7.0 +geojson-utils@1.0.10 hot-code-push@1.0.4 -html-tools@1.0.10 -htmljs@1.0.10 -http@1.1.8 -id-map@1.0.8 -idmontie:migrations@1.0.1 -jquery@1.11.9 +html-tools@1.0.11 +htmljs@1.0.11 +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.5.1 -launch-screen@1.0.12 +kenton:accounts-sandstorm@0.6.0 +launch-screen@1.1.1 livedata@1.0.18 -localstorage@1.0.11 -logging@1.0.14 -matb33:collection-hooks@0.8.1 +localstorage@1.0.12 +logging@1.1.17 +matb33:collection-hooks@0.8.4 matteodem:easy-search@1.6.4 -mdg:validation-error@0.2.0 -meteor@1.1.16 +mdg:validation-error@0.5.1 +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.14.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.1.13 -minifier-js@1.1.13 +minifier-css@1.2.16 +minifier-js@1.2.18 minifiers@1.1.8-faster-rebuild.0 -minimongo@1.0.17 -mobile-status-bar@1.0.12 -modules@0.6.5 -modules-runtime@0.6.5 -mongo@1.1.9_1 -mongo-id@1.0.5 +minimongo@1.0.21 +mobile-status-bar@1.0.14 +modules@0.7.9 +modules-runtime@0.7.9 +mongo@1.1.16 +mongo-id@1.0.6 mongo-livedata@1.0.12 mousetrap:mousetrap@1.4.6_1 mquandalle:autofocus@1.0.0 @@ -107,52 +107,55 @@ 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.8.6_3 -npm-mongo@1.4.45 -observe-sequence@1.0.12 +npm-bcrypt@0.9.2 +npm-mongo@2.2.24 +observe-sequence@1.0.16 ongoworks:speakingurl@1.1.0 -ordered-dict@1.0.8 +ordered-dict@1.0.9 peerlibrary:assert@0.2.5 -peerlibrary:base-component@0.14.0 +peerlibrary:base-component@0.16.0 peerlibrary:blaze-components@0.15.1 -peerlibrary:computed-field@0.3.1 -peerlibrary:reactive-field@0.1.0 +peerlibrary:computed-field@0.6.1 +peerlibrary:reactive-field@0.3.0 perak:markdown@1.0.5 -promise@0.7.3 +promise@0.8.8 raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.5 -rajit:bootstrap3-datepicker@1.5.1 +rajit:bootstrap3-datepicker@1.6.4 random@1.0.10 -rate-limit@1.0.5 +rate-limit@1.0.7 reactive-dict@1.1.8 -reactive-var@1.0.10 -reload@1.1.10 -retry@1.0.8 -routepolicy@1.0.11 +reactive-var@1.0.11 +reload@1.1.11 +retry@1.0.9 +routepolicy@1.0.12 seriousm:emoji-continued@1.4.0 -service-configuration@1.0.10 -session@1.1.6 -sha@1.0.8 +service-configuration@1.0.11 +session@1.1.7 +sha@1.0.9 +shell-server@0.2.3 simple:json-routes@1.0.4 -softwarerero:accounts-t9n@1.3.4 -spacebars@1.0.12 -spacebars-compiler@1.0.12 -srp@1.0.9 -standard-minifier-css@1.0.8 -standard-minifier-js@1.0.8 -stylus@2.512.5 +softwarerero:accounts-t9n@1.3.9 +spacebars@1.0.15 +spacebars-compiler@1.1.2 +srp@1.0.10 +standard-minifier-css@1.3.4 +standard-minifier-js@1.2.3 +stylus@2.513.9 tap:i18n@1.8.2 -templates:tabs@2.2.2 -templating@1.1.14 -templating-tools@1.0.4 -tracker@1.0.15 -ui@1.0.11 -underscore@1.0.9 -url@1.0.10 +templates:tabs@2.3.0 +templating@1.3.2 +templating-compiler@1.3.2 +templating-runtime@1.3.2 +templating-tools@1.1.2 +tracker@1.1.2 +ui@1.0.13 +underscore@1.0.10 +url@1.1.0 useraccounts:core@1.14.2 useraccounts:flow-routing@1.14.2 useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 -webapp@1.2.11 +webapp@1.3.14 webapp-hashing@1.0.9 zimme:active-route@2.3.2 diff --git a/package.json b/package.json index b4fdfbbe..f54e214c 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,8 @@ "eslint": "^2.0.0" }, "dependencies": { + "babel-runtime": "^6.23.0", + "meteor-node-stubs": "^0.2.6", "xss": "^0.3.3" } } -- cgit v1.2.3-1-g7c22 From 6db86489abd06a1884e721638707d6656138ee4d Mon Sep 17 00:00:00 2001 From: David Renshaw Date: Tue, 4 Apr 2017 10:37:29 -0400 Subject: fix updateUserPermissions() on Sandstorm The new isCommentOnly property needs to be set when Sandstorm updates user permissions, because otherwise a schema validation error occurs and users never get added as members of boards. --- sandstorm.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sandstorm.js b/sandstorm.js index 3e04d79f..2e79c27c 100644 --- a/sandstorm.js +++ b/sandstorm.js @@ -205,7 +205,8 @@ if (isSandstorm && Meteor.isServer) { function updateUserPermissions(userId, permissions) { const isActive = permissions.indexOf('participate') > -1; const isAdmin = permissions.indexOf('configure') > -1; - const permissionDoc = { userId, isActive, isAdmin }; + const isCommentOnly = false; + const permissionDoc = { userId, isActive, isAdmin, isCommentOnly }; const boardMembers = Boards.findOne(sandstormBoard._id).members; const memberIndex = _.pluck(boardMembers, 'userId').indexOf(userId); -- cgit v1.2.3-1-g7c22 From fd2057e1071da79f89f5c426e21a4fd5ca53b762 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 5 Apr 2017 21:37:15 +0300 Subject: Move Meteor 1.4 to it's own branch, and devel back to Meteor 1.3 --- .meteor/.finished-upgraders | 3 - .meteor/packages | 39 +++++----- .meteor/release | 2 +- .meteor/versions | 179 ++++++++++++++++++++++---------------------- package.json | 2 - 5 files changed, 108 insertions(+), 117 deletions(-) diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders index a8020370..7bd71978 100644 --- a/.meteor/.finished-upgraders +++ b/.meteor/.finished-upgraders @@ -12,6 +12,3 @@ notices-for-facebook-graph-api-2 1.2.0-breaking-changes 1.3.0-split-minifiers-package 1.3.5-remove-old-dev-bundle-link -1.4.0-remove-old-dev-bundle-link -1.4.1-add-shell-server-package -1.4.3-split-account-service-packages diff --git a/.meteor/packages b/.meteor/packages index 6d0d4805..7ede4008 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -3,17 +3,17 @@ # '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 # Build system -ecmascript@0.6.3 -stylus@2.513.9 -standard-minifier-css@1.3.4 -standard-minifier-js@1.2.3 +ecmascript +stylus +standard-minifier-css +standard-minifier-js mquandalle:jade # Polyfills -es5-shim@4.6.15 +es5-shim # Collections aldeed:collection2 @@ -24,30 +24,30 @@ dburles:collection-helpers idmontie:migrations matb33:collection-hooks matteodem:easy-search -mongo@1.1.16 +mongo mquandalle:collection-mutations # Account system -accounts-password@1.3.4 +accounts-password kenton:accounts-sandstorm -service-configuration@1.0.11 +service-configuration useraccounts:core useraccounts:unstyled useraccounts:flow-routing -email@1.1.18 +email # Utilities -check@1.2.5 -jquery@1.11.10 -random@1.0.10 -reactive-dict@1.1.8 -session@1.1.7 -tracker@1.1.2 -underscore@1.0.10 +check +jquery +random +reactive-dict +session +tracker +underscore 3stack:presence alethes:pages arillo:flow-router-helpers -audit-argument-checks@1.0.7 +audit-argument-checks kadira:blaze-layout kadira:dochead meteorhacks:fast-render @@ -61,7 +61,7 @@ tap:i18n # UI components blaze -reactive-var@1.0.11 +reactive-var fortawesome:fontawesome mousetrap:mousetrap mquandalle:jquery-textcomplete @@ -76,4 +76,3 @@ verron:autosize simple:json-routes rajit:bootstrap3-datepicker kadira:flow-router -shell-server diff --git a/.meteor/release b/.meteor/release index 31ce024f..fcf9d2d7 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.4.3.2 +METEOR@1.3.5.1 diff --git a/.meteor/versions b/.meteor/versions index 225b3caf..4ca2f780 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,26 +1,26 @@ 3stack:presence@1.0.5 -accounts-base@1.2.15 -accounts-password@1.3.4 -aldeed:collection2@2.10.0 -aldeed:collection2-core@1.2.0 -aldeed:schema-deny@1.1.0 -aldeed:schema-index@1.1.1 +accounts-base@1.2.8 +accounts-password@1.1.13 +aldeed:collection2@2.9.1 +aldeed:collection2-core@1.1.1 +aldeed:schema-deny@1.0.1 +aldeed:schema-index@1.0.1 aldeed:simple-schema@1.5.3 alethes:pages@1.8.6 allow-deny@1.0.5 arillo:flow-router-helpers@0.5.2 audit-argument-checks@1.0.7 -autoupdate@1.3.12 -babel-compiler@6.14.1 -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.0.11 -caching-compiler@1.1.9 -caching-html-compiler@1.1.2 -callback-hook@1.0.10 +autoupdate@1.2.11 +babel-compiler@6.8.5 +babel-runtime@0.1.9_1 +base64@1.0.9 +binary-heap@1.0.9 +blaze@2.1.8 +blaze-tools@1.0.9 +boilerplate-generator@1.0.9 +caching-compiler@1.0.6 +caching-html-compiler@1.0.6 +callback-hook@1.0.9 cfs:access-point@0.1.49 cfs:base-package@0.0.30 cfs:collection@0.5.5 @@ -38,64 +38,64 @@ cfs:storage-adapter@0.2.3 cfs:tempstore@0.1.5 cfs:upload-http@0.0.20 cfs:worker@0.1.4 -check@1.2.5 +check@1.2.3 chuangbo:cookie@1.1.0 -coffeescript@1.12.3_1 -cottz:publish-relations@2.0.7 -dburles:collection-helpers@1.1.0 +coffeescript@1.1.4 +cottz:publish-relations@2.0.6 +dburles:collection-helpers@1.0.4 ddp@1.2.5 -ddp-client@1.3.3 -ddp-common@1.2.8 -ddp-rate-limiter@1.0.7 -ddp-server@1.3.13 +ddp-client@1.2.9 +ddp-common@1.2.6 +ddp-rate-limiter@1.0.5 +ddp-server@1.2.10 deps@1.0.12 -diff-sequence@1.0.7 -ecmascript@0.6.3 -ecmascript-runtime@0.3.15 -ejson@1.0.13 -email@1.1.18 -es5-shim@4.6.15 -fastclick@1.0.13 -fortawesome:fontawesome@4.7.0 -geojson-utils@1.0.10 +diff-sequence@1.0.6 +ecmascript@0.4.8 +ecmascript-runtime@0.2.12 +ejson@1.0.12 +email@1.0.16 +es5-shim@4.5.13 +fastclick@1.0.12 +fortawesome:fontawesome@4.5.0 +geojson-utils@1.0.9 hot-code-push@1.0.4 -html-tools@1.0.11 -htmljs@1.0.11 -http@1.2.12 -id-map@1.0.9 -idmontie:migrations@1.0.3 -jquery@1.11.10 +html-tools@1.0.10 +htmljs@1.0.10 +http@1.1.8 +id-map@1.0.8 +idmontie:migrations@1.0.1 +jquery@1.11.9 kadira:blaze-layout@2.3.0 kadira:dochead@1.5.0 kadira:flow-router@2.12.1 -kenton:accounts-sandstorm@0.6.0 -launch-screen@1.1.1 +kenton:accounts-sandstorm@0.5.1 +launch-screen@1.0.12 livedata@1.0.18 -localstorage@1.0.12 -logging@1.1.17 -matb33:collection-hooks@0.8.4 +localstorage@1.0.11 +logging@1.0.14 +matb33:collection-hooks@0.8.1 matteodem:easy-search@1.6.4 -mdg:validation-error@0.5.1 -meteor@1.6.1 +mdg:validation-error@0.2.0 +meteor@1.1.16 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:fast-render@2.14.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@1.2.18 +minifier-css@1.1.13 +minifier-js@1.1.13 minifiers@1.1.8-faster-rebuild.0 -minimongo@1.0.21 -mobile-status-bar@1.0.14 -modules@0.7.9 -modules-runtime@0.7.9 -mongo@1.1.16 -mongo-id@1.0.6 +minimongo@1.0.17 +mobile-status-bar@1.0.12 +modules@0.6.5 +modules-runtime@0.6.5 +mongo@1.1.9_1 +mongo-id@1.0.5 mongo-livedata@1.0.12 mousetrap:mousetrap@1.4.6_1 mquandalle:autofocus@1.0.0 @@ -107,55 +107,52 @@ 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 -observe-sequence@1.0.16 +npm-bcrypt@0.8.6_3 +npm-mongo@1.4.45 +observe-sequence@1.0.12 ongoworks:speakingurl@1.1.0 -ordered-dict@1.0.9 +ordered-dict@1.0.8 peerlibrary:assert@0.2.5 -peerlibrary:base-component@0.16.0 +peerlibrary:base-component@0.14.0 peerlibrary:blaze-components@0.15.1 -peerlibrary:computed-field@0.6.1 -peerlibrary:reactive-field@0.3.0 +peerlibrary:computed-field@0.3.1 +peerlibrary:reactive-field@0.1.0 perak:markdown@1.0.5 -promise@0.8.8 +promise@0.7.3 raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.5 -rajit:bootstrap3-datepicker@1.6.4 +rajit:bootstrap3-datepicker@1.5.1 random@1.0.10 -rate-limit@1.0.7 +rate-limit@1.0.5 reactive-dict@1.1.8 -reactive-var@1.0.11 -reload@1.1.11 -retry@1.0.9 -routepolicy@1.0.12 +reactive-var@1.0.10 +reload@1.1.10 +retry@1.0.8 +routepolicy@1.0.11 seriousm:emoji-continued@1.4.0 -service-configuration@1.0.11 -session@1.1.7 -sha@1.0.9 -shell-server@0.2.3 +service-configuration@1.0.10 +session@1.1.6 +sha@1.0.8 simple:json-routes@1.0.4 -softwarerero:accounts-t9n@1.3.9 -spacebars@1.0.15 -spacebars-compiler@1.1.2 -srp@1.0.10 -standard-minifier-css@1.3.4 -standard-minifier-js@1.2.3 -stylus@2.513.9 +softwarerero:accounts-t9n@1.3.4 +spacebars@1.0.12 +spacebars-compiler@1.0.12 +srp@1.0.9 +standard-minifier-css@1.0.8 +standard-minifier-js@1.0.8 +stylus@2.512.5 tap:i18n@1.8.2 -templates:tabs@2.3.0 -templating@1.3.2 -templating-compiler@1.3.2 -templating-runtime@1.3.2 -templating-tools@1.1.2 -tracker@1.1.2 -ui@1.0.13 -underscore@1.0.10 -url@1.1.0 +templates:tabs@2.2.2 +templating@1.1.14 +templating-tools@1.0.4 +tracker@1.0.15 +ui@1.0.11 +underscore@1.0.9 +url@1.0.10 useraccounts:core@1.14.2 useraccounts:flow-routing@1.14.2 useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 -webapp@1.3.14 +webapp@1.2.11 webapp-hashing@1.0.9 zimme:active-route@2.3.2 diff --git a/package.json b/package.json index c7548af3..a3b44826 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,6 @@ "eslint": "^2.0.0" }, "dependencies": { - "babel-runtime": "^6.23.0", - "meteor-node-stubs": "^0.2.6", "xss": "^0.3.3" } } -- cgit v1.2.3-1-g7c22 From 369d5c4332433919919cda1efaa2d96715858f3e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 5 Apr 2017 22:12:35 +0300 Subject: Update translations. --- i18n/de.i18n.json | 8 ++++---- i18n/fa.i18n.json | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 952ff9d0..dd9490c6 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -137,8 +137,8 @@ "color-yellow": "gelb", "comment": "Kommentar", "comment-placeholder": "Kommentar schreiben", - "comment-only": "Limited", - "comment-only-desc": "Can comment on cards only.", + "comment-only": "Eingeschränkt", + "comment-only-desc": "Kann Karten nur Kommentieren", "computer": "Computer", "create": "Erstellen", "createBoardPopup-title": "Board erstellen", @@ -337,12 +337,12 @@ "email-addresses": "E-Mail Adressen", "smtp-host-description": "Die Adresse Ihres SMTP-Servers für ausgehende E-Mails.", "smtp-port-description": "Der Port Ihres SMTP-Servers für ausgehende E-Mails.", - "smtp-tls-description": "Enable TLS support for SMTP server", + "smtp-tls-description": "Aktiviere TLS Unterstützung für SMTP Server", "smtp-host": "SMTP-Server", "smtp-port": "SMTP-Port", "smtp-username": "Benutzername", "smtp-password": "Passwort", - "smtp-tls": "TLS support", + "smtp-tls": "TLS Unterstützung", "send-from": "Absender", "invitation-code": "Einladungscode", "email-invite-register-subject": "__inviter__ hat Ihnen eine Einladung geschickt", diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index ba3ea1cb..0eb9ba88 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -263,9 +263,9 @@ "password": "کلمه عبور", "paste-or-dragdrop": "جهت چسباندن، یا کشیدن-رهاسازی فایل تصویر به آن (تصویر)", "participating": "Participating", - "preview": "نمایش", - "previewAttachedImagePopup-title": "نمایش", - "previewClipboardImagePopup-title": "نمایش", + "preview": "پیش‌نمایش", + "previewAttachedImagePopup-title": "پیش‌نمایش", + "previewClipboardImagePopup-title": "پیش‌نمایش", "private": "خصوصی", "private-desc": "این تخته خصوصی است. فقط تنها افراد اضافه شده به آن می توانند مشاهده و ویرایش کنند.", "profile": "پروفایل", -- cgit v1.2.3-1-g7c22 From 510fbf0635ce42e9e71fadcf5fd5d35620f91379 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 6 Apr 2017 18:59:43 +0300 Subject: Use Meteor 1.4 and Node v4 based Docker image. --- README.md | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index ad85c5cb..f6557b52 100644 --- a/README.md +++ b/README.md @@ -87,12 +87,8 @@ ElasticSearch / Kibana (ELK)][wekan_logstash] [Wekan stats][wekan_stats] -[Enable Admin Panel on Docker and Source installs][enable_adminpanel] - -2017-03-31: [Alternative Docker image][docker_alternative] while we are -fixing official Docker image, fixing may take one or two weeks. -We are also trying to setup [New Docker image for Wekan team][docker_newimage] -where it's easier for Wekan team to add tags. +First registered Wekan user will get Admin Panel on new Docker and source based +installs. You can also [enable Admin Panel manually][enable_adminpanel]. [Import/Export MongoDB data to/from Docker container][importexport_docker] @@ -137,9 +133,9 @@ sudo docker-compose up -d --build Docker example, running latest Wekan using docker run commands alone: ``` -docker run -d --restart=always --name wekan-db mongo:3.2.11 +docker run -d --restart=always --name wekan-db mongo:3.4.3 -docker run -d --restart=always --name wekan --link "wekan-db:db" -e "MONGO_URL=mongodb://db" -e "ROOT_URL=http://localhost:8080" -p 8080:80 mquandalle/wekan:latest +docker run -d --restart=always --name wekan --link "wekan-db:db" -e "MONGO_URL=mongodb://db" -e "ROOT_URL=http://localhost:8080" -p 8080:80 wekanteam/wekan:meteor-1.4 ``` [Docker on SUSE Linux Enterprise Server 12 SP1][sles] @@ -199,7 +195,7 @@ with [Meteor](https://www.meteor.com). [wefork_issues]: https://github.com/wefork/wekan/issues [sandstorm_button]: https://img.shields.io/badge/try-Wekan%20on%20Sandstorm-783189.svg [sandstorm_appdemo]: https://demo.sandstorm.io/appdemo/m86q05rdvj14yvn78ghaxynqz7u2svw6rnttptxx49g1785cdv1h -[docker_image]: https://hub.docker.com/r/mquandalle/wekan/ +[docker_image]: https://hub.docker.com/r/wekanteam/wekan/ [heroku_button]: https://www.herokucdn.com/deploy/button.png [heroku_deploy]: https://heroku.com/deploy?template=https://github.com/wekan/wekan/tree/master [indiehosters_button]: https://indie.host/signup.png @@ -209,16 +205,14 @@ with [Meteor](https://www.meteor.com). [cloudron_button]: https://cloudron.io/img/button.svg [cloudron_install]: https://cloudron.io/button.html?app=io.wekan.cloudronapp [debian_wheezy]: https://github.com/soohwa/sps/blob/master/example/docs/1/wekan.md -[travis_badge]: https://travis-ci.org/wekan/wekan.svg?branch=devel +[travis_badge]: https://travis-ci.org/wekan/wekan.svg?branch=meteor-1.4 [travis_status]: https://travis-ci.org/wekan/wekan [install_source]: https://github.com/wekan/wekan/wiki/Install-and-Update#install-manually-from-source [installsource_windows]: https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows [sles]: https://github.com/wekan/wekan/wiki/Install-Wekan-Docker-on-SUSE-Linux-Enterprise-Server-12-SP1 [virtualbox]: https://github.com/wekan/wekan/wiki/virtual-appliance [sandstorm_spk]: https://github.com/wekan/wekan/issues/823 -[docker_image]: https://hub.docker.com/r/mquandalle/wekan/ -[docker_alternative]: https://hub.docker.com/r/rubberduck/wekan/ -[docker_newimage]: https://hub.docker.com/r/wekanteam/wekan/ +[docker_image]: https://hub.docker.com/r/wekanteam/wekan/ [importexport_docker]: https://github.com/wekan/wekan/wiki/Export-Docker-Mongo-Data [wekan_wiki]: https://github.com/wekan/wekan/wiki [translate_wekan]: https://www.transifex.com/wekan/wekan/ -- cgit v1.2.3-1-g7c22 From 6ff548b1c786a36b77dc80bca84184627a1dfba8 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 6 Apr 2017 19:38:34 +0300 Subject: Meteor 1.4 and Node v4 based Docker Compose scripts. Thatnks to brylien and stephenmoloney ! --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d5ab210..0c385908 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,12 @@ This release adds the following new features: * Set first user as admin, it there is no existing users and Wekan is not running at Sandstorm. +* New Docker Compose [Wekan-MongoDB](https://github.com/wekan/wekan-mongodb) + and [Wekan-PostgreSQL](https://github.com/wekan/wekan-postgresql) + that use Meteor v1.4 and Node v4 based Wekan's meteor-1.4 branch. -Thanks to GitHub user Zokormazo for contributions. +Thanks to GitHub users brylie, stephenmoloney and Zokormazo for +contributions. # v0.18 2017-04-02 Wekan release -- cgit v1.2.3-1-g7c22 From 6cbf046aed1e8c41efa1f867d4b2185710ebc937 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 8 Apr 2017 13:52:01 +0300 Subject: Move more content to wiki. --- README.md | 136 ++++++++++++++------------------------------------------------ 1 file changed, 30 insertions(+), 106 deletions(-) diff --git a/README.md b/README.md index f6557b52..12719a7c 100644 --- a/README.md +++ b/README.md @@ -4,17 +4,13 @@ [![Wekan chat][vanila_badge]][vanila_chat] -2017-02-08 News: All of Wefork is now merged and moved back to official -Wekan. Wefork will not accept any new issues and pull requests. -All development happens on Wekan. - -[Wefork announcement and merging back][fork_announcement] - -[Wefork FAQ][fork_faq] - [Translate Wekan at Transifex][translate_wekan] -Wekan is an open-source and collaborative kanban board application. +Please read [FAQ](https://github.com/wekan/wekan/wiki/FAQ). +Please don't feed the trolls and spammers that are mentioned in the FAQ :) + +Wekan is an completely [Open Source][open_source] and [Free softare][free_software] +collaborative kanban board application with MIT license. Whether you’re maintaining a personal todo list, planning your holidays with some friends, or working in a team on your next revolutionary idea, Kanban @@ -22,21 +18,15 @@ boards are an unbeatable tool to keep your things organized. They give you a visual overview of the current state of your project, and make you productive by allowing you to focus on the few items that matter the most. -Wekan supports most features you would expect of it including a real-time user -interface. +Wekan has real-time user interface. Not all features are implemented. [Features][features] [Integrations][integrations] -Wekan supports many platforms, and plan is to add more. +[Team][team] -SSO options like LDAP, passwordless email, SAML, GitHub and Google Auth are -already available on [Sandstorm](https://sandstorm.io), not standalone Wekan. -Sandstorm is Enterprise scale highly secure platform with grains, logging, -admin settings, server clustering, App Market and it's now fully Open Source. -Sandstorm is preferred platform for Wekan, as it would take a lot of work to -reimplement everything in standalone Wekan. +Wekan supports many [Platforms][platforms], and plan is to add more. You don’t have to trust us with your data and can install Wekan on your own computer or server. In fact we encourage you to do that by providing @@ -52,9 +42,9 @@ page at wiki, please add them. We are very welcoming to new developers and teams to submit new pull requests to devel branch to make this Wekan App Development Platform possible faster. Please see [Developer Documentation][dev_docs] to get started. -We also welcome sponsors for features. By working directly with Wekan you -get the benefit of active maintenance and new features added by -growing Wekan developer community. +We also welcome sponsors for features, although we don't have any yet. +By working directly with Wekan you get the benefit of active maintenance +and new features added by growing Wekan developer community. [Roadmap is self-hosted on Wekan][roadmap_wefork] @@ -74,81 +64,28 @@ Since Wekan is a free software, you don’t have to trust us with your data and install Wekan on your own computer or server. In fact we encourage you to do that by providing one-click installation on various platforms. -## Supported Platforms - -Automatic generated newest builds are available for Docker, and some others that -install directly from this repo. Automatic builds will be added later for more -platforms. +## Cleanup and stats [Wekan database cleanup script][wekan_cleanup] +[Docker cleanup](https://github.com/wekan/wekan/issues/985) + [Daily export of Wekan changes as JSON to Logstash and ElasticSearch / Kibana (ELK)][wekan_logstash] [Wekan stats][wekan_stats] -First registered Wekan user will get Admin Panel on new Docker and source based -installs. You can also [enable Admin Panel manually][enable_adminpanel]. - -[Import/Export MongoDB data to/from Docker container][importexport_docker] - -### Docker: [Docker image][docker_image], [Docs at wiki][wekan_wiki] - -Docker example, running latest Wekan using docker-compose: - -#### Running from remote dockerhub images - -Recommended: - -* [Wekan <=> MongoDB][wekan_mongodb] - contains the only required Docker Compose file - -Development: - -* Clone this wekan repo and run from dockerhub without building: - -``` -sudo docker-compose up -d --nobuild -``` - -#### PostgreSQL read-only mirroring using dockerhub images - -[Wekan <=> MongoDB <=> ToroDB => PostgreSQL read-only mirroring][wekan_postgresql] -for SQL access with any programming language or Office package that has PostgreSQL support, like -newest LibreOffice 3.5. - -#### Running from locally built dockerhub images -``` -sudo docker-compose up -d --build -``` - -#### Running from locally built dockerhub images and modified `ARG` variables (not recommended) -``` -echo 'NODE_VERSION=v6.6.0' >> .env && \ -echo 'METEOR_RELEASE=1.4.2.3' >> .env && \ -echo 'NPM_VERSION=4.1.2' >> .env && \ -echo 'ARCHITECTURE=linux-x64' >> .env && \ -echo 'SRC_PATH=./' >> .env && \ -sudo docker-compose up -d --build -``` - -Docker example, running latest Wekan using docker run commands alone: -``` -docker run -d --restart=always --name wekan-db mongo:3.4.3 - -docker run -d --restart=always --name wekan --link "wekan-db:db" -e "MONGO_URL=mongodb://db" -e "ROOT_URL=http://localhost:8080" -p 8080:80 wekanteam/wekan:meteor-1.4 -``` - -[Docker on SUSE Linux Enterprise Server 12 SP1][sles] - -[Docker environment for Wekan development][wekan_dev] - -[Install from source][install_source] +## Supported Platforms -[Install from source on Windows][installsource_windows] +Automatic generated newest builds are available for Docker, and some others that +install directly from this repo. Automatic builds will be added later for more +platforms. -[VirtualBox][virtualbox] +First registered Wekan user will get [Admin Panel][features] on new +Docker and source based installs. You can also +[enable Admin Panel manually][enable_adminpanel]. -[Debian Wheezy 64bit][debian_wheezy] +[Docker](https://github.com/wekan/wekan/wiki/Docker) [![Deploy][heroku_button]][heroku_deploy] [![SignUp][indiehosters_button]][indiehosters_saas] @@ -156,25 +93,15 @@ docker run -d --restart=always --name wekan --link "wekan-db:db" -e "MONGO_URL=m [![Install on Cloudron][cloudron_button]][cloudron_install] [![Try on Sandstorm][sandstorm_button]][sandstorm_appdemo] +[VirtualBox][virtualbox] -## Upcoming Platforms - -[Autoinstall script][autoinstall] based on [this issue][autoinstall_issue] - -[Create Sandstorm .spk file from source][sandstorm_spk] - -Email to work on already working Heroku: Use 3rd party -email like SendGrid, update process.env.MAIL_URL , -change from email at Accounts.emailTeamplates.from , -new file in server folder called smtp.js on code -`Meteor.startup(function () });` . -TODO: Test and find a way to use API keys instead. +[Install from source][install_source] -Azure: Install from source. Azure endpoint needs to be added. Not tested yet. +[Install from source on Windows][installsource_windows] -OpenShift: Not tested yet. +[Debian Wheezy 64bit][debian_wheezy] -Google Cloud: Needs info how to enable websockets. +[More Platforms, and Upcoming Platforms](https://github.com/wekan/wekan/wiki/Platforms) ## License @@ -183,8 +110,6 @@ with [Meteor](https://www.meteor.com). [vanila_badge]: https://vanila.io/img/join-chat-button2.png [vanila_chat]: https://chat.vanila.io/channel/wekan -[fork_faq]: https://github.com/wefork/wekan/wiki/FAQ -[fork_announcement]: https://github.com/wekan/wekan/issues/640#issuecomment-276383458 [screenshot_wekan]: http://i.imgur.com/cI4jW2h.png [screenshot_wefork]: http://i.imgur.com/lzvpeS9.png [features]: https://github.com/wekan/wekan/wiki/Features @@ -209,11 +134,8 @@ with [Meteor](https://www.meteor.com). [travis_status]: https://travis-ci.org/wekan/wekan [install_source]: https://github.com/wekan/wekan/wiki/Install-and-Update#install-manually-from-source [installsource_windows]: https://github.com/wekan/wekan/wiki/Install-Wekan-from-source-on-Windows -[sles]: https://github.com/wekan/wekan/wiki/Install-Wekan-Docker-on-SUSE-Linux-Enterprise-Server-12-SP1 [virtualbox]: https://github.com/wekan/wekan/wiki/virtual-appliance -[sandstorm_spk]: https://github.com/wekan/wekan/issues/823 [docker_image]: https://hub.docker.com/r/wekanteam/wekan/ -[importexport_docker]: https://github.com/wekan/wekan/wiki/Export-Docker-Mongo-Data [wekan_wiki]: https://github.com/wekan/wekan/wiki [translate_wekan]: https://www.transifex.com/wekan/wekan/ [autoinstall]: https://github.com/wekan/wekan-autoinstall @@ -224,6 +146,8 @@ with [Meteor](https://www.meteor.com). [wekan_cleanup]: https://github.com/wekan/wekan-cleanup [wekan_logstash]: https://github.com/wekan/wekan-logstash [wekan_stats]: https://github.com/wekan/wekan-stats -[wekan_dev]: https://github.com/wekan/wekan-dev [logstash_issue]: https://github.com/wekan/wekan/issues/855 [enable_adminpanel]: https://github.com/wekan/wekan/blob/devel/CHANGELOG.md#v0111-rc2-2017-03-05-wekan-prerelease +[open_source]: https://en.wikipedia.org/wiki/Open-source_software +[free_software]: https://en.wikipedia.org/wiki/Free_software +[platforms]: https://github.com/wekan/wekan/wiki/Platforms -- cgit v1.2.3-1-g7c22 From 2f10a8f7eb4a1fb4c7ddb566a5e513ead2a99050 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 8 Apr 2017 13:54:10 +0300 Subject: Fix typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12719a7c..cff22ece 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Please read [FAQ](https://github.com/wekan/wekan/wiki/FAQ). Please don't feed the trolls and spammers that are mentioned in the FAQ :) -Wekan is an completely [Open Source][open_source] and [Free softare][free_software] +Wekan is an completely [Open Source][open_source] and [Free software][free_software] collaborative kanban board application with MIT license. Whether you’re maintaining a personal todo list, planning your holidays with -- cgit v1.2.3-1-g7c22 From e606438c331cdf7520beebc0fa8278d5b4753ea4 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 8 Apr 2017 13:55:29 +0300 Subject: Fix typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cff22ece..fca319c0 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Wekan has real-time user interface. Not all features are implemented. [Integrations][integrations] -[Team][team] +[Team](https://github.com/wekan/wekan/wiki/Team) Wekan supports many [Platforms][platforms], and plan is to add more. -- cgit v1.2.3-1-g7c22 From 81c14fabb57ca492eddd05ae7be34afcec800f3f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 8 Apr 2017 13:57:11 +0300 Subject: Fix typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fca319c0..4584326c 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ ElasticSearch / Kibana (ELK)][wekan_logstash] ## Supported Platforms -Automatic generated newest builds are available for Docker, and some others that +Automatic generated newest builds are available for Docker, and platforms that install directly from this repo. Automatic builds will be added later for more platforms. -- cgit v1.2.3-1-g7c22 From 2bb5a4cd2611f8c63b707969e6e92d0bde2f5857 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 13 Apr 2017 10:25:18 +0300 Subject: Better translation. --- i18n/en.i18n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index ecf145d0..143991d1 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -71,7 +71,7 @@ "attachment-delete-pop": "Deleting an attachment is permanent. There is no undo.", "attachmentDeletePopup-title": "Delete Attachment?", "attachments": "Attachments", - "auto-watch": "Automatically watch boards when create it", + "auto-watch": "Automatically watch boards when they are created", "avatar-too-big": "The avatar is too large (70Kb max)", "back": "Back", "board-change-color": "Change color", -- cgit v1.2.3-1-g7c22