Merge pull request #4500 from mfilser/upgrade-meteor-2.7.2-fix_sandstorm_login

Upgrade meteor 2.7.2 fix sandstorm login + merge branch master into upgrade-meteor
2025-12-26 20:28:48 +01:00 · 2022-05-04 21:12:43 +03:00 · 2022-05-04 21:12:43 +03:00 · 303cebef63
commit 303cebef63
parent 255eac9f98 2856cf9baa
18 changed files with 182 additions and 40 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@ -1,6 +1,10 @@
-FROM ubuntu:rolling
+FROM ubuntu:21.10
 LABEL maintainer="sgr"

+# 2022-04-25:
+# - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling,
+#   so changing to 21.10. https://github.com/wekan/wekan/issues/4488
+
 ENV BUILD_DEPS="gnupg gosu libarchive-tools wget curl bzip2 g++ build-essential python3 git ca-certificates iproute2"
 ENV DEBIAN_FRONTEND=noninteractive

--- a/.future-snap/snapcraft.yaml
+++ b/.future-snap/snapcraft.yaml
@ -1,5 +1,5 @@
 name: wekan
-version: '6.10'
+version: '6.21'
 base: core20
 summary: Open Source kanban
 description: |
@ -20,6 +20,12 @@ architectures:
  - build-on: arm64
    run-on: arm64

+  - build-on: ppc64el
+    run-on: ppc64el
+
+  - build-on: s390x
+    run-on: s390x
+
 plugs:
  mongodb-plug:
    interface: content
@ -73,8 +79,10 @@ parts:
    mongodb:
        plugin: dump
        source:
-          - on amd64: https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-amd64/mongodb-org-server_4.4.12_amd64.deb
-          - on arm64: https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-arm64/mongodb-org-server_4.4.12_arm64.deb
+          - on amd64: https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-amd64/mongodb-org-server_4.4.13_amd64.deb
+          - on arm64: https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-arm64/mongodb-org-server_4.4.13_arm64.deb
+          - on ppc64el: https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-ppc64el/mongodb-org-server_4.4.13_ppc64el.deb
+          - on s390x: https://repo.mongodb.org/apt/ubuntu/dists/focal/mongodb-org/4.4/multiverse/binary-s390x/mongodb-org-server_4.4.13_s390x.deb
        stage-packages:
            - libssl1.1
            - libcurl3-dev
@ -90,19 +98,22 @@ parts:
            - $mongo

    wekan:
-        plugin: npm
+        #plugin: npm
+        plugin: dump
        source:
-        # TODO: Fix URLs to some allowed GitHub releases URL.
+        # Fixed URLs to some allowed GitHub releases URL.
        # Non-GitHub build server file urls are not allowed at 2022-03-02 and later.
-          - on amd64: https://wekan.github.io/wekan-latest-x64.zip
-          - on arm64: https://wekan.github.io/raspi3/wekan-latest-arm64.zip
-        npm-node-version: 14.19.0
+          - on amd64: https://github.com/wekan/wekan/releases/download/v6.20/wekan-6.20-amd64.zip
+          - on arm64: https://github.com/wekan/wekan/releases/download/v6.20/wekan-6.20-arm64.zip
+          - on ppc64el: https://github.com/wekan/wekan/releases/download/v6.20/wekan-6.20-ppc64el.zip
+          - on s390x: https://github.com/wekan/wekan/releases/download/v6.20/wekan-6.20-s390x.zip
+#        npm-node-version: 14.19.1
 #        node-packages:
 #            - node-gyp
 #            - node-pre-gyp
 #            - fibers
-        build-packages:
-          - npm
+#        build-packages:
+#          - npm
 #            - build-essential
 #            - ca-certificates
 #            - apt-utils
@ -114,7 +125,7 @@ parts:
 #            - execstack
 #            - nodejs
 #            - npm
-          - p7zip-full
+#          - p7zip-full
 #        stage-packages:
 #            - libfontconfig1
        override-build: |
@ -151,3 +162,22 @@ parts:
          README.txt: CADDY_README.txt
        stage:
          - -init
+
+    caddy2:
+        plugin: dump
+        source:
+        # Fixed URLs to some allowed GitHub releases URL.
+        # Non-GitHub build server file urls are not allowed at 2022-03-02 and later.
+          - on amd64: https://github.com/wekan/wekan/releases/download/v6.20/caddy-v2-amd64.zip
+          - on arm64: https://github.com/wekan/wekan/releases/download/v6.20/caddy-v2-arm64.zip
+          - on ppc64el: https://github.com/wekan/wekan/releases/download/v6.20/caddy-v2-ppc64el.zip
+          - on s390x: https://github.com/wekan/wekan/releases/download/v6.20/caddy-v2-s390x.zip
+        source-type: zip
+        organize:
+          caddy: bin/caddy
+          CHANGES.txt: CADDY_CHANGES.txt
+          EULA.txt: CADDY_EULA.txt
+          LICENSES.txt: CADDY_LICENSES.txt
+          README.txt: CADDY_README.txt
+        stage:
+          - -init
--- a/.meteor/versions
+++ b/.meteor/versions
@ -224,6 +224,6 @@ useraccounts:flow-routing@1.15.0
 useraccounts:unstyled@1.14.2
 webapp@1.13.1
 webapp-hashing@1.1.0
-wekan-accounts-sandstorm@0.7.0
+wekan-accounts-sandstorm@0.8.0
 wekan-markdown@1.0.9
 zimme:active-route@2.3.2
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,28 @@
 [Mac ChangeLog](https://github.com/wekan/wekan/wiki/Mac)

-# Upcoming WeKan ® release
+# v6.21 2022-04-28 WeKan ® release
+
+This release fixes the following bugs:
+
+- [Fix themes](https://github.com/wekan/wekan/pull/4490).
+  Thanks to TheExo.
+- [Try to fix Snap by adding cypress and jest for cypress-image-snapshot and jest-image-snapshot](https://github.com/wekan/wekan/commit/7dd5fa4ac40f0fe63168b9a2ef4a0940bfc9d80b).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v6.20 2022-04-25 WeKan ® release
+
+This release fixes the following bugs:
+
+- [Fix Dockerfile: Ubuntu 22.04 causes Python trouble](https://github.com/wekan/wekan/commit/79a866e2384d262572edf68503f31e699df675eb).
+  Thanks to bronger.
+- [FileStoreStrategyFactory, added logic to determine the right file storage strategy to use](https://github.com/wekan/wekan/pull/4486).
+  Thanks to mfilser.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v6.19 2022-04-22 WeKan ® release

 This release adds the following new features:

@ -10,10 +32,14 @@ This release adds the following new features:
  Thanks to mfilser and xet7.
 - [Added All Boards Settings popup title](https://github.com/wekan/wekan/commit/023deb6c953b66f4dfcbff68ab2d1871dfb45d51).
  Thanks to xet7.
+- [Updated All Boards Settings icon](https://github.com/wekan/wekan/commit/ce55d84fd83f58d25797cfccf5cec35b68b41732).
+  Thanks to xet7.
 - [Added to Board Settings: Minicard Settings and All Boards Settings improvements](https://github.com/wekan/wekan/commit/95a4b4fd919683e51e56a7bb76213b146a170e09).
  Thanks to xet7.
 - [Added Table View to My Cards](https://github.com/wekan/wekan/pulls/4479).
  Thanks to helioguardabaxo.
+- [Fix syntax in myCards.jade](https://github.com/wekan/wekan/commit/d271678ef494675d78ada25ee33f1d18d3d7ce14).
+  Thanks to xet7.
 - [Multi file storage for moving between MongoDB GridFS and filesystem](https://github.com/wekan/wekan/pull/4484).
  Thanks to mfilser.

@ -31,6 +57,8 @@ and fixes the following bugs:

 - [Fix Board Settings / All Boards Settings options has some bug](https://github.com/wekan/wekan/commit/77085daaa8b16f05acb314f077f48bf1d4ddbbac).
  Thanks to helioguardabaxo.
+- [.gitignore, ignore all vim swap files](https://github.com/wekan/wekan/commit/5e567365f3b4e7cc40558105a0bd779efa17ac5b).
+  Thanks to mfilser.

 Thanks to above GitHub users for their contributions and translators for their translations.

--- a/6
+++ b/6
@ -1,6 +1,10 @@
-FROM ubuntu:rolling
+FROM ubuntu:21.10
 LABEL maintainer="wekan"

+# 2022-04-25:
+# - gyp does not yet work with Ubuntu 22.04 ubuntu:rolling,
+#   so changing to 21.10. https://github.com/wekan/wekan/issues/4488
+
 # 2021-09-18:
 # - Above Ubuntu base image copied from Docker Hub ubuntu:hirsute-20210825
 #   to Quay to avoid Docker Hub rate limits.
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v6.18.0"
+appVersion: "v6.21.0"
 files:
  userUploads:
    - README.md
--- a/client/components/boards/boardColors.styl
+++ b/client/components/boards/boardColors.styl
@ -1068,9 +1068,19 @@ setBoardClear(color1,color2)
    border-left: 1px solid #333333
    color: #cccccc

-  .activities .activity .activity-desc .activity-comment
-    background-color: #cccccc
-    color: #222222
+  .activities .activity .activity-desc
+    .activity-comment
+      background-color: #cccccc
+      color: #222222
+    .activity-checklist
+      background-color: #cccccc
+      color: #222222;
+
+  .attachments-galery .attachment-item
+    color: #222222;
+
+  .minicard-description
+    color: #222222;

  /* Pop-Ups for "Modern Dark" */
 .pop-over.board-color-moderndark
@ -1149,13 +1159,18 @@ setBoardClear(color1,color2)
    textarea
      color: white;

+  .minicard .minicard-description
+    background: #2b2b2b;
+    border: 1px solid #00897b;
+
+
  .minicard:hover:not(.minicard-composer)
    border: 1px solid #00897b;
    background: #2b2b2b;
    padding: 9px 9px 3px 9px;/*because of the 1px border we need to reduce padding by 1px*/

  .card-details
-    background: #2b2b2b;
+    background: #2b2b2b!important;
    color: white;

  .card-details .card-details-header
@ -1169,9 +1184,42 @@ setBoardClear(color1,color2)
  .card-details, .sidebar-content
    box-shadow: 0 0 7px 0 #00897b;

+  .attachments-galery .attachment-item
+    background: #2b2b2b
+
+  .attachments-galery .attachment-item:hover
+    border: 1px solid #00897b;
+    background: #2b2b2b;
+
+  .checklist
+    background: #2b2b2b;
+    .checklist-item
+      background: #2b2b2b;
+      &:hover
+        background: #2b2b2b;
+
+  .add-checklist-item.js-open-inlined-form:hover
+    background: #2b2b2b;
+    border: 1px solid #00897b;
+
+  .add-checklist.js-open-inlined-form:hover
+    background: #2b2b2b;
+    border: 1px solid #00897b;
+
  .card-details > h1,h2,h3,h4,h5,h6,p,a,span
    color: white!important;

+  .activity-desc
+    background-color: #2b2b2b!important;
+
+  .activity-checklist
+    background: #2b2b2b!important;
+    border: 1px solid #00897b;
+
+  .activity-comment
+    background: #2b2b2b!important;
+    border: 1px solid #00897b;
+
  .toggle-switch:checked ~ .toggle-label
    background-color: #00897b!important;

--- a/helm/wekan/Chart.yaml
+++ b/helm/wekan/Chart.yaml
@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "6.18"
+appVersion: "6.21"
 dependencies:
  - condition: mongodb.enabled
    name: mongodb
--- a/helm/wekan/values.yaml
+++ b/helm/wekan/values.yaml
@ -14,7 +14,7 @@ serviceAccounts:
 ##
 image:
  repository: quay.io/wekan/wekan
-  tag: v6.18
+  tag: v6.21
  pullPolicy: IfNotPresent

 ## Configuration for wekan component
--- a/imports/i18n/data/ru.i18n.json
+++ b/imports/i18n/data/ru.i18n.json
@ -135,7 +135,7 @@
    "avatar-too-big": "Аватар слишком большой (максимум 520КБ)",
    "back": "Назад",
    "board-change-color": "Изменить цвет",
-    "show-at-all-boards-page": "Show at All Boards page",
+    "show-at-all-boards-page": "Показать на всех досках",
    "board-info-on-my-boards": "All Boards Settings",
    "boardInfoOnMyBoardsPopup-title": "All Boards Settings",
    "boardInfoOnMyBoards-title": "All Boards Settings",
@ -941,7 +941,7 @@
    "myCardsViewChange-title": "My Cards View",
    "myCardsViewChangePopup-title": "My Cards View",
    "myCardsViewChange-choice-boards": "Доски",
-    "myCardsViewChange-choice-table": "Table",
+    "myCardsViewChange-choice-table": "Таблица",
    "myCardsSortChange-title": "Сортировать мои карточки",
    "myCardsSortChangePopup-title": "Сортировать мои карточки",
    "myCardsSortChange-choice-board": "По доскам",
@ -1108,9 +1108,9 @@
    "subject": "Тема",
    "details": "Детали",
    "carbon-copy": "Carbon Copy (Cc:)",
-    "ticket": "Ticket",
-    "tickets": "Tickets",
-    "ticket-number": "Ticket Number",
+    "ticket": "Тикет",
+    "tickets": "Тикеты",
+    "ticket-number": "Номер тикета",
    "open": "Открыт",
    "pending": "В ожидании",
    "closed": "Закрыт",
--- a/models/lib/fileStoreStrategy.js
+++ b/models/lib/fileStoreStrategy.js
@ -31,7 +31,7 @@ export default class FileStoreStrategyFactory {
    if (!storage) {
      storage = fileObj.versions[versionName].storage;
      if (!storage) {
-        if (fileObj.meta.source == "import") {
+        if (fileObj.meta.source == "import" || fileObj.versions[versionName].meta.gridFsFileId) {
          // uploaded by import, so it's in GridFS (MongoDB)
          storage = STORAGE_NAME_GRIDFS;
        } else {
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "wekan",
-  "version": "v6.18.0",
+  "version": "v6.20.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "wekan",
-  "version": "v6.18.0",
+  "version": "v6.20.0",
  "description": "Open-Source kanban",
  "private": true,
  "repository": {
--- a/packages/wekan-accounts-sandstorm/package.js
+++ b/packages/wekan-accounts-sandstorm/package.js
@ -21,16 +21,16 @@

 Package.describe({
  summary: "Login service for Sandstorm.io applications",
-  version: "0.7.0",
+  version: "0.8.0",
  name: "wekan-accounts-sandstorm",
  git: "https://github.com/sandstorm-io/meteor-accounts-sandstorm.git"
 });

 Package.onUse(function(api) {
-  api.versionsFrom('1.5.1');
+  api.versionsFrom('2.7');

  api.use('random', ['client', 'server']);
-  api.use('accounts-base@2.2.2', ['client', 'server'], {weak: true});
+  api.use('accounts-base', ['client', 'server'], {weak: true});
  api.use('webapp', 'server');
  api.use('http', 'client');
  api.use('tracker', 'client');
--- a/public/api/wekan.html
+++ b/public/api/wekan.html
@ -7,7 +7,7 @@
    <meta charset="utf-8">
    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Wekan REST API v6.18</title>
+    <title>Wekan REST API v6.21</title>

    <style>
    </style>
@ -1558,7 +1558,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
        
          <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v6.18">Wekan REST API v6.18</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v6.21">Wekan REST API v6.21</a>
            
          </li>
        
@ -2156,7 +2156,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
    <div class="page-wrapper">
      <div class="dark-box"></div>
      <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v6.18</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v6.21</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>
@ -3571,6 +3571,8 @@ System.out.println(response.toString());
    }
  ],
  <span class="hljs-attr">&quot;color&quot;</span>: <span class="hljs-string">&quot;belize&quot;</span>,
+  <span class="hljs-attr">&quot;allowsCardCounterList&quot;</span>: <span class="hljs-literal">true</span>,
+  <span class="hljs-attr">&quot;allowsBoardMemberList&quot;</span>: <span class="hljs-literal">true</span>,
  <span class="hljs-attr">&quot;description&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
  <span class="hljs-attr">&quot;subtasksDefaultBoardId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
  <span class="hljs-attr">&quot;subtasksDefaultListId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
@ -18854,6 +18856,8 @@ UserSecurity
    }
  ],
  <span class="hljs-attr">&quot;color&quot;</span>: <span class="hljs-string">&quot;belize&quot;</span>,
+  <span class="hljs-attr">&quot;allowsCardCounterList&quot;</span>: <span class="hljs-literal">true</span>,
+  <span class="hljs-attr">&quot;allowsBoardMemberList&quot;</span>: <span class="hljs-literal">true</span>,
  <span class="hljs-attr">&quot;description&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
  <span class="hljs-attr">&quot;subtasksDefaultBoardId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
  <span class="hljs-attr">&quot;subtasksDefaultListId&quot;</span>: <span class="hljs-string">&quot;string&quot;</span>,
@ -18997,6 +19001,20 @@ UserSecurity
 <td>The color of the board.</td>
 </tr>
 <tr>
+<td>allowsCardCounterList</td>
+<td>boolean</td>
+<td>true</td>
+<td>none</td>
+<td>Show card counter per list</td>
+</tr>
+<tr>
+<td>allowsBoardMemberList</td>
+<td>boolean</td>
+<td>true</td>
+<td>none</td>
+<td>Show board member list</td>
+</tr>
+<tr>
 <td>description</td>
 <td>string¦null</td>
 <td>false</td>
--- a/public/api/wekan.yml
+++ b/public/api/wekan.yml
@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
  title: Wekan REST API
-  version: v6.18
+  version: v6.21
  description: |
    The REST API allows you to control and extend Wekan with ease.

@ -2796,6 +2796,14 @@ definitions:
          - modern
          - moderndark
          - exodark
+      allowsCardCounterList:
+        description: |
+           Show card counter per list
+        type: boolean
+      allowsBoardMemberList:
+        description: |
+           Show board member list
+        type: boolean
      description:
        description: |
           The description of the board
@ -2970,6 +2978,8 @@ definitions:
      - members
      - permission
      - color
+      - allowsCardCounterList
+      - allowsBoardMemberList
      - allowsSubtasks
      - allowsAttachments
      - allowsChecklists
--- 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 = 618,
+    appVersion = 621,
    # Increment this for every release.

-    appMarketingVersion = (defaultText = "6.18.0~2022-04-08"),
+    appMarketingVersion = (defaultText = "6.21.0~2022-04-28"),
    # Human-readable presentation of the app version.

    minUpgradableAppVersion = 0,
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@ -1,5 +1,5 @@
 name: wekan
-version: '6.18'
+version: '6.21'
 summary: Open Source kanban
 description: |
   WeKan ® is an Open Source and collaborative kanban board application.