diff options
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | Stackerfile.yml | 2 | ||||
-rw-r--r-- | client/components/boards/boardBody.jade | 9 | ||||
-rw-r--r-- | client/components/boards/boardBody.js | 7 | ||||
-rw-r--r-- | i18n/zh-TW.i18n.json | 60 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
7 files changed, 53 insertions, 39 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 67ee79f8..73a092b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v2.11 2019-01-31 Wekan release + +This release fixes the following bugs: + +- [Fix: Bug: Not logged in public board page has calendar](https://github.com/wekan/wekan/issues/2061). Thanks to xet7. + +Thanks to above GitHub users and translators for contributions. + # v2.10 2019-01-30 Wekan release This release adds the following new features: diff --git a/Stackerfile.yml b/Stackerfile.yml index 6e6abde4..51a90b99 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.10.0" +appVersion: "v2.11.0" files: userUploads: - README.md diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index 9e4b9c61..3a40921d 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -29,7 +29,8 @@ template(name="boardBody") +calendarView template(name="calendarView") - .calendar-view.swimlane - if currentCard - +cardDetails(currentCard) - +fullcalendar(calendarOptions) + if isViewCalendar + .calendar-view.swimlane + if currentCard + +cardDetails(currentCard) + +fullcalendar(calendarOptions) diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index ae5b67fd..2de8777a 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -134,7 +134,7 @@ BlazeComponent.extendComponent({ isViewCalendar() { const currentUser = Meteor.user(); - if (!currentUser) return true; + if (!currentUser) return false; return (currentUser.profile.boardView === 'board-view-cal'); }, @@ -264,4 +264,9 @@ BlazeComponent.extendComponent({ }, }; }, + isViewCalendar() { + const currentUser = Meteor.user(); + if (!currentUser) return false; + return (currentUser.profile.boardView === 'board-view-cal'); + }, }).register('calendarView'); diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 59c2cb1d..4d7e18d0 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -147,8 +147,8 @@ "cards-count": "卡片", "casSignIn": "以 CAS 登入", "cardType-card": "卡片", - "cardType-linkedCard": "Linked Card", - "cardType-linkedBoard": "Linked Board", + "cardType-linkedCard": "已連結卡片", + "cardType-linkedBoard": "已連結看板", "change": "變更", "change-avatar": "更換大頭貼", "change-password": "變更密碼", @@ -161,50 +161,50 @@ "changeSettingsPopup-title": "更改設定", "subtasks": "子任務", "checklists": "待辦清單", - "click-to-star": "點此來標記該看板", - "click-to-unstar": "點此來去除該看板的標記", + "click-to-star": "點擊以添加標記於此看板。", + "click-to-unstar": "點擊以移除標記於此看板。", "clipboard": "剪貼簿貼上或者拖曳檔案", "close": "關閉", "close-board": "關閉看板", "close-board-pop": "您可以通過點擊主頁眉中的「封存」按鈕來恢復看板。", "color-black": "黑色", "color-blue": "藍色", - "color-crimson": "crimson", - "color-darkgreen": "darkgreen", - "color-gold": "gold", - "color-gray": "gray", + "color-crimson": "艷紅", + "color-darkgreen": "暗綠", + "color-gold": "金色", + "color-gray": "灰色", "color-green": "綠色", - "color-indigo": "indigo", + "color-indigo": "紫藍", "color-lime": "綠黃", - "color-magenta": "magenta", - "color-mistyrose": "mistyrose", - "color-navy": "navy", + "color-magenta": "洋紅", + "color-mistyrose": "玫瑰粉", + "color-navy": "藏青", "color-orange": "橙色", - "color-paleturquoise": "paleturquoise", - "color-peachpuff": "peachpuff", + "color-paleturquoise": "淡藍綠", + "color-peachpuff": "桃色", "color-pink": "粉紅", - "color-plum": "plum", + "color-plum": "梅色", "color-purple": "紫色", "color-red": "紅色", - "color-saddlebrown": "saddlebrown", - "color-silver": "silver", + "color-saddlebrown": "馬鞍棕", + "color-silver": "銀色", "color-sky": "天藍", - "color-slateblue": "slateblue", - "color-white": "white", + "color-slateblue": "青藍", + "color-white": "白色", "color-yellow": "黃色", - "unset-color": "Unset", + "unset-color": "未設置", "comment": "評論", "comment-placeholder": "撰寫評論", "comment-only": "只能發表評論", "comment-only-desc": "只能在卡片上發表評論", "no-comments": "沒有評論", - "no-comments-desc": "Can not see comments and activities.", + "no-comments-desc": "無法檢視評論和活動。", "computer": "從本機上傳", "confirm-subtask-delete-dialog": "你確定要刪除子任務嗎?", "confirm-checklist-delete-dialog": "你確定要刪除待辦清單嗎?", "copy-card-link-to-clipboard": "將卡片連結複製到剪貼簿", - "linkCardPopup-title": "Link Card", - "searchCardPopup-title": "Search Card", + "linkCardPopup-title": "連結卡片", + "searchCardPopup-title": "搜尋卡片", "copyCardPopup-title": "複製卡片", "copyChecklistToManyCardsPopup-title": "複製待辦清單的樣板到多個卡片", "copyChecklistToManyCardsPopup-instructions": "使用此 JSON 格式來表示目標卡片的標題和描述", @@ -216,14 +216,14 @@ "createCustomField": "建立欄位", "createCustomFieldPopup-title": "建立欄位", "current": "目前", - "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.", - "custom-field-checkbox": "Checkbox", + "custom-field-delete-pop": "此操作將會從所有卡片中移除自訂欄位以及銷毀歷史紀錄,並且無法撤消。", + "custom-field-checkbox": "複選框", "custom-field-date": "日期", - "custom-field-dropdown": "Dropdown List", - "custom-field-dropdown-none": "(none)", - "custom-field-dropdown-options": "下拉式選單", + "custom-field-dropdown": "下拉式選單", + "custom-field-dropdown-none": "(無)", + "custom-field-dropdown-options": "清單選項", "custom-field-dropdown-options-placeholder": "按下 Enter 新增更多選項", - "custom-field-dropdown-unknown": "(unknown)", + "custom-field-dropdown-unknown": "(未知)", "custom-field-number": "數字", "custom-field-text": "文字", "custom-fields": "自訂欄位", @@ -255,7 +255,7 @@ "email-enrollAccount-subject": "您在 __siteName__ 的帳號已經建立", "email-enrollAccount-text": "親愛的 __user__,\n\n點選下面的連結,即刻開始使用這項服務。\n\n__url__\n\n謝謝。", "email-fail": "郵件寄送失敗", - "email-fail-text": "Error trying to send email", + "email-fail-text": "嘗試發送郵件時出現錯誤", "email-invalid": "電子郵件地址錯誤", "email-invite": "寄送郵件邀請", "email-invite-subject": "__inviter__ 向您發出邀請", diff --git a/package.json b/package.json index ebd07f6b..ef6a30e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.10.0", + "version": "v2.11.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index ddaea563..0e9e4d75 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 = 212, + appVersion = 213, # Increment this for every release. - appMarketingVersion = (defaultText = "2.10.0~2019-01-30"), + appMarketingVersion = (defaultText = "2.11.0~2019-01-31"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, |