github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 21:17:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'edge' into meteor-1.8

Browse source
This commit is contained in:
Lauri Ojansivu 2018-12-14 23:34:06 +02:00
commit 34f2e4466e
11 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.meteor/packages
View file

@ -89,4 +89,4 @@ mquandalle:moment
msavin:usercache
wekan:wekan-ldap
wekan:accounts-cas
maazalik:malihu-jquery-custom-scrollbar
wekan-scrollbar

2
.meteor/versions
View file

@ -84,7 +84,6 @@ launch-screen@1.1.1
livedata@1.0.18
localstorage@1.2.0
logging@1.1.20
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
@ -184,6 +183,7 @@ useraccounts:unstyled@1.14.2
verron:autosize@3.0.8
webapp@1.7.2
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

12
CHANGELOG.md
View file

@ -1,3 +1,15 @@
# v1.88 2018-12-14 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:

1
Dockerfile
View file

@ -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; \

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "wekan",
"version": "v1.87.0",
"version": "v1.88.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {

1
rebuild-wekan.bat
View file

@ -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

1
rebuild-wekan.sh
View file

@ -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

9
releases/rebuild-release.sh
View file

@ -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";

7
releases/virtualbox/rebuild-wekan.sh
View file

@ -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";

4
sandstorm-pkgdef.capnp
View file

@ -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,

5
snapcraft.yaml
View file

@ -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