Merge branch 'master' of https://github.com/wekan/wekan

CHANGELOG.md

@@ -1,3 +1,14 @@
+# Upcoming Wekan release
+
+This release adds the following improvements:
+
+- [Update to My Cards](https://github.com/wekan/wekan/pulls/3416).
+  Thanks to jrsupplee.
+- [Cards, custom fields are displayed in alphabetic order](https://github.com/wekan/wekan/pulls/3417).
+  Thanks to mfilser.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v4.70 2021-01-04 Wekan release
 
 This release adds the following CRITICAL SECURITY FIXES:

README.md

@@ -4,6 +4,8 @@
 
 [![Contributors](https://img.shields.io/github/contributors/wekan/wekan.svg "Contributors")](https://github.com/wekan/wekan/graphs/contributors)
 [![Docker Repository on Quay](https://quay.io/repository/wekan/wekan/status "Docker Repository on Quay")](https://quay.io/repository/wekan/wekan)
+[![Docker Hub container status](https://img.shields.io/docker/build/wekanteam/wekan.svg "Docker Hub container sta>
+[![Docker Hub pulls](https://img.shields.io/docker/pulls/wekanteam/wekan.svg "Docker Hub Pulls")](https://hub.doc>
 [![Wekan Build Status][travis_badge]][travis_status]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/02137ecec4e34c5aa303f57637196a93 "Codacy Badge")](https://www.codacy.com/app/xet7/wekan?utm_source=github.com&utm_medium=referral&utm_content=wekan/wekan&utm_campaign=Badge_Grade)
 [![Code Climate](https://codeclimate.com/github/wekan/wekan/badges/gpa.svg "Code Climate")](https://codeclimate.com/github/wekan/wekan)
@@ -11,12 +13,6 @@
 [![Code analysis at Open Hub](https://img.shields.io/badge/code%20analysis-at%20Open%20Hub-brightgreen.svg "Code analysis at Open Hub")](https://www.openhub.net/p/wekan)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fwekan%2Fwekan.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fwekan%2Fwekan?ref=badge_shield)
 
-NOTE: Docker Hub builds are broken with error ENOMEM. Only Quay works, see docker-compose.yml .
-<!--
-[![Docker Hub container status](https://img.shields.io/docker/build/wekanteam/wekan.svg "Docker Hub container sta>
-[![Docker Hub pulls](https://img.shields.io/docker/pulls/wekanteam/wekan.svg "Docker Hub Pulls")](https://hub.doc>
--->
-
 ## [Translate Wekan at Transifex](https://transifex.com/wekan/wekan)
 
 Translations to non-English languages are accepted only at [Transifex](https://transifex.com/wekan/wekan) using webbrowser.

client/components/lists/listHeader.jade

@@ -153,7 +153,7 @@ template(name="setListColorPopup")
   form.edit-label
     .palette-colors: each colors
       // note: we use the swimlane palette to have more than just the border
-      span.card-label.palette-color.js-palette-color(class=colorClass)
+      span.card-label.palette-color.js-palette-color(class="card-details-{{color}}")
         if(isSelected color)
           i.fa.fa-check
     button.primary.confirm.js-submit {{_ 'save'}}

client/components/lists/listHeader.js

@@ -279,7 +279,11 @@ BlazeComponent.extendComponent({
   },
 
   isSelected(color) {
-    return this.currentColor.get() === color;
+    if (this.currentColor.get() === null) {
+      return color === 'white';
+    } else {
+      return this.currentColor.get() === color;
+    }
   },
 
   events() {

docker-compose.yml

@@ -118,7 +118,7 @@ services:
     image: quay.io/wekan/wekan
     # b) Using specific version tag:
     # image: quay.io/wekan/wekan:v4.52
-    # c) Docker Hub builds are broken with error ENOMEM https://hub.docker.com/r/wekanteam/wekan
+    # c) Docker Hub builds work https://hub.docker.com/r/wekanteam/wekan
     # image: wekanteam/wekan
     #-------------------------------------------------------------------------------------
     container_name: wekan-app

models/cards.js

@@ -650,7 +650,7 @@ Cards.helpers({
 
     // match right definition to each field
     if (!this.customFields) return [];
-    return this.customFields.map(customField => {
+    const ret = this.customFields.map(customField => {
       const definition = definitions.find(definition => {
         return definition._id === customField._id;
       });
@@ -676,6 +676,8 @@ Cards.helpers({
         definition,
       };
     });
+    ret.sort((a, b) => a.definition.name.localeCompare(b.definition.name));
+    return ret;
   },
 
   colorClass() {

packages/wekan-oidc/oidc_server.js

@@ -4,7 +4,9 @@ httpCa = false;
 if (process.env.OAUTH2_CA_CERT !== undefined) {
     try {
         const fs = Npm.require('fs');
-	httpCa = fs.readFileSync(process.env.OAUTH2_CA_CERT);
+        if (fs.existsSync(process.env.OAUTH2_CA_CERT)) {
+          httpCa = fs.readFileSync(process.env.OAUTH2_CA_CERT);
+        }
     } catch(e) {
 	console.log('WARNING: failed loading: ' + process.env.OAUTH2_CA_CERT);
 	console.log(e);