From 0c9343ad88c929072d768efa2e2bd91516fe8f4f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 21 Nov 2017 13:22:49 +0200 Subject: [PATCH 01/12] Fix typo. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e10ea7cfb..93568f25b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ and fixes the following bugs: * [Remove erroneous minicard title whitespace](https://github.com/wekan/wekan/pull/1347); * [Card details: fix title editing with shift key](https://github.com/wekan/wekan/pull/1348). -Thanks to GitHub users couscous3, GhassenRjab and thuanpq for their contributions. +Thanks to GitHub users couscous3, GhassenRjab, thuanpq and xet7 for their contributions. # v0.55 2017-11-19 Wekan release From 00737fa01521a801de9fdbb72f501f191b0d3a35 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 21 Nov 2017 13:24:42 +0200 Subject: [PATCH 02/12] Try to fix markdown. --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93568f25b..a3d33174d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,15 +2,15 @@ This release adds the following new features: -* [Copy/Move cards to other board in Standalone Wekan](https://github.com/wekan/wekan/pull/1330); -* [Spent time/Overtime on card](https://github.com/wekan/wekan/pull/1344); -* New translation: Greek. +- [Copy/Move cards to other board in Standalone Wekan](https://github.com/wekan/wekan/pull/1330); +- [Spent time/Overtime on card](https://github.com/wekan/wekan/pull/1344); +- New translation: Greek. and fixes the following bugs: -* [Board list with long-description boards not visible](https://github.com/wekan/wekan/pull/1346); -* [Remove erroneous minicard title whitespace](https://github.com/wekan/wekan/pull/1347); -* [Card details: fix title editing with shift key](https://github.com/wekan/wekan/pull/1348). +- [Board list with long-description boards not visible](https://github.com/wekan/wekan/pull/1346); +- [Remove erroneous minicard title whitespace](https://github.com/wekan/wekan/pull/1347); +- [Card details: fix title editing with shift key](https://github.com/wekan/wekan/pull/1348). Thanks to GitHub users couscous3, GhassenRjab, thuanpq and xet7 for their contributions. From 0c5d6c2ade2254cd479697165b6fe4dae9a80e23 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 21 Nov 2017 13:26:55 +0200 Subject: [PATCH 03/12] Try to fix markdown. Is there bug at GitHub? It did combine bullet points to same line. --- CHANGELOG.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3d33174d..d7db18a84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,15 +2,19 @@ This release adds the following new features: -- [Copy/Move cards to other board in Standalone Wekan](https://github.com/wekan/wekan/pull/1330); -- [Spent time/Overtime on card](https://github.com/wekan/wekan/pull/1344); -- New translation: Greek. +* [Copy/Move cards to other board in Standalone Wekan](https://github.com/wekan/wekan/pull/1330); + +* [Spent time/Overtime on card](https://github.com/wekan/wekan/pull/1344); + +* New translation: Greek. and fixes the following bugs: -- [Board list with long-description boards not visible](https://github.com/wekan/wekan/pull/1346); -- [Remove erroneous minicard title whitespace](https://github.com/wekan/wekan/pull/1347); -- [Card details: fix title editing with shift key](https://github.com/wekan/wekan/pull/1348). +* [Board list with long-description boards not visible](https://github.com/wekan/wekan/pull/1346); + +* [Remove erroneous minicard title whitespace](https://github.com/wekan/wekan/pull/1347) + +* [Card details: fix title editing with shift key](https://github.com/wekan/wekan/pull/1348). Thanks to GitHub users couscous3, GhassenRjab, thuanpq and xet7 for their contributions. From fbf97d31a0899ef32a6714c4c06b7d645d520f15 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 21 Nov 2017 13:28:22 +0200 Subject: [PATCH 04/12] Maybe github does not like : at bullet point. --- CHANGELOG.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7db18a84..4ead0ca10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,18 +3,14 @@ This release adds the following new features: * [Copy/Move cards to other board in Standalone Wekan](https://github.com/wekan/wekan/pull/1330); - * [Spent time/Overtime on card](https://github.com/wekan/wekan/pull/1344); - * New translation: Greek. and fixes the following bugs: * [Board list with long-description boards not visible](https://github.com/wekan/wekan/pull/1346); - -* [Remove erroneous minicard title whitespace](https://github.com/wekan/wekan/pull/1347) - -* [Card details: fix title editing with shift key](https://github.com/wekan/wekan/pull/1348). +* [Remove erroneous minicard title whitespace](https://github.com/wekan/wekan/pull/1347); +* [Fix title editing with shift key at card details](https://github.com/wekan/wekan/pull/1348). Thanks to GitHub users couscous3, GhassenRjab, thuanpq and xet7 for their contributions. From 4ffe9438e0db8172c4223da27d9007d17c1a0b90 Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Wed, 22 Nov 2017 16:10:03 +0100 Subject: [PATCH 05/12] Fix add logger bug In case you want to have only the console, it will fail at the `Winston.add` as it is already there. --- server/logger.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/server/logger.js b/server/logger.js index 70caa2929..ae4a6338c 100644 --- a/server/logger.js +++ b/server/logger.js @@ -3,6 +3,8 @@ Meteor.startup(() => { require('winston-zulip'); const fs = require('fs'); + //remove default logger + Winston.remove(Winston.transports.Console); const loggerEnable = process.env.LOGGER_ENABLE || false; if (loggerEnable) { @@ -15,9 +17,6 @@ Meteor.startup(() => { json: true, timestamp: true, }); - } else { - //remove default logger - Winston.remove(Winston.transports.Console); } if (loggers.includes('file')) { @@ -57,9 +56,6 @@ Meteor.startup(() => { Winston.log('info', `zulipconfig ${zulipConfig}`); } - } else { - //remove default logger - Winston.remove(Winston.transports.Console); } Winston.log('info', 'Logger is completly instanciate'); }); From 7f8f6bf3dbe4348907085968cd28ec19f69b5384 Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Wed, 22 Nov 2017 16:10:18 +0100 Subject: [PATCH 06/12] Make logger enabled by default --- server/logger.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/logger.js b/server/logger.js index ae4a6338c..4a32c0ef6 100644 --- a/server/logger.js +++ b/server/logger.js @@ -5,7 +5,8 @@ Meteor.startup(() => { //remove default logger Winston.remove(Winston.transports.Console); - const loggerEnable = process.env.LOGGER_ENABLE || false; + + const loggerEnable = process.env.LOGGER_ENABLE || true; if (loggerEnable) { Winston.log('info', 'logger is enable'); From b03c9b987959d35324295c7cb49b5c6904ebda43 Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Wed, 22 Nov 2017 16:10:43 +0100 Subject: [PATCH 07/12] Fix bug when LOGGER is enabled, but LOGGERS is empty. --- server/logger.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server/logger.js b/server/logger.js index 4a32c0ef6..6d7be96d6 100644 --- a/server/logger.js +++ b/server/logger.js @@ -10,8 +10,12 @@ Meteor.startup(() => { if (loggerEnable) { Winston.log('info', 'logger is enable'); - const loggers = process.env.LOGGERS.split(',') || 'console'; - Winston.log('info', `Loggers selected : ${ process.env.LOGGERS }, if empty default is console`); + if (process.env.LOGGERS) { + const loggers = process.env.LOGGERS.split(',') || 'console'; + Winston.log('info', `Loggers selected : ${ process.env.LOGGERS }, if empty default is console`); + } else { + const loggers = 'console'; + } if (loggers.includes('console')) { Winston.add(Winston.transports.Console, { @@ -58,6 +62,7 @@ Meteor.startup(() => { } } + Winston.log('info', 'Logger is completly instanciate'); }); From 674d45a81c94e0f862c9624b0f89743a5c675d89 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 23 Nov 2017 01:47:10 +0200 Subject: [PATCH 08/12] Add Gogs Integration as separate project. --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ead0ca10..ab43fce04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Upcoming Wekan release + +* [Gogs Integration](https://github.com/wekan/wekan-gogs) as separate project. It can already be tested, fixes welcome as pull requests. + +Thanks to GitHub user andresmanelli for contributions. + # v0.56 2017-11-21 Wekan release This release adds the following new features: From ebff813f99f0dc7463b482d4ad16a21dad87d139 Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Thu, 23 Nov 2017 10:07:49 +0100 Subject: [PATCH 09/12] Try to fix build --- server/logger.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/server/logger.js b/server/logger.js index 6d7be96d6..de223951a 100644 --- a/server/logger.js +++ b/server/logger.js @@ -10,12 +10,7 @@ Meteor.startup(() => { if (loggerEnable) { Winston.log('info', 'logger is enable'); - if (process.env.LOGGERS) { - const loggers = process.env.LOGGERS.split(',') || 'console'; - Winston.log('info', `Loggers selected : ${ process.env.LOGGERS }, if empty default is console`); - } else { - const loggers = 'console'; - } + const loggers = process.env.LOGGERS ? process.env.LOGGERS.split(',') : 'console' if (loggers.includes('console')) { Winston.add(Winston.transports.Console, { From ee2236435480186f6b54090f9093b7a9132d746c Mon Sep 17 00:00:00 2001 From: pierreozoux Date: Thu, 23 Nov 2017 10:07:49 +0100 Subject: [PATCH 10/12] Try to fix build --- server/logger.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/server/logger.js b/server/logger.js index 6d7be96d6..cb06682f8 100644 --- a/server/logger.js +++ b/server/logger.js @@ -10,12 +10,7 @@ Meteor.startup(() => { if (loggerEnable) { Winston.log('info', 'logger is enable'); - if (process.env.LOGGERS) { - const loggers = process.env.LOGGERS.split(',') || 'console'; - Winston.log('info', `Loggers selected : ${ process.env.LOGGERS }, if empty default is console`); - } else { - const loggers = 'console'; - } + const loggers = process.env.LOGGERS ? process.env.LOGGERS.split(',') : 'console'; if (loggers.includes('console')) { Winston.add(Winston.transports.Console, { From 45c78a05e26588fd8170baa6b2b3a0cd1b0b8a35 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 23 Nov 2017 11:40:03 +0200 Subject: [PATCH 11/12] Fix Winston logger. Thanks to pierreozoux ! --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab43fce04..ee1723f4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,14 @@ -# Upcoming Wekan release +# v0.57 2017-11-23 Wekan release + +This release adds the following new features: * [Gogs Integration](https://github.com/wekan/wekan-gogs) as separate project. It can already be tested, fixes welcome as pull requests. -Thanks to GitHub user andresmanelli for contributions. +and fixes the following bugs: + +* [Fix Winston logger](https://github.com/wekan/wekan/pull/1350). + +Thanks to GitHub users andresmanelli and pierreozoux for their contributions. # v0.56 2017-11-21 Wekan release From 60929fb200748ef8aebcd3f2089ba1e1c0801941 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 23 Nov 2017 11:45:44 +0200 Subject: [PATCH 12/12] v0.57 --- 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 ee1723f4b..b1c278165 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ This release adds the following new features: -* [Gogs Integration](https://github.com/wekan/wekan-gogs) as separate project. It can already be tested, fixes welcome as pull requests. +* [Gogs Integration](https://github.com/wekan/wekan-gogs) as separate project. Please test and submit issues and pull requests to that project. and fixes the following bugs: diff --git a/package.json b/package.json index 1da877260..65800aa14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.56.0", + "version": "0.57.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 8d0bed44b..a49f6dea3 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 = 42, + appVersion = 43, # Increment this for every release. - appMarketingVersion = (defaultText = "0.56.0~2017-11-21"), + appMarketingVersion = (defaultText = "0.57.0~2017-11-23"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,