Răsfoiți Sursa

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

John R. Supplee 4 ani în urmă
părinte
comite
e8e733184e
66 a modificat fișierele cu 340 adăugiri și 105 ștergeri
  1. 11 1
      CHANGELOG.md
  2. 1 1
      Stackerfile.yml
  3. 7 7
      client/components/boards/boardsList.jade
  4. 4 4
      client/components/main/header.jade
  5. 5 4
      client/components/swimlanes/swimlaneHeader.jade
  6. 1 0
      client/components/swimlanes/swimlanes.styl
  7. 24 12
      client/components/users/userHeader.jade
  8. 3 0
      client/components/users/userHeader.js
  9. 5 5
      i18n/ar.i18n.json
  10. 5 1
      i18n/bg.i18n.json
  11. 5 1
      i18n/br.i18n.json
  12. 5 1
      i18n/ca.i18n.json
  13. 5 1
      i18n/cs.i18n.json
  14. 5 1
      i18n/da.i18n.json
  15. 5 1
      i18n/de.i18n.json
  16. 5 1
      i18n/el.i18n.json
  17. 5 1
      i18n/en-GB.i18n.json
  18. 5 1
      i18n/eo.i18n.json
  19. 5 1
      i18n/es-AR.i18n.json
  20. 5 1
      i18n/es-CL.i18n.json
  21. 5 1
      i18n/es-PE.i18n.json
  22. 5 1
      i18n/es.i18n.json
  23. 5 1
      i18n/eu.i18n.json
  24. 5 1
      i18n/fa.i18n.json
  25. 5 1
      i18n/fi.i18n.json
  26. 5 1
      i18n/fr.i18n.json
  27. 5 1
      i18n/gl.i18n.json
  28. 5 1
      i18n/he.i18n.json
  29. 5 1
      i18n/hi.i18n.json
  30. 5 1
      i18n/hu.i18n.json
  31. 5 1
      i18n/hy.i18n.json
  32. 5 1
      i18n/id.i18n.json
  33. 5 1
      i18n/ig.i18n.json
  34. 5 1
      i18n/it.i18n.json
  35. 5 1
      i18n/ja.i18n.json
  36. 5 1
      i18n/ka.i18n.json
  37. 5 1
      i18n/km.i18n.json
  38. 5 1
      i18n/ko.i18n.json
  39. 5 1
      i18n/lv.i18n.json
  40. 5 1
      i18n/mk.i18n.json
  41. 5 1
      i18n/mn.i18n.json
  42. 5 1
      i18n/nb.i18n.json
  43. 9 5
      i18n/nl.i18n.json
  44. 5 1
      i18n/oc.i18n.json
  45. 5 1
      i18n/pl.i18n.json
  46. 9 5
      i18n/pt-BR.i18n.json
  47. 5 1
      i18n/pt.i18n.json
  48. 5 1
      i18n/ro.i18n.json
  49. 9 5
      i18n/ru.i18n.json
  50. 5 1
      i18n/sl.i18n.json
  51. 5 1
      i18n/sr.i18n.json
  52. 5 1
      i18n/sv.i18n.json
  53. 5 1
      i18n/sw.i18n.json
  54. 5 1
      i18n/ta.i18n.json
  55. 5 1
      i18n/th.i18n.json
  56. 5 1
      i18n/tr.i18n.json
  57. 5 1
      i18n/uk.i18n.json
  58. 5 1
      i18n/vi.i18n.json
  59. 5 1
      i18n/zh-CN.i18n.json
  60. 5 1
      i18n/zh-HK.i18n.json
  61. 5 1
      i18n/zh-TW.i18n.json
  62. 1 1
      package-lock.json
  63. 1 1
      package.json
  64. 2 2
      public/api/wekan.html
  65. 1 1
      public/api/wekan.yml
  66. 2 2
      sandstorm-pkgdef.capnp

+ 11 - 1
CHANGELOG.md

@@ -1,4 +1,4 @@
-# Upcoming Wekan release
+# v4.69 2021-01-02 Wekan release
 
 
 This release adds the following new features:
 This release adds the following new features:
 
 
@@ -6,6 +6,16 @@ This release adds the following new features:
   [Part 2](https://github.com/wekan/wekan/commit/ad482d5cfb72591f1b5c749c3c0156000dbf660a).
   [Part 2](https://github.com/wekan/wekan/commit/ad482d5cfb72591f1b5c749c3c0156000dbf660a).
   [Part 3](https://github.com/wekan/wekan/commit/b64cd358ed0af4395357423ad172b8dac9dc3178).
   [Part 3](https://github.com/wekan/wekan/commit/b64cd358ed0af4395357423ad172b8dac9dc3178).
   Thanks to xet7.
   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.
+- [Reorder My Cards to be first at menu](https://github.com/wekan/wekan/commit/bfc16fc5442e8cc8c3cc03df992d5b1d1724338b).
+  Thanks to xet7.
 
 
 and fixes the following bugs:
 and fixes the following bugs:
 
 

+ 1 - 1
Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v4.68.0"
+appVersion: "v4.69.0"
 files:
 files:
   userUploads:
   userUploads:
     - README.md
     - README.md

+ 7 - 7
client/components/boards/boardsList.jade

@@ -60,10 +60,10 @@ template(name="boardList")
 
 
 template(name="boardListHeaderBar")
 template(name="boardListHeaderBar")
   h1 {{_ title }}
   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'}}

+ 4 - 4
client/components/main/header.jade

@@ -38,10 +38,10 @@ template(name="header")
               span.fa.fa-home
               span.fa.fa-home
               | {{_ 'all-boards'}}
               | {{_ 'all-boards'}}
           li.separator -
           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
           each currentUser.starredBoards
             li.separator -
             li.separator -
             li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")
             li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}")

+ 5 - 4
client/components/swimlanes/swimlaneHeader.jade

@@ -17,11 +17,12 @@ template(name="swimlaneFixedHeader")
     unless currentUser.isCommentOnly
     unless currentUser.isCommentOnly
       if currentUser.isBoardAdmin
       if currentUser.isBoardAdmin
         a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon
         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
         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")
 template(name="editSwimlaneTitleForm")
   .list-composer
   .list-composer

+ 1 - 0
client/components/swimlanes/swimlanes.styl

@@ -85,6 +85,7 @@
     .swimlane-header-menu
     .swimlane-header-menu
       position: absolute
       position: absolute
       padding: 5px 5px
       padding: 5px 5px
+      font-size: 22px
 
 
     .swimlane-header-plus-icon
     .swimlane-header-plus-icon
       margin-left: 5px
       margin-left: 5px

+ 24 - 12
client/components/users/userHeader.jade

@@ -17,6 +17,30 @@ template(name="memberMenuPopup")
         a.js-my-cards(href="{{pathFor 'my-cards'}}")
         a.js-my-cards(href="{{pathFor 'my-cards'}}")
           i.fa.fa-list
           i.fa.fa-list
           | {{_ 'my-cards'}}
           | {{_ 'my-cards'}}
+      li
+        a(href="{{pathFor 'home'}}")
+          span.fa.fa-home
+          | {{_ 'all-boards'}}
+      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'}}
+      if currentUser.isAdmin
+        li
+          a.js-go-setting(href="{{pathFor 'setting'}}")
+            i.fa.fa-lock
+            | {{_ 'admin-panel'}}
+      hr
       li
       li
         a.js-edit-profile
         a.js-edit-profile
           i.fa.fa-user
           i.fa.fa-user
@@ -38,18 +62,6 @@ template(name="memberMenuPopup")
           a.js-change-language
           a.js-change-language
             i.fa.fa-flag
             i.fa.fa-flag
             | {{_ 'changeLanguagePopup-title'}}
             | {{_ '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
   unless isSandstorm
     hr
     hr
     ul.pop-over-list
     ul.pop-over-list

+ 3 - 0
client/components/users/userHeader.js

@@ -28,6 +28,9 @@ Template.memberMenuPopup.events({
   'click .js-my-cards'() {
   'click .js-my-cards'() {
     Popup.close();
     Popup.close();
   },
   },
+  'click .js-open-archived-board'() {
+    Modal.open('archivedBoards');
+  },
   'click .js-edit-profile': Popup.open('editProfile'),
   'click .js-edit-profile': Popup.open('editProfile'),
   'click .js-change-settings': Popup.open('changeSettings'),
   'click .js-change-settings': Popup.open('changeSettings'),
   'click .js-change-avatar': Popup.open('changeAvatar'),
   'click .js-change-avatar': Popup.open('changeAvatar'),

+ 5 - 5
i18n/ar.i18n.json

@@ -137,7 +137,6 @@
   "boardChangeWatchPopup-title": "تغيير المتابعة",
   "boardChangeWatchPopup-title": "تغيير المتابعة",
   "boardMenuPopup-title": "Board Settings",
   "boardMenuPopup-title": "Board Settings",
   "boardChangeViewPopup-title": "عرض اللوحات",
   "boardChangeViewPopup-title": "عرض اللوحات",
-  "board": "لوحة",
   "boards": "لوحات",
   "boards": "لوحات",
   "board-view": "عرض اللوحات",
   "board-view": "عرض اللوحات",
   "board-view-cal": "التقويم",
   "board-view-cal": "التقويم",
@@ -149,7 +148,6 @@
   "cancel": "إلغاء",
   "cancel": "إلغاء",
   "card-archived": "البطاقة منقولة الى الارشيف",
   "card-archived": "البطاقة منقولة الى الارشيف",
   "board-archived": "اللوحات منقولة الى الارشيف",
   "board-archived": "اللوحات منقولة الى الارشيف",
-  "card": "نطاقة",
   "card-comments-title": "%s تعليقات لهذه البطاقة",
   "card-comments-title": "%s تعليقات لهذه البطاقة",
   "card-delete-notice": "هذا حذف أبديّ . سوف تفقد كل الإجراءات المنوطة بهذه البطاقة",
   "card-delete-notice": "هذا حذف أبديّ . سوف تفقد كل الإجراءات المنوطة بهذه البطاقة",
   "card-delete-pop": "سيتم إزالة جميع الإجراءات من تبعات النشاط، وأنك لن تكون قادرا على إعادة فتح البطاقة. لا يوجد التراجع.",
   "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.",
   "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.",
   "leaveBoardPopup-title": "مغادرة اللوحة ؟",
   "leaveBoardPopup-title": "مغادرة اللوحة ؟",
   "link-card": "ربط هذه البطاقة",
   "link-card": "ربط هذه البطاقة",
-  "list": "قائمة",
   "list-archive-cards": "Move all cards in this list to Archive",
   "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-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": "نقل بطاقات هذه القائمة",
   "list-move-cards": "نقل بطاقات هذه القائمة",
@@ -834,7 +831,7 @@
   "saturday": "Saturday",
   "saturday": "Saturday",
   "sunday": "Sunday",
   "sunday": "Sunday",
   "status": "Status",
   "status": "Status",
-  "swimlane": "خط السباحة",
+  "swimlane": "Swimlane",
   "owner": "Owner",
   "owner": "Owner",
   "last-modified-at": "Last modified at",
   "last-modified-at": "Last modified at",
   "last-activity": "Last activity",
   "last-activity": "Last activity",
@@ -852,5 +849,8 @@
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
   "person": "Person",
   "person": "Person",
-  "my-cards": "بطاقاتي"
+  "my-cards": "My Cards",
+  "card": "بطاقة",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/bg.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Карта",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/br.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/ca.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Fitxa",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/cs.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Karta",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/da.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Kort",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/de.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Karte",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/el.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/en-GB.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/eo.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/es-AR.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Tarjeta",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/es-CL.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Tarjeta",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/es-PE.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Tarjeta",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/es.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Tarjeta",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/eu.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/fa.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "کارت",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/fi.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Näyttönimi",
   "displayName": "Näyttönimi",
   "shortName": "Lyhyt nimi",
   "shortName": "Lyhyt nimi",
   "website": "Verkkosivusto",
   "website": "Verkkosivusto",
-  "person": "Henkilö"
+  "person": "Henkilö",
+  "my-cards": "Korttini",
+  "card": "Kortti",
+  "list": "Lista",
+  "board": "Taulu"
 }
 }

+ 5 - 1
i18n/fr.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Nom d'Affichage",
   "displayName": "Nom d'Affichage",
   "shortName": "Nom Court",
   "shortName": "Nom Court",
   "website": "Site Web",
   "website": "Site Web",
-  "person": "Personne"
+  "person": "Personne",
+  "my-cards": "My Cards",
+  "card": "Carte",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/gl.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/he.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "שם התצוגה",
   "displayName": "שם התצוגה",
   "shortName": "שם קצר",
   "shortName": "שם קצר",
   "website": "אתר",
   "website": "אתר",
-  "person": "איש/ה"
+  "person": "איש/ה",
+  "my-cards": "My Cards",
+  "card": "כרטיס",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/hi.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "कार्ड",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/hu.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/hy.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/id.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/ig.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/it.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Nome da visualizzare",
   "displayName": "Nome da visualizzare",
   "shortName": "Nome Corto",
   "shortName": "Nome Corto",
   "website": "Sito Web",
   "website": "Sito Web",
-  "person": "Persona"
+  "person": "Persona",
+  "my-cards": "My Cards",
+  "card": "Scheda",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/ja.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "カード",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/ka.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/km.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/ko.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "카드",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/lv.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Kartiņa",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/mk.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Карта",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/mn.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/nb.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 9 - 5
i18n/nl.i18n.json

@@ -809,10 +809,10 @@
   "addmore-detail": "Voeg een meer gedetailleerde beschrijving toe",
   "addmore-detail": "Voeg een meer gedetailleerde beschrijving toe",
   "show-on-card": "Toon op kaart",
   "show-on-card": "Toon op kaart",
   "new": "Nieuw",
   "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",
   "editUserPopup-title": "Wijzig gebruiker",
   "newUserPopup-title": "Nieuwe gebruiker",
   "newUserPopup-title": "Nieuwe gebruiker",
   "notifications": "Meldingen",
   "notifications": "Meldingen",
@@ -848,5 +848,9 @@
   "displayName": "Schermnaam",
   "displayName": "Schermnaam",
   "shortName": "Korte naam",
   "shortName": "Korte naam",
   "website": "Website",
   "website": "Website",
-  "person": "Persoon"
+  "person": "Persoon",
+  "my-cards": "Mijn kaarten",
+  "card": "Kaart",
+  "list": "Lijst",
+  "board": "Bord"
 }
 }

+ 5 - 1
i18n/oc.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Carta",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/pl.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Nazwa wyświetlana",
   "displayName": "Nazwa wyświetlana",
   "shortName": "Nazwa skrócona",
   "shortName": "Nazwa skrócona",
   "website": "Strona internetowa",
   "website": "Strona internetowa",
-  "person": "Osoba"
+  "person": "Osoba",
+  "my-cards": "My Cards",
+  "card": "karty",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 9 - 5
i18n/pt-BR.i18n.json

@@ -809,10 +809,10 @@
   "addmore-detail": "Adicionar descrição detalhada",
   "addmore-detail": "Adicionar descrição detalhada",
   "show-on-card": "Mostrar no Cartão",
   "show-on-card": "Mostrar no Cartão",
   "new": "Novo",
   "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",
   "editUserPopup-title": "Editar usuário",
   "newUserPopup-title": "Novo usuário",
   "newUserPopup-title": "Novo usuário",
   "notifications": "Notificações",
   "notifications": "Notificações",
@@ -848,5 +848,9 @@
   "displayName": "Nome em exibição",
   "displayName": "Nome em exibição",
   "shortName": "Nome curto",
   "shortName": "Nome curto",
   "website": "Website",
   "website": "Website",
-  "person": "Pessoa"
+  "person": "Pessoa",
+  "my-cards": "My Cards",
+  "card": "Cartão",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/pt.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Cartão",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/ro.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 9 - 5
i18n/ru.i18n.json

@@ -809,10 +809,10 @@
   "addmore-detail": "Добавить более детальное описание",
   "addmore-detail": "Добавить более детальное описание",
   "show-on-card": "Показать на карточке",
   "show-on-card": "Показать на карточке",
   "new": "Новый",
   "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": "Редактировать пользователя",
   "editUserPopup-title": "Редактировать пользователя",
   "newUserPopup-title": "Новый пользователь",
   "newUserPopup-title": "Новый пользователь",
   "notifications": "Уведомления",
   "notifications": "Уведомления",
@@ -848,5 +848,9 @@
   "displayName": "Отображаемое название",
   "displayName": "Отображаемое название",
   "shortName": "Короткое название",
   "shortName": "Короткое название",
   "website": "Вебсайт",
   "website": "Вебсайт",
-  "person": "Представитель"
+  "person": "Представитель",
+  "my-cards": "My Cards",
+  "card": "Карточка",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/sl.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Kartica",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/sr.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Kartica",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/sv.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Kort",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/sw.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/ta.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/th.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/tr.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Kart",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/uk.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Картка",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/vi.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/zh-CN.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "显示名称",
   "displayName": "显示名称",
   "shortName": "简称",
   "shortName": "简称",
   "website": "网站",
   "website": "网站",
-  "person": "人员"
+  "person": "人员",
+  "my-cards": "My Cards",
+  "card": "卡片",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/zh-HK.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "Card",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 5 - 1
i18n/zh-TW.i18n.json

@@ -848,5 +848,9 @@
   "displayName": "Display Name",
   "displayName": "Display Name",
   "shortName": "Short Name",
   "shortName": "Short Name",
   "website": "Website",
   "website": "Website",
-  "person": "Person"
+  "person": "Person",
+  "my-cards": "My Cards",
+  "card": "卡片",
+  "list": "List",
+  "board": "Board"
 }
 }

+ 1 - 1
package-lock.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "wekan",
   "name": "wekan",
-  "version": "v4.68.0",
+  "version": "v4.69.0",
   "lockfileVersion": 1,
   "lockfileVersion": 1,
   "requires": true,
   "requires": true,
   "dependencies": {
   "dependencies": {

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "wekan",
   "name": "wekan",
-  "version": "v4.68.0",
+  "version": "v4.69.0",
   "description": "Open-Source kanban",
   "description": "Open-Source kanban",
   "private": true,
   "private": true,
   "scripts": {
   "scripts": {

+ 2 - 2
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
 	  	<ul class="toc-list-h1">
 	  	<ul class="toc-list-h1">
         
         
           <li>
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v4.68">Wekan REST API v4.68</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v4.69">Wekan REST API v4.69</a>
             
             
           </li>
           </li>
         
         
@@ -2032,7 +2032,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="dark-box"></div>
       <div class="content">
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v4.68</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v4.69</h1>
 <blockquote>
 <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>
 <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>
 </blockquote>

+ 1 - 1
public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 swagger: '2.0'
 info:
 info:
   title: Wekan REST API
   title: Wekan REST API
-  version: v4.68
+  version: v4.69
   description: |
   description: |
     The REST API allows you to control and extend Wekan with ease.
     The REST API allows you to control and extend Wekan with ease.
 
 

+ 2 - 2
sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
     # The name of the app as it is displayed to the user.
 
 
-    appVersion = 468,
+    appVersion = 469,
     # Increment this for every release.
     # 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.
     # Human-readable presentation of the app version.
 
 
     minUpgradableAppVersion = 0,
     minUpgradableAppVersion = 0,