diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index ecfbedaf2..112fcca80 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wekandb-dev: - image: mongo:5.0 + image: mongo:6 container_name: wekan-dev-db restart: unless-stopped command: mongod --oplogSize 128 diff --git a/CHANGELOG.md b/CHANGELOG.md index e7f61c4ad..381ab020f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,29 @@ Download section. [How to upgrade WeKan](https://github.com/wekan/wekan/issues/4585) -# Upcoming WeKan ® release +# v6.64 2022-12-24 WeKan ® release + +This release adds the following updates: + +- [Updated release scripts](https://github.com/wekan/wekan/commit/71d35b0525b50191839147e74a7c9c66bf99496a). + Thanks to xet7. +- [Update webmanifest for WeKan Android Play Store app](https://github.com/wekan/wekan/commit/558093ff0c41da5798acc0b3ab723d288e104f8a). + Thanks to xet7. +- Upgrade to MongoDB 6.0.3. + [Part 1](https://github.com/wekan/wekan/commit/62242b4a9636c1af49462403143e43e14e9a0cec), + [Part 2](https://github.com/wekan/wekan/commit/f22fe5497b78bad5277675cba05aebb014c7ce60). + Thanks to MongoDB developers. + +and fixes the following bugs: + +- [Fix: changing list color reloads webpage](https://github.com/wekan/wekan/pull/4787). + Thanks to helioguardabaxo. +- [Bug: Adding Users to Groups via OIDC seems to be broken](https://github.com/wekan/wekan/pull/4788). + Thanks to Viehlieb. + +Thanks to above GitHub users for their contributions and translators for their translations. + +# v6.63 2022-12-22 WeKan ® release This release adds the following new features: diff --git a/Stackerfile.yml b/Stackerfile.yml index bbff136b4..5518c1c8d 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v6.62.0" +appVersion: "v6.64.0" files: userUploads: - README.md diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 95d05e28e..db5564974 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -309,11 +309,11 @@ BlazeComponent.extendComponent({ }, 'click .js-submit'() { this.currentList.setColor(this.currentColor.get()); - Popup.back(); + Popup.close(); }, 'click .js-remove-color'() { this.currentList.setColor(null); - Popup.back(); + Popup.close(); }, }, ]; diff --git a/docker-compose.yml b/docker-compose.yml index 07ce30d7f..b310d5b6f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -98,7 +98,7 @@ services: # Quay image does work: # image: quay.io/wekan/mongo:4.4.2-bionic # Docker Hub MongoDB image does work: - image: mongo:5 + image: mongo:6 #------------------------------------------------------------------------------------- container_name: wekan-db restart: always diff --git a/helm/wekan/Chart.lock b/helm/wekan/Chart.lock index 8a12ba317..7a6e505f9 100644 --- a/helm/wekan/Chart.lock +++ b/helm/wekan/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: mongodb repository: https://charts.bitnami.com/bitnami - version: 10.0.5 -digest: sha256:f6520f39b687cb52574ec2fda514662ce913665c0fd2391b68fdb4d2eb059497 -generated: "2021-07-27T22:16:39.945592552+02:00" + version: 12.1.31 +digest: sha256:c129cc56fc5dd53a71d3c261420126ae28964cb3e7e65731e96765971950c12d +generated: "2022-12-23T15:30:00.699936504+01:00" diff --git a/helm/wekan/Chart.yaml b/helm/wekan/Chart.yaml index 78e012f8f..2c6a438ee 100644 --- a/helm/wekan/Chart.yaml +++ b/helm/wekan/Chart.yaml @@ -1,16 +1,18 @@ apiVersion: v2 -appVersion: "6.62" +appVersion: "6.64" dependencies: - condition: mongodb.enabled name: mongodb repository: https://charts.bitnami.com/bitnami - version: 10.0.x + version: 12.1.x description: Open Source kanban home: https://wekan.github.io icon: https://wekan.github.io/wekan-logo.svg keywords: - kanban maintainers: + - email: x@xet7.org + name: xet7 - email: github@randall.cc name: technotaff - email: jiangyt.cn@gmail.com diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml index 217b44f32..706ade282 100644 --- a/helm/wekan/values.yaml +++ b/helm/wekan/values.yaml @@ -14,7 +14,7 @@ serviceAccounts: ## image: repository: quay.io/wekan/wekan - tag: v6.62 + tag: v6.64 pullPolicy: IfNotPresent ## Configuration for wekan component diff --git a/imports/i18n/data/de.i18n.json b/imports/i18n/data/de.i18n.json index fa7444da1..83e4eaa7b 100644 --- a/imports/i18n/data/de.i18n.json +++ b/imports/i18n/data/de.i18n.json @@ -845,7 +845,7 @@ "r-df-received-at": "Empfangen", "r-to-current-datetime": "auf das aktuelle Datum/Zeit", "r-remove-value-from": "Entferne Wert von", - "r-link-card": "Link card to", + "r-link-card": "Verlinke Karte auf", "ldap": "LDAP", "oauth2": "OAuth2", "cas": "CAS", diff --git a/imports/i18n/data/fr.i18n.json b/imports/i18n/data/fr.i18n.json index 4bc475b5a..47753ba2b 100644 --- a/imports/i18n/data/fr.i18n.json +++ b/imports/i18n/data/fr.i18n.json @@ -845,7 +845,7 @@ "r-df-received-at": "reçu", "r-to-current-datetime": "à la date/heure courante", "r-remove-value-from": "Supprimer la valeur de", - "r-link-card": "Link card to", + "r-link-card": "Lier la carte à", "ldap": "LDAP", "oauth2": "OAuth2", "cas": "CAS", diff --git a/imports/i18n/data/he.i18n.json b/imports/i18n/data/he.i18n.json index c2a2bd2f3..260db50ae 100644 --- a/imports/i18n/data/he.i18n.json +++ b/imports/i18n/data/he.i18n.json @@ -845,7 +845,7 @@ "r-df-received-at": "התקבל", "r-to-current-datetime": "לתאריך/שעה הנוכחיים", "r-remove-value-from": "הסרת ערך מתוך", - "r-link-card": "Link card to", + "r-link-card": "קישור הכרטיס אל", "ldap": "LDAP", "oauth2": "OAuth2", "cas": "CAS", diff --git a/imports/i18n/data/ko.i18n.json b/imports/i18n/data/ko.i18n.json index 8628c1932..fdbe89bca 100644 --- a/imports/i18n/data/ko.i18n.json +++ b/imports/i18n/data/ko.i18n.json @@ -429,18 +429,18 @@ "headerBarCreateBoardPopup-title": "보드 생성", "home": "홈", "import": "가져오기", - "impersonate-user": "Impersonate user", - "link": "Link", + "impersonate-user": "사용자 사칭", + "link": "링크", "import-board": "보드 가져오기", "import-board-c": "보드 가져오기", "import-board-title-trello": "Trello에서 보드 가져오기", - "import-board-title-wekan": "Import board from previous export", + "import-board-title-wekan": "이전 불러오기에서 보드 불러오기", "import-board-title-csv": "CSV/TSV 파일을 보드로 가져오기", "from-trello": "From Trello", - "from-wekan": "From previous export", - "from-csv": "From CSV/TSV", + "from-wekan": "이전 불러오기에서", + "from-csv": "CSV/TSV 에서", "import-board-instruction-trello": "Trello 게시판에서 'Menu' -> 'More' -> 'Print and Export', 'Export JSON' 선택하여 텍스트 결과값 복사", - "import-board-instruction-csv": "Paste in your Comma Separated Values(CSV)/ Tab Separated Values (TSV) .", + "import-board-instruction-csv": "쉼표로 구분된 값(CSV)/탭으로 구분된 값(TSV) 븥여넣기.", "import-board-instruction-wekan": "보드에서 '메뉴', '보드 내보내기' 를 실행하고, 다운로드한 파일의 텍스트를 복사합니다.", "import-board-instruction-about-errors": "If you get errors when importing board, sometimes importing still works, and board is at All Boards page.", "import-json-placeholder": "유효한 JSON 데이터를 여기에 붙여 넣으십시오.", diff --git a/imports/i18n/data/nl.i18n.json b/imports/i18n/data/nl.i18n.json index 6408492f7..42da7ba24 100644 --- a/imports/i18n/data/nl.i18n.json +++ b/imports/i18n/data/nl.i18n.json @@ -230,8 +230,8 @@ "cards-count-one": "Kaart", "casSignIn": "Log in met CAS", "cardType-card": "Kaart", - "cardType-linkedCard": "Gekoppelde Kaart", - "cardType-linkedBoard": "Gekoppeld Bord", + "cardType-linkedCard": "Gelinkte Kaart", + "cardType-linkedBoard": "Gelinkt Bord", "change": "Wijzig", "change-avatar": "Wijzig avatar", "change-password": "Wijzig wachtwoord", @@ -294,7 +294,7 @@ "checklistDeletePopup-title": "Checklist Verwijderen?", "copy-card-link-to-clipboard": "Kopieer kaart link naar klembord", "copy-text-to-clipboard": "Kopieer tekst naar klembord", - "linkCardPopup-title": "Koppel Kaart", + "linkCardPopup-title": "Link Kaart", "searchElementPopup-title": "Zoek", "copyCardPopup-title": "Kopieer kaart", "copyManyCardsPopup-title": "Kopieer Template naar Meerdere Kaarten", @@ -845,7 +845,7 @@ "r-df-received-at": "ontvangen", "r-to-current-datetime": "naar huidige datum/tijd", "r-remove-value-from": "Verwijder waarde van", - "r-link-card": "Link card to", + "r-link-card": "Link kaart aan", "ldap": "LDAP", "oauth2": "OAuth2", "cas": "CAS", @@ -931,8 +931,8 @@ "last-activity": "Laatste activiteit", "voting": "Stemmen", "archived": "Gearchiveerd", - "delete-linked-card-before-this-card": "Je kunt deze kaart niet verwijderen voordat de gekoppelde kaart is verwijderd ", - "delete-linked-cards-before-this-list": "Je kunt deze lijst niet verwijderen voordat de gekoppelde kaarten verwijderd zijn die verwijzen naar kaarten in deze lijst", + "delete-linked-card-before-this-card": "Je kunt deze kaart niet verwijderen voordat de gelinkte kaart is verwijderd ", + "delete-linked-cards-before-this-list": "Je kunt deze lijst niet verwijderen voordat de gelinkte kaarten verwijderd zijn die verwijzen naar kaarten in deze lijst", "hide-checked-items": "Verberg aangevinkte items", "task": "Taak", "create-task": "Taak aanmaken", diff --git a/package-lock.json b/package-lock.json index 1826500da..25e1f51b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v6.62.0", + "version": "v6.64.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 23437bab1..699ef385b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v6.62.0", + "version": "v6.64.0", "description": "Open-Source kanban", "private": true, "repository": { diff --git a/packages/wekan-accounts-lockout/src/knownUser.js b/packages/wekan-accounts-lockout/src/knownUser.js index 9365274f8..81558e1b8 100644 --- a/packages/wekan-accounts-lockout/src/knownUser.js +++ b/packages/wekan-accounts-lockout/src/knownUser.js @@ -214,11 +214,6 @@ class KnownUser { } static onLogin(loginInfo) { - //get the data from oidc login and remove again? - if(loginInfo.type ==='oidc'){ - Meteor.call('groupRoutineOnLogin', loginInfo.user.services.oidc, loginInfo.user._id); - return; - } if (loginInfo.type !== 'password') { return; } diff --git a/packages/wekan-oidc/oidc_server.js b/packages/wekan-oidc/oidc_server.js index aa2c09a46..38a618061 100644 --- a/packages/wekan-oidc/oidc_server.js +++ b/packages/wekan-oidc/oidc_server.js @@ -81,7 +81,6 @@ OAuth.registerService('oidc', 2, null, function (query) { //temporarily store data from oidc in user.services.oidc.groups to update groups serviceData.groups = (userinfo["groups"] && userinfo["wekanGroups"]) ? userinfo["wekanGroups"] : userinfo["groups"]; - // groups arriving as array of strings indicate there is no scope set in oidc privider // to assign teams and keep admin privileges // data needs to be treated differently. @@ -105,6 +104,9 @@ OAuth.registerService('oidc', 2, null, function (query) { } }); } + + Meteor.call('groupRoutineOnLogin',serviceData, serviceData.id); + return { serviceData: serviceData, options: { profile: profile } @@ -285,9 +287,9 @@ Meteor.methods({ var propagateOidcData = process.env.PROPAGATE_OIDC_DATA || false; if (propagateOidcData) { - users= Meteor.users; - user = users.findOne({'_id': userId}); + user = users.findOne({'services.oidc.id': userId}); + if(user) { //updates/creates Groups and user admin privileges accordingly diff --git a/public/android/android-launchericon-144-144.png b/public/android/android-launchericon-144-144.png new file mode 100644 index 000000000..4f7050c99 Binary files /dev/null and b/public/android/android-launchericon-144-144.png differ diff --git a/public/android/android-launchericon-192-192.png b/public/android/android-launchericon-192-192.png new file mode 100644 index 000000000..b6246fb58 Binary files /dev/null and b/public/android/android-launchericon-192-192.png differ diff --git a/public/android/android-launchericon-48-48.png b/public/android/android-launchericon-48-48.png new file mode 100644 index 000000000..83d50d3a0 Binary files /dev/null and b/public/android/android-launchericon-48-48.png differ diff --git a/public/android/android-launchericon-512-512.png b/public/android/android-launchericon-512-512.png new file mode 100644 index 000000000..3d8977986 Binary files /dev/null and b/public/android/android-launchericon-512-512.png differ diff --git a/public/android/android-launchericon-72-72.png b/public/android/android-launchericon-72-72.png new file mode 100644 index 000000000..c8d197893 Binary files /dev/null and b/public/android/android-launchericon-72-72.png differ diff --git a/public/android/android-launchericon-96-96.png b/public/android/android-launchericon-96-96.png new file mode 100644 index 000000000..9f8d9452c Binary files /dev/null and b/public/android/android-launchericon-96-96.png differ diff --git a/public/api/wekan.html b/public/api/wekan.html index 180ff54bc..5e39ba66d 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -7,7 +7,7 @@ - Wekan REST API v6.62 + Wekan REST API v6.64 @@ -1558,7 +1558,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc