diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-12-26 22:50:25 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-12-26 22:50:25 +0200 |
| commit | 4fb81bd6867fb76adefc85bc6cd2da5462156ff0 (patch) | |
| tree | ff208b31d90be42d93940d500bb4b91dab447cf7 | |
| parent | aff8b562d66c59e44fe9653ef56cc7c190ca2f55 (diff) | |
| parent | 7fd09761cbeb19c19d1e96d63a0b7a5c5d19e0f2 (diff) | |
| download | wekan-4fb81bd6867fb76adefc85bc6cd2da5462156ff0.tar.gz wekan-4fb81bd6867fb76adefc85bc6cd2da5462156ff0.tar.bz2 wekan-4fb81bd6867fb76adefc85bc6cd2da5462156ff0.zip | |
Merge branch 'edge' into meteor-1.8
| -rw-r--r-- | CHANGELOG.md | 11 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Stackerfile.yml | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rw-r--r-- | i18n/he.i18n.json | 10 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sandstorm-pkgdef.capnp | 4 | ||||
| -rw-r--r-- | snapcraft.yaml | 4 | ||||
| -rwxr-xr-x | stacksmith/user-scripts/build.sh | 9 |
9 files changed, 29 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f1422939..7ef8f851 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# v1.97 2018-12-26 Wekan release + +This release adds the following new features: + +- Upgrade to Node 8.15.0 and MongoDB 3.2.22. +- Stacksmith: back to Meteor 1.6.x based Wekan, because Meteor 1.8.x based is currently broken. + +Thanks to GitHub user xet7 contributions. + # v1.96 2018-12-24 Wekan release This release adds the following new features: @@ -11,7 +20,7 @@ and tries to fix following bugs: - Fixes to docker-compose.yml so that Wekan Meteor 1.6.x version would work. Most likely Meteor 1.8.x version is still broken. -Thanks to GitHub user xet7 contributions. +Thanks to GitHub user xet7 for contributions. # v1.95 2018-12-21 Wekan release @@ -76,7 +76,7 @@ ARG DEFAULT_AUTHENTICATION_METHOD # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 # ENV BUILD_DEPS="paxctl" ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \ - NODE_VERSION=v8.14.1 \ + NODE_VERSION=v8.15.0 \ METEOR_RELEASE=1.6.0.1 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ diff --git a/Stackerfile.yml b/Stackerfile.yml index 944d6c0c..c1e2a029 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v1.95.0" +appVersion: "v1.97.0" files: userUploads: - README.md diff --git a/docker-compose.yml b/docker-compose.yml index 9d635a33..4df91f75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,7 +94,7 @@ services: # image: mongo:4.0.4 # b) For Wekan Meteor 1.6.x version at master/devel/edge branches. # Only for Snap and Sandstorm while they are not upgraded yet to Meteor 1.8.x - image: mongo:3.2.21 + image: mongo:3.2.22 #------------------------------------------------------------------------------------- container_name: wekan-db restart: always diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index e18f4c57..4f8493b1 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -283,13 +283,13 @@ "import-board": "ייבוא לוח", "import-board-c": "יבוא לוח", "import-board-title-trello": "ייבוא לוח מטרלו", - "import-board-title-wekan": "Import board from previous export", - "import-sandstorm-backup-warning": "Do not delete data you import from original exported board or Trello before checking does this grain close and open again, or do you get Board not found error, that means data loss.", + "import-board-title-wekan": "ייבוא לוח מייצוא קודם", + "import-sandstorm-backup-warning": "עדיף לא למחוק נתונים שייובאו מייצוא מקורי או מ־Trello בטרם בדיקה האם הגרעין הזה נסגר ונפתח שוב או אם מתקבלת שגיאה על כך שהלוח לא נמצא, משמעות הדבר היא אבדן מידע.", "import-sandstorm-warning": "הלוח שייובא ימחק את כל הנתונים הקיימים בלוח ויחליף אותם בלוח שייובא.", "from-trello": "מ־Trello", "from-wekan": "מייצוא קודם", "import-board-instruction-trello": "בלוח הטרלו שלך, עליך ללחוץ על ‚תפריט‘, ואז על ‚עוד‘, ‚הדפסה וייצוא‘, ‚יצוא JSON‘ ולהעתיק את הטקסט שנוצר.", - "import-board-instruction-wekan": "In your board, go to 'Menu', then 'Export board', and copy the text in the downloaded file.", + "import-board-instruction-wekan": "בלוח שלך עליך לגשת אל ‚תפריט’, לאחר מכן ‚ייצוא לוח’ ואז להעתיק את הטקסט מהקובץ שהתקבל.", "import-board-instruction-about-errors": "גם אם התקבלו שגיאות בעת ייבוא לוח, ייתכן שהייבוא עבד. כדי לבדוק זאת, יש להיכנס ל„כל הלוחות”.", "import-json-placeholder": "יש להדביק את נתוני ה־JSON התקינים לכאן", "import-map-members": "מיפוי חברים", @@ -620,6 +620,6 @@ "hide-logo": "הסתרת לוגו", "add-custom-html-after-body-start": "הוספת קוד HTML מותאם אישית בתחילת ה <body>.", "add-custom-html-before-body-end": "הוספת קוד HTML מותאם אישית בסוף ה</body>.", - "error-undefined": "Something went wrong", - "error-ldap-login": "An error occurred while trying to login" + "error-undefined": "מהו השתבש", + "error-ldap-login": "אירעה שגיאה בעת ניסיון הכניסה" }
\ No newline at end of file diff --git a/package.json b/package.json index 034db32a..010acb4d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v1.96.0", + "version": "v1.97.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index f9574568..b90591a8 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 = 198, + appVersion = 199, # Increment this for every release. - appMarketingVersion = (defaultText = "1.96.0~2018-12-24"), + appMarketingVersion = (defaultText = "1.97.0~2018-12-26"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, diff --git a/snapcraft.yaml b/snapcraft.yaml index 4831f150..d14d8037 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.21.tgz + source: https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.2.22.tgz plugin: dump stage-packages: [libssl1.0.0] filesets: @@ -81,7 +81,7 @@ parts: wekan: source: . plugin: nodejs - node-engine: 8.14.1 + node-engine: 8.15.0 node-packages: - node-gyp - node-pre-gyp diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh index f589bd82..c3b80eac 100755 --- a/stacksmith/user-scripts/build.sh +++ b/stacksmith/user-scripts/build.sh @@ -2,7 +2,7 @@ set -euxo pipefail BUILD_DEPS="bsdtar gnupg wget curl bzip2 python git ca-certificates perl-Digest-SHA" -NODE_VERSION=v8.14.1 +NODE_VERSION=v8.15.0 #METEOR_RELEASE=1.6.0.1 - for Stacksmith, meteor-1.8 branch that could have METEOR@1.8.1-beta.8 or newer USE_EDGE=false METEOR_EDGE=1.5-beta.17 @@ -19,8 +19,11 @@ sudo useradd --user-group --system --home-dir /home/wekan wekan sudo mkdir -p /home/wekan sudo chown wekan:wekan /home/wekan/ -# Using meteor-1.8 branch that has newer Meteor that is compatible with MongoDB 4.x -sudo -u wekan git clone -b meteor-1.8 https://github.com/wekan/wekan.git /home/wekan/app +# CURRENTLY BROKEN: meteor-1.8 branch that has newer Meteor that is compatible with MongoDB 4.x +# sudo -u wekan git clone -b meteor-1.8 https://github.com/wekan/wekan.git /home/wekan/app + +# Using Meteor 1.6.x version of Wekan +sudo -u wekan git clone https://github.com/wekan/wekan.git /home/wekan/app sudo yum install -y ${BUILD_DEPS} |