From 0592b0c56ac372c87dea17f0a090e7d7569430d1 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Jan 2021 16:39:58 +0200 Subject: [PATCH 1/7] Moved Public/Archive/Templates/etc options to click right top username Member Settings menu, where My Cards also is. Thanks to xet7 ! --- client/components/boards/boardsList.jade | 14 ++++---- client/components/main/header.jade | 8 ++--- .../components/swimlanes/swimlaneHeader.jade | 9 ++--- client/components/swimlanes/swimlanes.styl | 1 + client/components/users/userHeader.jade | 36 ++++++++++++------- client/components/users/userHeader.js | 3 ++ 6 files changed, 44 insertions(+), 27 deletions(-) diff --git a/client/components/boards/boardsList.jade b/client/components/boards/boardsList.jade index 7fd7c2ba9..ee57f3b29 100644 --- a/client/components/boards/boardsList.jade +++ b/client/components/boards/boardsList.jade @@ -60,10 +60,10 @@ template(name="boardList") template(name="boardListHeaderBar") h1 {{_ title }} - .board-header-btns.right - a.board-header-btn.js-open-archived-board - i.fa.fa-archive - span {{_ 'archives'}} - a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") - i.fa.fa-clone - span {{_ 'templates'}} + //.board-header-btns.right + // a.board-header-btn.js-open-archived-board + // i.fa.fa-archive + // span {{_ 'archives'}} + // a.board-header-btn(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") + // i.fa.fa-clone + // span {{_ 'templates'}} diff --git a/client/components/main/header.jade b/client/components/main/header.jade index 220f99bef..dc8f4455b 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -38,10 +38,10 @@ template(name="header") span.fa.fa-home | {{_ 'all-boards'}} li.separator - - li - a(href="{{pathFor 'public'}}") - span.fa.fa-globe - | {{_ 'public'}} + //li + // a(href="{{pathFor 'public'}}") + // span.fa.fa-globe + // | {{_ 'public'}} each currentUser.starredBoards li.separator - li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}") diff --git a/client/components/swimlanes/swimlaneHeader.jade b/client/components/swimlanes/swimlaneHeader.jade index b4ef59767..c7c9381e5 100644 --- a/client/components/swimlanes/swimlaneHeader.jade +++ b/client/components/swimlanes/swimlaneHeader.jade @@ -17,11 +17,12 @@ template(name="swimlaneFixedHeader") unless currentUser.isCommentOnly if currentUser.isBoardAdmin a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon - a.fa.fa-navicon.js-open-swimlane-menu.swimlane-header-menu-icon - if isMiniScreenOrShowDesktopDragHandles + a.fa.fa-navicon.js-open-swimlane-menu + unless isMiniScreen + if showDesktopDragHandles + a.swimlane-header-handle.handle.fa.fa-arrows.js-swimlane-header-handle + if isMiniScreen a.swimlane-header-miniscreen-handle.handle.fa.fa-arrows.js-swimlane-header-handle - else - a.swimlane-header-handle.handle.fa.fa-arrows.js-swimlane-header-handle template(name="editSwimlaneTitleForm") .list-composer diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl index 812b8ae9b..48fc57940 100644 --- a/client/components/swimlanes/swimlanes.styl +++ b/client/components/swimlanes/swimlanes.styl @@ -85,6 +85,7 @@ .swimlane-header-menu position: absolute padding: 5px 5px + font-size: 22px .swimlane-header-plus-icon margin-left: 5px diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index de81f61da..0e35e21fa 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -12,11 +12,35 @@ template(name="headerUserBar") template(name="memberMenuPopup") ul.pop-over-list + if currentUser.isAdmin + li + a.js-go-setting(href="{{pathFor 'setting'}}") + i.fa.fa-lock + | {{_ 'admin-panel'}} with currentUser + li + a(href="{{pathFor 'home'}}") + span.fa.fa-home + | {{_ 'all-boards'}} li a.js-my-cards(href="{{pathFor 'my-cards'}}") i.fa.fa-list | {{_ 'my-cards'}} + li + a(href="{{pathFor 'public'}}") + span.fa.fa-globe + | {{_ 'public'}} + li + a.board-header-btn.js-open-archived-board + i.fa.fa-archive + span {{_ 'archives'}} + unless currentUser.isWorker + ul.pop-over-list + li + a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") + i.fa.fa-clone + | {{_ 'templates'}} + hr li a.js-edit-profile i.fa.fa-user @@ -38,18 +62,6 @@ template(name="memberMenuPopup") a.js-change-language i.fa.fa-flag | {{_ 'changeLanguagePopup-title'}} - if currentUser.isAdmin - li - a.js-go-setting(href="{{pathFor 'setting'}}") - i.fa.fa-lock - | {{_ 'admin-panel'}} - unless currentUser.isWorker - hr - ul.pop-over-list - li - a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") - i.fa.fa-clone - | {{_ 'templates'}} unless isSandstorm hr ul.pop-over-list diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index 8d0fc6176..d616b804f 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -28,6 +28,9 @@ Template.memberMenuPopup.events({ 'click .js-my-cards'() { Popup.close(); }, + 'click .js-open-archived-board'() { + Modal.open('archivedBoards'); + }, 'click .js-edit-profile': Popup.open('editProfile'), 'click .js-change-settings': Popup.open('changeSettings'), 'click .js-change-avatar': Popup.open('changeAvatar'), From cd54ced1b23b8bded256ab995b164db4dfd39c69 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Jan 2021 16:55:58 +0200 Subject: [PATCH 2/7] Update ChangeLog. --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22772b9de..68bcd6ac7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ This release adds the following new features: [Part 2](https://github.com/wekan/wekan/commit/ad482d5cfb72591f1b5c749c3c0156000dbf660a). [Part 3](https://github.com/wekan/wekan/commit/b64cd358ed0af4395357423ad172b8dac9dc3178). Thanks to xet7. +- [My Cards](https://github.com/wekan/wekan/pull/3413). + Thanks to jrsupplee. + +and adds the following UI changes: + +- [Moved Public/Archive/Templates/etc options to click right top username Member Settings menu, where My Cards also + is](https://github.com/wekan/wekan/commit/0592b0c56ac372c87dea17f0a090e7d7569430d1). + Thanks to xet7. and fixes the following bugs: From 991e1baffdfc35ba3d89af6e6909db37bda1f1aa Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Jan 2021 16:56:25 +0200 Subject: [PATCH 3/7] Update translations. --- i18n/ar.i18n.json | 10 +++++----- i18n/bg.i18n.json | 6 +++++- i18n/br.i18n.json | 6 +++++- i18n/ca.i18n.json | 6 +++++- i18n/cs.i18n.json | 6 +++++- i18n/da.i18n.json | 6 +++++- i18n/de.i18n.json | 6 +++++- i18n/el.i18n.json | 6 +++++- i18n/en-GB.i18n.json | 6 +++++- i18n/eo.i18n.json | 6 +++++- i18n/es-AR.i18n.json | 6 +++++- i18n/es-CL.i18n.json | 6 +++++- i18n/es-PE.i18n.json | 6 +++++- i18n/es.i18n.json | 6 +++++- i18n/eu.i18n.json | 6 +++++- i18n/fa.i18n.json | 6 +++++- i18n/fi.i18n.json | 6 +++++- i18n/fr.i18n.json | 6 +++++- i18n/gl.i18n.json | 6 +++++- i18n/he.i18n.json | 6 +++++- i18n/hi.i18n.json | 6 +++++- i18n/hu.i18n.json | 6 +++++- i18n/hy.i18n.json | 6 +++++- i18n/id.i18n.json | 6 +++++- i18n/ig.i18n.json | 6 +++++- i18n/it.i18n.json | 6 +++++- i18n/ja.i18n.json | 6 +++++- i18n/ka.i18n.json | 6 +++++- i18n/km.i18n.json | 6 +++++- i18n/ko.i18n.json | 6 +++++- i18n/lv.i18n.json | 6 +++++- i18n/mk.i18n.json | 6 +++++- i18n/mn.i18n.json | 6 +++++- i18n/nb.i18n.json | 6 +++++- i18n/nl.i18n.json | 14 +++++++++----- i18n/oc.i18n.json | 6 +++++- i18n/pl.i18n.json | 6 +++++- i18n/pt-BR.i18n.json | 14 +++++++++----- i18n/pt.i18n.json | 6 +++++- i18n/ro.i18n.json | 6 +++++- i18n/ru.i18n.json | 14 +++++++++----- i18n/sl.i18n.json | 6 +++++- i18n/sr.i18n.json | 6 +++++- i18n/sv.i18n.json | 6 +++++- i18n/sw.i18n.json | 6 +++++- i18n/ta.i18n.json | 6 +++++- i18n/th.i18n.json | 6 +++++- i18n/tr.i18n.json | 6 +++++- i18n/uk.i18n.json | 6 +++++- i18n/vi.i18n.json | 6 +++++- i18n/zh-CN.i18n.json | 6 +++++- i18n/zh-HK.i18n.json | 6 +++++- i18n/zh-TW.i18n.json | 6 +++++- 53 files changed, 277 insertions(+), 69 deletions(-) diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 65353fe89..7af9abb77 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -137,7 +137,6 @@ "boardChangeWatchPopup-title": "تغيير المتابعة", "boardMenuPopup-title": "Board Settings", "boardChangeViewPopup-title": "عرض اللوحات", - "board": "لوحة", "boards": "لوحات", "board-view": "عرض اللوحات", "board-view-cal": "التقويم", @@ -149,7 +148,6 @@ "cancel": "إلغاء", "card-archived": "البطاقة منقولة الى الارشيف", "board-archived": "اللوحات منقولة الى الارشيف", - "card": "نطاقة", "card-comments-title": "%s تعليقات لهذه البطاقة", "card-delete-notice": "هذا حذف أبديّ . سوف تفقد كل الإجراءات المنوطة بهذه البطاقة", "card-delete-pop": "سيتم إزالة جميع الإجراءات من تبعات النشاط، وأنك لن تكون قادرا على إعادة فتح البطاقة. لا يوجد التراجع.", @@ -405,7 +403,6 @@ "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.", "leaveBoardPopup-title": "مغادرة اللوحة ؟", "link-card": "ربط هذه البطاقة", - "list": "قائمة", "list-archive-cards": "Move all cards in this list to Archive", "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.", "list-move-cards": "نقل بطاقات هذه القائمة", @@ -834,7 +831,7 @@ "saturday": "Saturday", "sunday": "Sunday", "status": "Status", - "swimlane": "خط السباحة", + "swimlane": "Swimlane", "owner": "Owner", "last-modified-at": "Last modified at", "last-activity": "Last activity", @@ -852,5 +849,8 @@ "shortName": "Short Name", "website": "Website", "person": "Person", - "my-cards": "بطاقاتي" + "my-cards": "My Cards", + "card": "بطاقة", + "list": "List", + "board": "Board" } diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index bbf4b0228..dc3dbcdf5 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Карта", + "list": "List", + "board": "Board" } diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index 44fb2b818..9eca6de1c 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index 38a109d65..5032f8177 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Fitxa", + "list": "List", + "board": "Board" } diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index 3bd6170f1..1fa243d82 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Karta", + "list": "List", + "board": "Board" } diff --git a/i18n/da.i18n.json b/i18n/da.i18n.json index 3f85c14b1..4a73c8eec 100644 --- a/i18n/da.i18n.json +++ b/i18n/da.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Kort", + "list": "List", + "board": "Board" } diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index f719026a5..0f80886f7 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Karte", + "list": "List", + "board": "Board" } diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json index 09eb8e1d7..257c6de4e 100644 --- a/i18n/el.i18n.json +++ b/i18n/el.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index 8836c0e88..12620acac 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index 3cf1119f3..f4e46da6d 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json index 93dc01f02..bd63f9cb6 100644 --- a/i18n/es-AR.i18n.json +++ b/i18n/es-AR.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Tarjeta", + "list": "List", + "board": "Board" } diff --git a/i18n/es-CL.i18n.json b/i18n/es-CL.i18n.json index de0fa1814..6a3ca7bb1 100644 --- a/i18n/es-CL.i18n.json +++ b/i18n/es-CL.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Tarjeta", + "list": "List", + "board": "Board" } diff --git a/i18n/es-PE.i18n.json b/i18n/es-PE.i18n.json index 0834bf727..1cfbe7ea3 100644 --- a/i18n/es-PE.i18n.json +++ b/i18n/es-PE.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Tarjeta", + "list": "List", + "board": "Board" } diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 176a2ebe6..11d8e239b 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Tarjeta", + "list": "List", + "board": "Board" } diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index 887cd9ee2..4b22e820e 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index 648124010..200cf0e32 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "کارت", + "list": "List", + "board": "Board" } diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 3a4d9e5e7..7779d077f 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -848,5 +848,9 @@ "displayName": "Näyttönimi", "shortName": "Lyhyt nimi", "website": "Verkkosivusto", - "person": "Henkilö" + "person": "Henkilö", + "my-cards": "Korttini", + "card": "Kortti", + "list": "Lista", + "board": "Taulu" } diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 46bf73f29..68c916c9e 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -848,5 +848,9 @@ "displayName": "Nom d'Affichage", "shortName": "Nom Court", "website": "Site Web", - "person": "Personne" + "person": "Personne", + "my-cards": "My Cards", + "card": "Carte", + "list": "List", + "board": "Board" } diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index b0244a456..2d96a6cab 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index b610e3048..add368bd8 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -848,5 +848,9 @@ "displayName": "שם התצוגה", "shortName": "שם קצר", "website": "אתר", - "person": "איש/ה" + "person": "איש/ה", + "my-cards": "My Cards", + "card": "כרטיס", + "list": "List", + "board": "Board" } diff --git a/i18n/hi.i18n.json b/i18n/hi.i18n.json index 9b2c3e87f..973f16876 100644 --- a/i18n/hi.i18n.json +++ b/i18n/hi.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "कार्ड", + "list": "List", + "board": "Board" } diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index d03abf07c..765f333ae 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json index 00d1add91..0ad6c7ce0 100644 --- a/i18n/hy.i18n.json +++ b/i18n/hy.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index b4ff98e5d..120736110 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json index d3354c1f2..7611a7659 100644 --- a/i18n/ig.i18n.json +++ b/i18n/ig.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 628d3710f..1f152909d 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -848,5 +848,9 @@ "displayName": "Nome da visualizzare", "shortName": "Nome Corto", "website": "Sito Web", - "person": "Persona" + "person": "Persona", + "my-cards": "My Cards", + "card": "Scheda", + "list": "List", + "board": "Board" } diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index 2565f5d9f..440c7c0af 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "カード", + "list": "List", + "board": "Board" } diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json index 97b5074ce..08999e2db 100644 --- a/i18n/ka.i18n.json +++ b/i18n/ka.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json index 46c4e9a08..8aa5c989c 100644 --- a/i18n/km.i18n.json +++ b/i18n/km.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index 527fd9c82..eead65698 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "카드", + "list": "List", + "board": "Board" } diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json index 54ae7cf0b..aac73ebff 100644 --- a/i18n/lv.i18n.json +++ b/i18n/lv.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Kartiņa", + "list": "List", + "board": "Board" } diff --git a/i18n/mk.i18n.json b/i18n/mk.i18n.json index 2d1f1d854..b6e3c84f3 100644 --- a/i18n/mk.i18n.json +++ b/i18n/mk.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Карта", + "list": "List", + "board": "Board" } diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json index 915675b4e..28b738327 100644 --- a/i18n/mn.i18n.json +++ b/i18n/mn.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index 3cda042af..a52448c77 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index e0742daa7..2defec04e 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -809,10 +809,10 @@ "addmore-detail": "Voeg een meer gedetailleerde beschrijving toe", "show-on-card": "Toon op kaart", "new": "Nieuw", - "editOrgPopup-title": "Edit Organization", - "newOrgPopup-title": "New Organization", - "editTeamPopup-title": "Edit Team", - "newTeamPopup-title": "New Team", + "editOrgPopup-title": "Bewerk organisatie", + "newOrgPopup-title": "Nieuwe organisatie", + "editTeamPopup-title": "Bewerk team", + "newTeamPopup-title": "Nieuw team", "editUserPopup-title": "Wijzig gebruiker", "newUserPopup-title": "Nieuwe gebruiker", "notifications": "Meldingen", @@ -848,5 +848,9 @@ "displayName": "Schermnaam", "shortName": "Korte naam", "website": "Website", - "person": "Persoon" + "person": "Persoon", + "my-cards": "My Cards", + "card": "Kaart", + "list": "List", + "board": "Board" } diff --git a/i18n/oc.i18n.json b/i18n/oc.i18n.json index dfb332abc..08d248ee5 100644 --- a/i18n/oc.i18n.json +++ b/i18n/oc.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Carta", + "list": "List", + "board": "Board" } diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 574893f29..384036562 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -848,5 +848,9 @@ "displayName": "Nazwa wyświetlana", "shortName": "Nazwa skrócona", "website": "Strona internetowa", - "person": "Osoba" + "person": "Osoba", + "my-cards": "My Cards", + "card": "karty", + "list": "List", + "board": "Board" } diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index a7d1cc589..abd59615c 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -809,10 +809,10 @@ "addmore-detail": "Adicionar descrição detalhada", "show-on-card": "Mostrar no Cartão", "new": "Novo", - "editOrgPopup-title": "Edit Organization", - "newOrgPopup-title": "New Organization", - "editTeamPopup-title": "Edit Team", - "newTeamPopup-title": "New Team", + "editOrgPopup-title": "Editar Organização", + "newOrgPopup-title": "Nova Organização", + "editTeamPopup-title": "Editar Time", + "newTeamPopup-title": "Novo Time", "editUserPopup-title": "Editar usuário", "newUserPopup-title": "Novo usuário", "notifications": "Notificações", @@ -848,5 +848,9 @@ "displayName": "Nome em exibição", "shortName": "Nome curto", "website": "Website", - "person": "Pessoa" + "person": "Pessoa", + "my-cards": "My Cards", + "card": "Cartão", + "list": "List", + "board": "Board" } diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index d6b9f94c7..cfbd7d013 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Cartão", + "list": "List", + "board": "Board" } diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index 8aad8ff4c..4177b6b6e 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 2463dad97..d5b78d477 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -809,10 +809,10 @@ "addmore-detail": "Добавить более детальное описание", "show-on-card": "Показать на карточке", "new": "Новый", - "editOrgPopup-title": "Edit Organization", - "newOrgPopup-title": "New Organization", - "editTeamPopup-title": "Edit Team", - "newTeamPopup-title": "New Team", + "editOrgPopup-title": "Редактировать организацию", + "newOrgPopup-title": "Новая организация", + "editTeamPopup-title": "Редактировать команду", + "newTeamPopup-title": "Новая команда", "editUserPopup-title": "Редактировать пользователя", "newUserPopup-title": "Новый пользователь", "notifications": "Уведомления", @@ -848,5 +848,9 @@ "displayName": "Отображаемое название", "shortName": "Короткое название", "website": "Вебсайт", - "person": "Представитель" + "person": "Представитель", + "my-cards": "My Cards", + "card": "Карточка", + "list": "List", + "board": "Board" } diff --git a/i18n/sl.i18n.json b/i18n/sl.i18n.json index 9752e6b0e..7e1a57402 100644 --- a/i18n/sl.i18n.json +++ b/i18n/sl.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Kartica", + "list": "List", + "board": "Board" } diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index 380ac4001..438ccb7b4 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Kartica", + "list": "List", + "board": "Board" } diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index a39fd907c..332638331 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Kort", + "list": "List", + "board": "Board" } diff --git a/i18n/sw.i18n.json b/i18n/sw.i18n.json index 48a3a7d22..3d664b8ac 100644 --- a/i18n/sw.i18n.json +++ b/i18n/sw.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index 95bd87041..05d1b7644 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index 290970c1c..f0e8e1867 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index a5785e451..76ae5e450 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Kart", + "list": "List", + "board": "Board" } diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index d82a034d9..dd3028edf 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Картка", + "list": "List", + "board": "Board" } diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index 3da214013..15c4a89e5 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 84de1c35e..2c4b302bb 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -848,5 +848,9 @@ "displayName": "显示名称", "shortName": "简称", "website": "网站", - "person": "人员" + "person": "人员", + "my-cards": "My Cards", + "card": "卡片", + "list": "List", + "board": "Board" } diff --git a/i18n/zh-HK.i18n.json b/i18n/zh-HK.i18n.json index e75aca402..c0275438f 100644 --- a/i18n/zh-HK.i18n.json +++ b/i18n/zh-HK.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" } diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index cb5bbdb1e..9aab3a77d 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -848,5 +848,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "卡片", + "list": "List", + "board": "Board" } From bfc16fc5442e8cc8c3cc03df992d5b1d1724338b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Jan 2021 17:50:05 +0200 Subject: [PATCH 4/7] Reorder My Cards to be first at menu. Thanks to xet7 ! --- client/components/users/userHeader.jade | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index 0e35e21fa..81fbe26a5 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -12,20 +12,15 @@ template(name="headerUserBar") template(name="memberMenuPopup") ul.pop-over-list - if currentUser.isAdmin - li - a.js-go-setting(href="{{pathFor 'setting'}}") - i.fa.fa-lock - | {{_ 'admin-panel'}} with currentUser - li - a(href="{{pathFor 'home'}}") - span.fa.fa-home - | {{_ 'all-boards'}} li a.js-my-cards(href="{{pathFor 'my-cards'}}") i.fa.fa-list | {{_ 'my-cards'}} + li + a(href="{{pathFor 'home'}}") + span.fa.fa-home + | {{_ 'all-boards'}} li a(href="{{pathFor 'public'}}") span.fa.fa-globe @@ -40,6 +35,11 @@ template(name="memberMenuPopup") a(href="{{pathFor 'board' id=templatesBoardId slug=templatesBoardSlug}}") i.fa.fa-clone | {{_ 'templates'}} + if currentUser.isAdmin + li + a.js-go-setting(href="{{pathFor 'setting'}}") + i.fa.fa-lock + | {{_ 'admin-panel'}} hr li a.js-edit-profile From df47dcc3f324987707c2572c8b868b67f084544b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Jan 2021 17:53:31 +0200 Subject: [PATCH 5/7] Update ChangeLog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68bcd6ac7..df63d3694 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ and adds the following UI changes: - [Moved Public/Archive/Templates/etc options to click right top username Member Settings menu, where My Cards also is](https://github.com/wekan/wekan/commit/0592b0c56ac372c87dea17f0a090e7d7569430d1). Thanks to xet7. +- [Reorder My Cards to be first at menu](https://github.com/wekan/wekan/commit/bfc16fc5442e8cc8c3cc03df992d5b1d1724338b). + Thanks to xet7. and fixes the following bugs: From d4b3dc74720900532b509ac80a2a32c25b19e422 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Jan 2021 17:54:13 +0200 Subject: [PATCH 6/7] Update translations. --- i18n/nl.i18n.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 2defec04e..7139e2af1 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -849,8 +849,8 @@ "shortName": "Korte naam", "website": "Website", "person": "Persoon", - "my-cards": "My Cards", + "my-cards": "Mijn kaarten", "card": "Kaart", - "list": "List", - "board": "Board" + "list": "Lijst", + "board": "Bord" } From 46e47e3fc9eeb3947c1fb9f8e0a7884910dda2b9 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Jan 2021 18:10:15 +0200 Subject: [PATCH 7/7] v4.69 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package-lock.json | 2 +- package.json | 2 +- public/api/wekan.html | 4 ++-- public/api/wekan.yml | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df63d3694..dd41524aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v4.69 2021-01-02 Wekan release This release adds the following new features: diff --git a/Stackerfile.yml b/Stackerfile.yml index 1edfb9e2e..5840c47d7 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v4.68.0" +appVersion: "v4.69.0" files: userUploads: - README.md diff --git a/package-lock.json b/package-lock.json index 13b3bac19..c30da2cf2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v4.68.0", + "version": "v4.69.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 76f557bfa..655b3a9c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v4.68.0", + "version": "v4.69.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/public/api/wekan.html b/public/api/wekan.html index 150aa4395..0cbf8192c 100644 --- a/public/api/wekan.html +++ b/public/api/wekan.html @@ -1524,7 +1524,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
  • - Wekan REST API v4.68 + Wekan REST API v4.69
    • @@ -2032,7 +2032,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
    -

    Wekan REST API v4.68

    +

    Wekan REST API v4.69

    Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.

    diff --git a/public/api/wekan.yml b/public/api/wekan.yml index a1143c6f0..db97768da 100644 --- a/public/api/wekan.yml +++ b/public/api/wekan.yml @@ -1,7 +1,7 @@ swagger: '2.0' info: title: Wekan REST API - version: v4.68 + version: v4.69 description: | The REST API allows you to control and extend Wekan with ease. diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 2cca03eba..d50409cb4 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 = 468, + appVersion = 469, # Increment this for every release. - appMarketingVersion = (defaultText = "4.68.0~2020-12-29"), + appMarketingVersion = (defaultText = "4.69.0~2021-01-02"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,