mirror of
https://github.com/wekan/wekan.git
synced 2025-04-22 13:07:17 -04:00
Merge branch 'edge' into meteor-1.8
This commit is contained in:
Lauri Ojansivu
commit
4fb81bd686
9 changed files with 29 additions and 17 deletions
11
CHANGELOG.md
11
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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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": "אירעה שגיאה בעת ניסיון הכניסה"
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "wekan",
|
||||
"version": "v1.96.0",
|
||||
"version": "v1.97.0",
|
||||
"description": "Open-Source kanban",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue