summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.meteor/.finished-upgraders1
-rw-r--r--.meteor/packages43
-rw-r--r--.meteor/release2
-rw-r--r--.meteor/versions151
-rw-r--r--client/lib/escapeActions.js2
-rw-r--r--package.json13
-rw-r--r--packages/meteorx/package.js13
-rwxr-xr-xrebuild-wekan.sh2
-rw-r--r--server/publications/fast-render.js2
-rw-r--r--snapcraft.yaml4
10 files changed, 128 insertions, 105 deletions
diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders
index 2a56593d..8f397c7d 100644
--- a/.meteor/.finished-upgraders
+++ b/.meteor/.finished-upgraders
@@ -16,3 +16,4 @@ notices-for-facebook-graph-api-2
1.4.1-add-shell-server-package
1.4.3-split-account-service-packages
1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base
diff --git a/.meteor/packages b/.meteor/packages
index 6b771809..a4c9a081 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -3,17 +3,16 @@
# '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.4.0
# Build system
-ecmascript
-stylus@2.513.13
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.0
+ecmascript@0.12.4
+standard-minifier-css@1.5.3
+standard-minifier-js@2.4.1
mquandalle:jade
# Polyfills
-es5-shim@4.6.15
+es5-shim@4.8.0
# Collections
aldeed:collection2
@@ -23,7 +22,7 @@ dburles:collection-helpers
idmontie:migrations
matb33:collection-hooks
matteodem:easy-search
-mongo@1.3.1
+mongo@1.6.2
mquandalle:collection-mutations
# Account system
@@ -36,12 +35,12 @@ wekan-accounts-cas
wekan-accounts-oidc
# Utilities
-check@1.2.5
+check@1.3.1
jquery@1.11.10
-random@1.0.10
-reactive-dict@1.2.0
-session@1.1.7
-tracker@1.1.3
+random@1.1.0
+reactive-dict@1.3.0
+session@1.2.0
+tracker@1.2.0
underscore@1.0.10
3stack:presence
alethes:pages
@@ -49,13 +48,11 @@ arillo:flow-router-helpers
audit-argument-checks@1.0.7
kadira:blaze-layout
kadira:dochead
-meteorhacks:picker
-meteorhacks:subs-manager
mquandalle:autofocus
ongoworks:speakingurl
raix:handlebar-helpers
tap:i18n
-http@1.3.0
+http@1.4.2
# UI components
blaze
@@ -70,25 +67,29 @@ templates:tabs
verron:autosize
simple:json-routes
rajit:bootstrap3-datepicker
-shell-server@0.3.0
+shell-server@0.4.0
simple:rest-accounts-password
useraccounts:core
email@1.2.3
horka:swipebox
-dynamic-import@0.2.0
+dynamic-import@0.5.1
staringatlights:fast-render
mixmax:smart-disconnect
-accounts-password@1.5.0
+accounts-password@1.5.1
cfs:gridfs
rzymek:fullcalendar
momentjs:moment@2.22.2
-browser-policy-framing
+browser-policy-framing@1.1.0
mquandalle:moment
msavin:usercache
wekan-scrollbar
mquandalle:perfect-scrollbar
-mdg:meteor-apm-agent
-meteorhacks:unblock
+mdg:meteor-apm-agent@3.2.0-rc.0!
+coagmano:stylus
lucasantoniassi:accounts-lockout
+meteorhacks:subs-manager
+meteorhacks:picker
+lamhieu:unblock
+meteorhacks:aggregate@1.3.0
wekan-markdown
diff --git a/.meteor/release b/.meteor/release
index 56a7a07f..97064e19 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-METEOR@1.6.0.1
+METEOR@1.8.1
diff --git a/.meteor/versions b/.meteor/versions
index 187d92c5..a0c072b7 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,29 +1,29 @@
3stack:presence@1.1.2
-accounts-base@1.4.0
-accounts-oauth@1.1.15
-accounts-password@1.5.0
+accounts-base@1.4.3
+accounts-oauth@1.1.16
+accounts-password@1.5.1
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
+aldeed:simple-schema@1.5.4
alethes:pages@1.8.6
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.24.7
-babel-runtime@1.1.1
-base64@1.0.10
-binary-heap@1.0.10
-blaze@2.3.2
+autoupdate@1.6.0
+babel-compiler@7.3.4
+babel-runtime@1.3.0
+base64@1.0.11
+binary-heap@1.0.11
+blaze@2.3.3
blaze-tools@1.0.10
-boilerplate-generator@1.3.1
+boilerplate-generator@1.6.0
browser-policy-common@1.0.11
browser-policy-framing@1.1.0
-caching-compiler@1.1.9
-caching-html-compiler@1.1.2
-callback-hook@1.0.10
+caching-compiler@1.2.1
+caching-html-compiler@1.1.3
+callback-hook@1.1.0
cfs:access-point@0.1.49
cfs:base-package@0.0.30
cfs:collection@0.5.5
@@ -36,78 +36,82 @@ cfs:http-publish@0.0.13
cfs:power-queue@0.9.11
cfs:reactive-list@0.0.9
cfs:reactive-property@0.0.4
-cfs:standard-packages@0.5.9
-cfs:storage-adapter@0.2.3
-cfs:tempstore@0.1.5
+cfs:standard-packages@0.5.10
+cfs:storage-adapter@0.2.4
+cfs:tempstore@0.1.6
cfs:upload-http@0.0.20
-cfs:worker@0.1.4
-check@1.2.5
+cfs:worker@0.1.5
+check@1.3.1
chuangbo:cookie@1.1.0
-coffeescript@1.12.7_3
-coffeescript-compiler@1.12.7_3
+coagmano:stylus@2.0.0
+coffeescript@1.0.17
cottz:publish-relations@2.0.8
dburles:collection-helpers@1.1.0
ddp@1.4.0
-ddp-client@2.2.0
-ddp-common@1.3.0
+ddp-client@2.3.3
+ddp-common@1.4.0
ddp-rate-limiter@1.0.7
-ddp-server@2.1.1
+ddp-server@2.3.0
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
+diff-sequence@1.1.1
+dynamic-import@0.5.1
+ecmascript@0.12.7
+ecmascript-runtime@0.7.0
+ecmascript-runtime-client@0.8.0
+ecmascript-runtime-server@0.7.1
ejson@1.1.0
email@1.2.3
-es5-shim@4.6.15
+es5-shim@4.8.0
fastclick@1.0.13
+fetch@0.1.1
fortawesome:fontawesome@4.7.0
geojson-utils@1.0.10
horka:swipebox@1.0.2
hot-code-push@1.0.4
html-tools@1.0.11
htmljs@1.0.11
-http@1.3.0
-id-map@1.0.9
+http@1.4.2
+id-map@1.1.0
idmontie:migrations@1.0.3
-jquery@1.11.10
+inter-process-messaging@0.1.0
+jquery@1.11.11
kadira:blaze-layout@2.3.0
kadira:dochead@1.5.0
kadira:flow-router@2.12.1
kenton:accounts-sandstorm@0.7.0
+lamhieu:meteorx@2.0.1
+lamhieu:unblock@1.0.0
launch-screen@1.1.1
livedata@1.0.18
localstorage@1.2.0
-logging@1.1.19
+logging@1.1.20
lucasantoniassi:accounts-lockout@1.0.0
matb33:collection-hooks@0.8.4
matteodem:easy-search@1.6.4
-mdg:meteor-apm-agent@3.1.2
+mdg:meteor-apm-agent@3.2.3
mdg:validation-error@0.5.1
-meteor@1.8.2
-meteor-base@1.2.0
+meteor@1.9.3
+meteor-base@1.4.0
meteor-platform@1.2.6
meteorhacks:aggregate@1.3.0
meteorhacks:collection-utils@1.2.0
-meteorhacks:meteorx@1.4.1
meteorhacks:picker@1.0.3
meteorhacks:subs-manager@1.6.4
-meteorhacks:unblock@1.1.0
meteorspark:util@0.2.0
-minifier-css@1.2.16
-minifier-js@2.2.2
+minifier-css@1.4.2
+minifier-js@2.4.1
minifiers@1.1.8-faster-rebuild.0
-minimongo@1.4.3
+minimongo@1.4.5
mixmax:smart-disconnect@0.0.4
mobile-status-bar@1.0.14
-modules@0.11.0
-modules-runtime@0.9.1
-momentjs:moment@2.22.2
-mongo@1.3.1
+modern-browsers@0.1.4
+modules@0.13.0
+modules-runtime@0.10.3
+momentjs:moment@2.24.0
+mongo@1.6.2
+mongo-decimal@0.1.1
mongo-dev-server@1.1.0
-mongo-id@1.0.6
+mongo-id@1.0.7
mongo-livedata@1.0.12
mousetrap:mousetrap@1.4.6_1
mquandalle:autofocus@1.0.0
@@ -121,62 +125,63 @@ mquandalle:mousetrap-bindglobal@0.0.1
mquandalle:perfect-scrollbar@0.6.5_2
msavin:usercache@1.0.0
npm-bcrypt@0.9.3
-npm-mongo@2.2.33
-oauth@1.2.1
-oauth2@1.2.0
+npm-mongo@3.1.2
+oauth@1.2.8
+oauth2@1.2.1
observe-sequence@1.0.16
ongoworks:speakingurl@1.1.0
-ordered-dict@1.0.9
+ordered-dict@1.1.0
peerlibrary:assert@0.2.5
peerlibrary:base-component@0.16.0
peerlibrary:blaze-components@0.15.1
-peerlibrary:computed-field@0.7.0
-peerlibrary:reactive-field@0.3.0
-promise@0.10.0
+peerlibrary:computed-field@0.9.0
+peerlibrary:reactive-field@0.5.0
+promise@0.11.2
raix:eventemitter@0.1.3
raix:handlebar-helpers@0.2.5
-rajit:bootstrap3-datepicker@1.7.1
-random@1.0.10
-rate-limit@1.0.8
-reactive-dict@1.2.0
+rajit:bootstrap3-datepicker@1.7.1_1
+random@1.1.0
+rate-limit@1.0.9
+reactive-dict@1.3.0
reactive-var@1.0.11
-reload@1.1.11
-retry@1.0.9
-routepolicy@1.0.12
+reload@1.3.0
+retry@1.1.0
+routepolicy@1.1.0
rzymek:fullcalendar@3.8.0
+server-render@0.3.1
service-configuration@1.0.11
-session@1.1.7
+session@1.2.0
sha@1.0.9
-shell-server@0.3.1
+shell-server@0.4.0
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
+socket-stream-client@0.2.2
softwarerero:accounts-t9n@1.3.11
spacebars@1.0.15
spacebars-compiler@1.1.3
-srp@1.0.10
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.3
-staringatlights:fast-render@2.16.5
-staringatlights:inject-data@2.0.5
-stylus@2.513.13
+srp@1.0.12
+standard-minifier-css@1.5.3
+standard-minifier-js@2.4.1
+staringatlights:fast-render@3.0.8
+staringatlights:inject-data@2.2.1
tap:i18n@1.8.2
templates:tabs@2.3.0
templating@1.3.2
templating-compiler@1.3.3
templating-runtime@1.3.2
templating-tools@1.1.2
-tracker@1.1.3
+tracker@1.2.0
ui@1.0.13
underscore@1.0.10
-url@1.1.0
+url@1.2.0
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.7.4
webapp-hashing@1.0.9
wekan-accounts-oidc@1.0.10
wekan-markdown@1.0.7
diff --git a/client/lib/escapeActions.js b/client/lib/escapeActions.js
index 666e33e0..0757ae46 100644
--- a/client/lib/escapeActions.js
+++ b/client/lib/escapeActions.js
@@ -135,6 +135,6 @@ $(document).on('click', (evt) => {
}
});
-$(document).on('click', 'a[href=#]', (evt) => {
+$(document).on('click', 'a[href=\\#]', (evt) => {
evt.preventDefault();
});
diff --git a/package.json b/package.json
index c0195e97..a3429ee8 100644
--- a/package.json
+++ b/package.json
@@ -20,19 +20,20 @@
},
"homepage": "https://wekan.github.io",
"devDependencies": {
- "eslint": "^4.19.1"
+ "eslint": "^5.16.0"
},
"dependencies": {
- "@babel/runtime": "^7.1.2",
- "babel-runtime": "^6.26.0",
- "bson-ext": "^2.0.0",
+ "@babel/runtime": "^7.4.3",
+ "bcrypt": "^3.0.2",
+ "bson": "^4.0.0",
+ "bunyan": "^1.8.12",
"es6-promise": "^4.2.4",
- "hoek": "^5.0.4",
+ "ldapjs": "^1.0.2",
"meteor-node-stubs": "^0.4.1",
"os": "^0.1.1",
"page": "^1.8.6",
"qs": "^6.5.2",
- "source-map-support": "^0.5.9",
+ "source-map-support": "^0.5.12",
"xss": "^1.0.3"
}
}
diff --git a/packages/meteorx/package.js b/packages/meteorx/package.js
new file mode 100644
index 00000000..0bdad1ca
--- /dev/null
+++ b/packages/meteorx/package.js
@@ -0,0 +1,13 @@
+Package.describe({
+ name: 'meteorhacks:meteorx',
+ summary: 'Proxy for getting another meteorx fork',
+ version: '1.4.1'
+});
+
+Package.onUse((api) => {
+ api.export('MeteorX');
+ api.use([
+ 'lamhieu:meteorx',
+ ]);
+});
+
diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh
index c473f414..83236bda 100755
--- a/rebuild-wekan.sh
+++ b/rebuild-wekan.sh
@@ -104,7 +104,7 @@ do
npm_call -g install npm
npm_call -g install node-gyp
# Latest fibers for Meteor 1.6
- npm_call -g install fibers@2.0.0
+ npm_call -g install fibers@3.1.1
# Install Meteor, if it's not yet installed
curl https://install.meteor.com | bash
break
diff --git a/server/publications/fast-render.js b/server/publications/fast-render.js
index e28b6f2e..7c54c686 100644
--- a/server/publications/fast-render.js
+++ b/server/publications/fast-render.js
@@ -1,3 +1,5 @@
+import { FastRender } from 'meteor/staringatlights:fast-render';
+
FastRender.onAllRoutes(function() {
this.subscribe('boards');
});
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 874b617c..5a76ac29 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -65,7 +65,7 @@ apps:
parts:
mongodb:
- source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz
+ source: https://repo.mongodb.org/apt/ubuntu/dists/xenial/mongodb-org/4.0/multiverse/binary-amd64/mongodb-org-server_4.0.6_amd64.deb
plugin: dump
stage-packages: [libssl1.0.0]
filesets:
@@ -212,7 +212,7 @@ parts:
cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/
cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/
rm $SNAPCRAFT_PART_INSTALL/lib/node_modules/wekan
- rm $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
+ #rm $SNAPCRAFT_PART_INSTALL/programs/server/npm/node_modules/meteor/rajit_bootstrap3-datepicker/lib/bootstrap-datepicker/node_modules/phantomjs-prebuilt/lib/phantom/bin/phantomjs
organize:
README: README.wekan
prime:
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-09-24 02:17:07 +0000