Add Wekan v2.95-v2.97 master branch features and fixes to meteor-1.8 branch.

Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2019-07-01 17:23:41 -04:00
parent 2c90e7c585
commit 34b2168d0d
10 changed files with 181 additions and 7 deletions

View file

@ -238,7 +238,12 @@ Boards.attachSchema(
'pomegranate',
'pumpkin',
'wisteria',
'moderatepink',
'strongcyan',
'limegreen',
'midnight',
'dark',
'relax',
],
// eslint-disable-next-line consistent-return
autoValue() {
@ -1223,7 +1228,8 @@ if (Meteor.isServer) {
* @description This allows to create a board.
*
* The color has to be chosen between `belize`, `nephritis`, `pomegranate`,
* `pumpkin`, `wisteria`, `midnight`:
* `pumpkin`, `wisteria`, `moderatepink`, `strongcyan`,
* `limegreen`, `midnight`, `dark`, `relax`:
*
* <img src="https://wekan.github.io/board-colors.png" width="40%" alt="Wekan logo" />
*

View file

@ -484,9 +484,9 @@ export class TrelloCreator {
green: 'nephritis',
red: 'pomegranate',
purple: 'wisteria',
pink: 'pomegranate',
lime: 'nephritis',
sky: 'belize',
pink: 'moderatepink',
lime: 'limegreen',
sky: 'strongcyan',
grey: 'midnight',
};
const wekanColor = mapColors[trelloColorCode];