From c546464d9f56117a8bf580512cd62fc1102559c3 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 14 Dec 2018 23:13:15 +0200 Subject: [PATCH 1/3] - Because scrollbar uses [remote file from CDN](https://github.com/MaazAli/Meteor-Malihu-Custom-Scrollbar/blob/master/jquery.mCustomScrollbar.js#L50), fork package to https://github.com/wekan/wekan-scrollbar and include non-minified file locally to Wekan, so that using scrollbar works without direct connection to Internet. Wekan should not load any external files by default, as was case before new scrollbar, and is again now after this fix. Closes #2056 --- .meteor/packages | 2 +- .meteor/versions | 2 +- Dockerfile | 1 + rebuild-wekan.bat | 1 + rebuild-wekan.sh | 1 + releases/rebuild-release.sh | 9 +++++---- releases/virtualbox/rebuild-wekan.sh | 7 +++++-- snapcraft.yaml | 5 +++++ 8 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 2db7fe2d0..56732bb28 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -88,4 +88,4 @@ mquandalle:moment msavin:usercache wekan:wekan-ldap wekan:accounts-cas -maazalik:malihu-jquery-custom-scrollbar +wekan-scrollbar diff --git a/.meteor/versions b/.meteor/versions index 05948769e..2542c2638 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -82,7 +82,6 @@ launch-screen@1.1.1 livedata@1.0.18 localstorage@1.2.0 logging@1.1.19 -maazalik:malihu-jquery-custom-scrollbar@3.0.6 matb33:collection-hooks@0.8.4 matteodem:easy-search@1.6.4 mdg:validation-error@0.5.1 @@ -179,6 +178,7 @@ useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 webapp@1.4.0 webapp-hashing@1.0.9 +wekan-scrollbar@3.1.3 wekan:accounts-cas@0.1.0 wekan:wekan-ldap@0.0.2 yasaricli:slugify@0.0.7 diff --git a/Dockerfile b/Dockerfile index 7852bc739..1383883e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -244,6 +244,7 @@ RUN \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \ gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \ + gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \ sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \ diff --git a/rebuild-wekan.bat b/rebuild-wekan.bat index 57d174cad..48ef393b0 100644 --- a/rebuild-wekan.bat +++ b/rebuild-wekan.bat @@ -33,6 +33,7 @@ git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-fl git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git +git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git REM sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js cd .. REM del /S /F /Q node_modules diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index d50e2aff9..bb6456de1 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -142,6 +142,7 @@ do git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git + git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git if [[ "$OSTYPE" == "darwin"* ]]; then echo "sed at macOS"; sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js diff --git a/releases/rebuild-release.sh b/releases/rebuild-release.sh index 8a5b8890a..9000334b2 100755 --- a/releases/rebuild-release.sh +++ b/releases/rebuild-release.sh @@ -5,10 +5,11 @@ rm -rf packages mkdir -p ~/repos/wekan/packages cd ~/repos/wekan/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 - git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git - git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git + 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 + git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git + git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git + git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git if [[ "$OSTYPE" == "darwin"* ]]; then echo "sed at macOS"; diff --git a/releases/virtualbox/rebuild-wekan.sh b/releases/virtualbox/rebuild-wekan.sh index ca00f0e29..64e4fbeaa 100755 --- a/releases/virtualbox/rebuild-wekan.sh +++ b/releases/virtualbox/rebuild-wekan.sh @@ -88,8 +88,11 @@ do cd ~/repos/wekan mkdir -p ~/repos/wekan/packages cd ~/repos/wekan/packages - git clone https://github.com/wekan/flow-router.git kadira-flow-router - git clone https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core + 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 + git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git + git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git + git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git if [[ "$OSTYPE" == "darwin"* ]]; then echo "sed at macOS"; diff --git a/snapcraft.yaml b/snapcraft.yaml index c69b1dcc6..d7cd86cfe 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -152,6 +152,11 @@ parts: git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git cd .. fi + if [ ! -d "packages/wekan-scrollbar" ]; then + cd packages + git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git + cd .. + fi rm -rf package-lock.json .build meteor add standard-minifier-js --allow-superuser meteor npm install --allow-superuser From 0b6b6dc7fd8c2d3f90e8128da8275d43821df041 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 14 Dec 2018 23:27:22 +0200 Subject: [PATCH 2/3] - Fix: [Scrollbar used](https://github.com/wekan/wekan/issues/2056) [remote file from CDN](https://github.com/MaazAli/Meteor-Malihu-Custom-Scrollbar/blob/master/jquery.mCustomScrollbar.js#L50), so forked package to https://github.com/wekan/wekan-scrollbar and included non-minified file locally to Wekan, so that using scrollbar works without direct connection to Internet. Wekan should not load any external files by default, as was case before new scrollbar, and is again now [after this fix](https://github.com/wekan/wekan/commit/c546464d9f56117a8bf580512cd62fc1102559c3). Thanks to xet7 ! Closes #2056 --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 92b4353e8..ec0622d61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- Fix: [Scrollbar used](https://github.com/wekan/wekan/issues/2056) [remote file from CDN](https://github.com/MaazAli/Meteor-Malihu-Custom-Scrollbar/blob/master/jquery.mCustomScrollbar.js#L50), + so forked package to https://github.com/wekan/wekan-scrollbar and included + non-minified file locally to Wekan, so that using scrollbar works without direct connection + to Internet. Wekan should not load any external files by default, as was case before + new scrollbar, and is again now [after this fix](https://github.com/wekan/wekan/commit/c546464d9f56117a8bf580512cd62fc1102559c3). + +Thanks to GitHub user xet7 for contributions. + # v1.87 2018-12-13 Wekan release This release fixes the following bugs: From c066883dbd76110be19d75bd77ef2a0270dadda2 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 14 Dec 2018 23:31:17 +0200 Subject: [PATCH 3/3] v1.88 --- CHANGELOG.md | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec0622d61..bb129ea2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v1.88 2018-12-14 Wekan release This release fixes the following bugs: diff --git a/package.json b/package.json index 96dd482a9..63d7d060c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v1.87.0", + "version": "v1.88.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 0e52aafeb..3da808678 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 189, + appVersion = 190, # Increment this for every release. - appMarketingVersion = (defaultText = "1.87.0~2018-12-13"), + appMarketingVersion = (defaultText = "1.88.0~2018-12-14"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,