diff options
-rw-r--r-- | .meteor/versions | 4 | ||||
-rw-r--r-- | CHANGELOG.md | 15 | ||||
-rw-r--r-- | client/components/cards/cardDetails.jade | 2 | ||||
-rw-r--r-- | client/components/cards/cardDetails.styl | 5 | ||||
-rw-r--r-- | client/components/users/userAvatar.styl | 2 | ||||
-rw-r--r-- | i18n/fa.i18n.json | 46 | ||||
-rw-r--r-- | i18n/ja.i18n.json | 2 | ||||
-rw-r--r-- | i18n/sv.i18n.json | 68 | ||||
-rw-r--r-- | package-lock.json | 199 | ||||
-rw-r--r-- | package.json | 11 | ||||
-rwxr-xr-x | rebuild-wekan.sh | 44 |
11 files changed, 288 insertions, 110 deletions
diff --git a/.meteor/versions b/.meteor/versions index 5157f679..aa05f11c 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -109,7 +109,7 @@ mobile-status-bar@1.1.0 modern-browsers@0.1.5 modules@0.15.0 modules-runtime@0.12.0 -momentjs:moment@2.24.0 +momentjs:moment@2.25.2 mongo@1.10.0 mongo-decimal@0.1.1 mongo-dev-server@1.1.0 @@ -127,7 +127,7 @@ mquandalle:mousetrap-bindglobal@0.0.1 mquandalle:perfect-scrollbar@0.6.5_2 msavin:usercache@1.8.0 npm-bcrypt@0.9.3 -npm-mongo@3.7.0 +npm-mongo@3.7.1 oauth@1.3.0 oauth2@1.3.0 observe-sequence@1.0.16 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3772e347..f77a8fc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,17 @@ This release adds the following server platforms: and adds the following features: - [Install Wekan to mobile homescreen icon and use fullscreen - PWA](https://github.com/commit/8d5adc04645e3e71423f16869f39b8d79969bccd). + PWA](https://github.com/wekan/wekan/commit/8d5adc04645e3e71423f16869f39b8d79969bccd). [Docs for iOS and Android at wiki PWA page](https://github.com/wekan/wekan/wiki/PWA). Thanks to xet7. +- [Add options to rebuild-wekan.sh to run Meteor in development mode where after + file change it rebuilds](https://github.com/wekan/wekan/commit/5f915ef966170ea7baca7ddeb11319bc08a26fef). + Thanks to xet7. + +and adds the following updates: + +- [Update dependencies](https://github.com/wekan/wekan/commit/75bdd33fda58ea0233f5b38c466bcb1a9b0406ab). + Thanks to xet7. and fixes the following bugs: @@ -19,6 +27,11 @@ and fixes the following bugs: - [Fix shortcuts list and support card shortcuts when hovering a card](https://github.com/wekan/wekan/pull/3066). Thanks to marc1006. +- [Add white-space:normal to copy-to-clipboard button in card + details](https://github.com/wekan/wekan/pull/3075). + Thanks to helioguardabaxo. +- [Fix avatar-image class](https://github.com/wekan/wekan/pull/3083). + Thanks to krupupakku. Thanks to above GitHub users for their contributions and translators for their translations. diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 9f3b188b..2aa77627 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -519,7 +519,7 @@ template(name="cardMorePopup") = ' ' i.fa.colorful(class="{{#if board.isPublic}}fa-globe{{else}}fa-lock{{/if}}") input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}" autofocus="autofocus") - button.js-copy-card-link-to-clipboard(class="btn") {{_ 'copy-card-link-to-clipboard'}} + button.js-copy-card-link-to-clipboard(class="btn" id="clipboard") {{_ 'copy-card-link-to-clipboard'}} span.clearfix br h2 {{_ 'change-card-parent'}} diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index cfdc450d..12d0dda9 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -10,6 +10,9 @@ avatar-radius = 50% left: -2000px top: 0px +#clipboard + white-space: normal + .assignee border-radius: 3px display: block @@ -37,6 +40,8 @@ avatar-radius = 50% position: absolute &.avatar-image + object-fit: cover; + object-position: center; height: 100% width: @height diff --git a/client/components/users/userAvatar.styl b/client/components/users/userAvatar.styl index b962b01c..8209f4a1 100644 --- a/client/components/users/userAvatar.styl +++ b/client/components/users/userAvatar.styl @@ -29,6 +29,8 @@ avatar-radius = 50% position: absolute &.avatar-image + object-fit: cover; + object-position: center; height: 100% width: @height diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index ebb76c25..c8645b20 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -166,11 +166,11 @@ "cardStartVotingPopup-title": "شروع به رای", "positiveVoteMembersPopup-title": "طرفداران", "negativeVoteMembersPopup-title": "مخالفان", - "allowNonBoardMembers": "Allow anonymous vote on public board", + "allowNonBoardMembers": "اجازه رای بی نام در برد عمومی", "vote-question": "سوال رای گیری", - "vote-public": "Show who voted what", + "vote-public": "نمایش چه کسی به چه رای داده است", "vote-for-it": "for it", - "vote-against": "against", + "vote-against": "بر خلاف", "cardDeletePopup-title": "آیا می خواهید کارت را حذف کنید؟", "cardDetailsActionsPopup-title": "اعمال کارت", "cardLabelsPopup-title": "برچسب ها", @@ -329,7 +329,7 @@ "filter-clear": "حذف صافی ـ فیلتر ـ", "filter-no-label": "بدون برچسب", "filter-no-member": "بدون عضو", - "filter-no-assignee": "No assignee", + "filter-no-assignee": "الحاق نشده", "filter-no-custom-fields": "هیچ فیلدشخصی ای وجود ندارد", "filter-show-archive": "نمایش لیستهای آرشیو شده", "filter-hide-empty": "مخفی کردن لیستهای خالی", @@ -544,7 +544,7 @@ "new-outgoing-webhook": "New Outgoing Webhook", "no-name": "(ناشناخته)", "Node_version": "نسخه Node", - "Meteor_version": "Meteor version", + "Meteor_version": "نسخه متئور", "MongoDB_version": "ورژن MongoDB", "MongoDB_storage_engine": "موتور ذخیره سازی MongoDB", "MongoDB_Oplog_enabled": "MongoDB Oplog فعال", @@ -592,9 +592,9 @@ "default": "پیشفرض", "queue": "صف", "subtask-settings": "تنظیمات ریزکارها", - "card-settings": "Card Settings", + "card-settings": "تنظیمات کارت", "boardSubtaskSettingsPopup-title": "تنظیمات ریزکار های برد", - "boardCardSettingsPopup-title": "Card Settings", + "boardCardSettingsPopup-title": "تنظیمات کارت", "deposit-subtasks-board": "افزودن ریزکار به برد:", "deposit-subtasks-list": "لیست برای ریزکار های افزوده شده", "show-parent-in-minicard": "نمایش خانواده در ریز کارت", @@ -711,7 +711,7 @@ "r-board-note": "نکته: برای نمایش موارد ممکن کادر را خالی بگذارید.", "r-checklist-note": "نکته: چکلیستها باید توسط کاما از یکدیگر جدا شوند.", "r-when-a-card-is-moved": "زمانی که یک کارت به لیست دیگری منتقل شد", - "r-set": "Set", + "r-set": "تنظیم", "r-update": "به روز رسانی", "r-datefield": "تاریخ", "r-df-start-at": "شروع", @@ -761,12 +761,12 @@ "act-atUserComment": "You were mentioned in [__board__] __list__/__card__", "delete-user-confirm-popup": "Are you sure you want to delete this account? There is no undo.", "accounts-allowUserDelete": "Allow users to self delete their account", - "hide-minicard-label-text": "Hide minicard label text", + "hide-minicard-label-text": "مخفی کردن اسم برچسب مینی کارت", "show-desktop-drag-handles": "Show desktop drag handles", - "assignee": "Assignee", - "cardAssigneesPopup-title": "Assignee", - "addmore-detail": "Add a more detailed description", - "show-on-card": "Show on Card", + "assignee": "الحاق شده", + "cardAssigneesPopup-title": "الحاق شده", + "addmore-detail": "افزودن توضیحات کامل تر", + "show-on-card": "نمایش در کارت", "new": "جدید", "editUserPopup-title": "ویرایش کاربر", "newUserPopup-title": "کاربر جدید", @@ -775,14 +775,14 @@ "filter-by-unread": "فیلتر با خوانده نشده", "mark-all-as-read": "علامت همه به خوانده شده", "remove-all-read": "حذف همه خوانده شده", - "allow-rename": "Allow Rename", - "allowRenamePopup-title": "Allow Rename", - "start-day-of-week": "Set day of the week start", - "monday": "Monday", - "tuesday": "Tuesday", - "wednesday": "Wednesday", - "thursday": "Thursday", - "friday": "Friday", - "saturday": "Saturday", - "sunday": "Sunday" + "allow-rename": "اجازه تغییر نام", + "allowRenamePopup-title": "اجازه تغییر نام", + "start-day-of-week": "تنظیم روز شروع هفته", + "monday": "دوشنبه", + "tuesday": "سه شنبه", + "wednesday": "چهارشنبه", + "thursday": "پنجشنبه", + "friday": "جمعه", + "saturday": "شنبه", + "sunday": "یکشنبه" } diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index ee4538ec..d1f8f150 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -674,7 +674,7 @@ "r-of-checklist": "チェックリスト", "r-send-email": "メールを送る", "r-to": "宛先", - "r-of": "of", + "r-of": "/", "r-subject": "件名", "r-rule-details": "ルール詳細", "r-d-move-to-top-gen": "カードを自身のリストの先頭に移動", diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 97a7b1f1..d308e782 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -64,7 +64,7 @@ "activity-unchecked-item": "okryssad %s i checklistan %s av %s", "activity-checklist-added": "lade kontrollista till %s", "activity-checklist-removed": "tog bort en checklista från %s", - "activity-checklist-completed": "completed checklist %s of %s", + "activity-checklist-completed": "slutförde checklista %s av %s", "activity-checklist-uncompleted": "inte slutfört checklistan %s av %s", "activity-checklist-item-added": "lade checklista objekt till '%s' i %s", "activity-checklist-item-removed": "tog bort en checklista objekt från \"%s\" i %s", @@ -126,7 +126,7 @@ "board-nb-stars": "%s stjärnor", "board-not-found": "Anslagstavla hittades inte", "board-private-info": "Denna anslagstavla kommer att vara <strong>privat</strong>.", - "board-public-info": "Denna anslagstavla kommer att vara <strong>officiell</strong>.", + "board-public-info": "Denna anslagstavla kommer att vara <strong>publik</strong>.", "boardChangeColorPopup-title": "Ändra bakgrund på anslagstavla", "boardChangeTitlePopup-title": "Byt namn på anslagstavla", "boardChangeVisibilityPopup-title": "Ändra synlighet", @@ -152,8 +152,8 @@ "card-spent": "Spenderad tid", "card-edit-attachments": "Redigera bilaga", "card-edit-custom-fields": "Redigera anpassade fält", - "card-start-voting": "Start voting", - "card-cancel-voting": "Delete voting and all votes", + "card-start-voting": "Börja rösta", + "card-cancel-voting": "Radera omröstning och alla röster", "card-edit-labels": "Redigera etiketter", "card-edit-members": "Redigera medlemmar", "card-labels-title": "Ändra etiketter för kortet.", @@ -163,14 +163,14 @@ "cardAttachmentsPopup-title": "Bifoga från", "cardCustomField-datePopup-title": "Ändra datum", "cardCustomFieldsPopup-title": "Redigera anpassade fält", - "cardStartVotingPopup-title": "Start a vote", - "positiveVoteMembersPopup-title": "Proponents", - "negativeVoteMembersPopup-title": "Opponents", - "allowNonBoardMembers": "Allow anonymous vote on public board", - "vote-question": "Voting question", - "vote-public": "Show who voted what", - "vote-for-it": "for it", - "vote-against": "against", + "cardStartVotingPopup-title": "Påbörja en omröstning", + "positiveVoteMembersPopup-title": "Förespråkare", + "negativeVoteMembersPopup-title": "Opponenter", + "allowNonBoardMembers": "Tillåt anonyma röster på publik anslagstavla", + "vote-question": "Omröstningsfråga", + "vote-public": "Visa vem som röstade på vad", + "vote-for-it": "för", + "vote-against": "emot", "cardDeletePopup-title": "Ta bort kort?", "cardDetailsActionsPopup-title": "Kortåtgärder", "cardLabelsPopup-title": "Etiketter", @@ -234,7 +234,7 @@ "no-comments": "Inga kommentarer", "no-comments-desc": "Kan inte se kommentarer och aktiviteter.", "worker": "Worker", - "worker-desc": "Can only move cards, assign itself to card and comment.", + "worker-desc": "Kan endast flytta kort, tilldela sig kort och kommentera.", "computer": "Dator", "confirm-subtask-delete-dialog": "Är du säker på att du vill radera deluppgift?", "confirm-checklist-delete-dialog": "Är du säker på att du vill radera checklista?", @@ -319,8 +319,8 @@ "list-sort-by": "Sortera listan efter:", "list-label-modifiedAt": "Sista åtkomsttid", "list-label-title": "Namn på listan", - "list-label-sort": "Your Manual Order", - "list-label-short-modifiedAt": "(L)", + "list-label-sort": "Din Manuella Ordning", + "list-label-short-modifiedAt": "(S)", "list-label-short-title": "(N)", "list-label-short-sort": "(M)", "filter": "Filtrera", @@ -329,7 +329,7 @@ "filter-clear": "Rensa filter", "filter-no-label": "Ingen etikett", "filter-no-member": "Ingen medlem", - "filter-no-assignee": "No assignee", + "filter-no-assignee": "Inte tilldelad någon", "filter-no-custom-fields": "Inga anpassade fält", "filter-show-archive": "Visa arkiverade listor", "filter-hide-empty": "Dölj tomma listor", @@ -449,7 +449,7 @@ "save": "Spara", "search": "Sök", "rules": "Regler", - "search-cards": "Search from card/list titles, descriptions and custom fields on this board", + "search-cards": "Sök i kort- och listtitlar, beskrivningar och anpassade fält på denna anslagstavla", "search-example": "Text att söka efter?", "select-color": "Välj färg", "set-wip-limit-value": "Ange en gräns för det maximala antalet uppgifter i den här listan", @@ -536,7 +536,7 @@ "webhook-title": "Namn på webhook", "webhook-token": "Token (valfritt för autentisering)", "outgoing-webhooks": "Utgående Webhookar", - "bidirectional-webhooks": "Two-Way Webhooks", + "bidirectional-webhooks": "Dubbelriktade Webhookar", "outgoingWebhooksPopup-title": "Utgående Webhookar", "boardCardTitlePopup-title": "Korttitelfiler", "disable-webhook": "Avaktivera denna webhook", @@ -674,7 +674,7 @@ "r-of-checklist": "av checklistan", "r-send-email": "Skicka ett e-postmeddelande", "r-to": "till", - "r-of": "of", + "r-of": "av", "r-subject": "änme", "r-rule-details": "Regeldetaljer", "r-d-move-to-top-gen": "Flytta kort till toppen av sin lista", @@ -770,19 +770,19 @@ "new": "Ny", "editUserPopup-title": "Redigera användare", "newUserPopup-title": "Ny användare", - "notifications": "Notifications", - "view-all": "View All", - "filter-by-unread": "Filter by Unread", - "mark-all-as-read": "Mark all as read", - "remove-all-read": "Remove all read", - "allow-rename": "Allow Rename", - "allowRenamePopup-title": "Allow Rename", - "start-day-of-week": "Set day of the week start", - "monday": "Monday", - "tuesday": "Tuesday", - "wednesday": "Wednesday", - "thursday": "Thursday", - "friday": "Friday", - "saturday": "Saturday", - "sunday": "Sunday" + "notifications": "Notifieringar", + "view-all": "Visa Allt", + "filter-by-unread": "Filtrera efter Oläst", + "mark-all-as-read": "Markera alla som lästa", + "remove-all-read": "Ta bort alla lästa", + "allow-rename": "Tillåt Namnändring", + "allowRenamePopup-title": "Tillåt Namnändring", + "start-day-of-week": "Ange veckans första dag", + "monday": "Måndag", + "tuesday": "Tisdag", + "wednesday": "Onsdag", + "thursday": "Torsdag", + "friday": "Fredag", + "saturday": "Lördag", + "sunday": "Söndag" } diff --git a/package-lock.json b/package-lock.json index 72e781a7..61c32c66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,18 +13,18 @@ } }, "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", + "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", + "@babel/generator": "^7.9.6", "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", + "@babel/helpers": "^7.9.6", + "@babel/parser": "^7.9.6", "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -33,12 +33,57 @@ "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" + }, + "dependencies": { + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/generator": { "version": "7.9.5", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz", "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==", + "dev": true, "requires": { "@babel/types": "^7.9.5", "jsesc": "^2.5.1", @@ -103,14 +148,58 @@ } }, "@babel/helper-replace-supers": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz", - "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz", + "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==", "requires": { "@babel/helper-member-expression-to-functions": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" + }, + "dependencies": { + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-simple-access": { @@ -136,13 +225,57 @@ "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==" }, "@babel/helpers": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz", - "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", + "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", "requires": { "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0" + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6" + }, + "dependencies": { + "@babel/generator": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", + "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "requires": { + "@babel/types": "^7.9.6", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", + "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==" + }, + "@babel/traverse": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", + "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.9.6", + "@babel/helper-function-name": "^7.9.5", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.9.6", + "@babel/types": "^7.9.6", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", + "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "requires": { + "@babel/helper-validator-identifier": "^7.9.5", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/highlight": { @@ -161,9 +294,9 @@ "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==" }, "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", + "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -182,6 +315,7 @@ "version": "7.9.5", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz", "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==", + "dev": true, "requires": { "@babel/code-frame": "^7.8.3", "@babel/generator": "^7.9.5", @@ -204,6 +338,11 @@ "to-fast-properties": "^2.0.0" } }, + "@root/request": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@root/request/-/request-1.6.1.tgz", + "integrity": "sha512-8wrWyeBLRp7T8J36GkT3RODJ6zYmL0/maWlAUD5LOXT28D3TDquUepyYDKYANNA3Gc8R5ZCgf+AXvSTYpJEWwQ==" + }, "@samverschueren/stream-to-observable": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz", @@ -3297,9 +3436,9 @@ "optional": true }, "mongodb": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.6.tgz", - "integrity": "sha512-sh3q3GLDLT4QmoDLamxtAECwC3RGjq+oNuK1ENV8+tnipIavss6sMYt77hpygqlMOCt0Sla5cl7H4SKCVBCGEg==", + "version": "3.5.7", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.7.tgz", + "integrity": "sha512-lMtleRT+vIgY/JhhTn1nyGwnSMmJkJELp+4ZbrjctrnBxuLbj6rmLuJFz8W2xUzUqWmqoyVxJLYuC58ZKpcTYQ==", "requires": { "bl": "^2.2.0", "bson": "^1.1.4", @@ -3967,9 +4106,9 @@ "dev": true }, "qs": { - "version": "6.9.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz", - "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==" + "version": "6.9.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz", + "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==" }, "rc": { "version": "1.2.8", @@ -4384,9 +4523,9 @@ } }, "source-map-support": { - "version": "0.5.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz", - "integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==", + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" diff --git a/package.json b/package.json index 85dc1f9b..de729564 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,9 @@ "prettier-eslint": "^9.0.1" }, "dependencies": { - "@babel/core": "^7.9.0", - "@babel/runtime": "^7.9.2", + "@babel/core": "^7.9.6", + "@babel/runtime": "^7.9.6", + "@root/request": "^1.6.1", "ajv": "^5.0.0", "babel-runtime": "^6.26.0", "bcrypt": "^3.0.7", @@ -66,11 +67,11 @@ "gridfs-stream": "^0.5.3", "ldapjs": "^1.0.2", "meteor-node-stubs": "^0.4.1", - "mongodb": "^3.5.0", + "mongodb": "^3.5.7", "os": "^0.1.1", "page": "^1.11.5", - "qs": "^6.9.1", - "source-map-support": "^0.5.16", + "qs": "^6.9.4", + "source-map-support": "^0.5.19", "xss": "^1.0.6" } } diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh index 1655d8f7..b058a6c9 100755 --- a/rebuild-wekan.sh +++ b/rebuild-wekan.sh @@ -64,7 +64,7 @@ function npm_call(){ echo PS3='Please enter your choice: ' -options=("Install Wekan dependencies" "Build Wekan" "Quit") +options=("Install Wekan dependencies" "Build Wekan" "Run Meteor for development on Ethernet IP address port 4000" "Run Meteor for development on Custom IP address and port" "Quit") select opt in "${options[@]}" do case $opt in @@ -106,18 +106,19 @@ do exit; fi - ## Latest npm with Meteor 1.8.x - npm_call -g install npm - npm_call -g install node-gyp - # Latest fibers for Meteor 1.8.x + ## Latest npm with Meteor 1.8.x + npm_call -g install npm + npm_call -g install node-gyp + # Latest fibers for Meteor 1.8.x sudo mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp - npm_call -g install fibers - # Install Meteor, if it's not yet installed - curl https://install.meteor.com | bash + npm_call -g install fibers + # Install Meteor, if it's not yet installed + curl https://install.meteor.com | bash sudo chown -R $(id -u):$(id -g) $HOME/.npm $HOME/.meteor break ;; - "Build Wekan") + + "Build Wekan") echo "Building Wekan." #wekan_repo_check # REPOS BELOW ARE INCLUDED TO WEKAN REPO @@ -148,7 +149,7 @@ do rm -rf .build meteor build .build --directory cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js - # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc. + # Remove legacy webbroser bundle, so that Wekan works also at Android Firefox, iOS Safari, etc. rm -rf .build/bundle/programs/web.browser.legacy #Removed binary version of bcrypt because of security vulnerability that is not fixed yet. #https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac @@ -164,9 +165,26 @@ do echo Done. break ;; - "Quit") + + "Run Meteor for development on Ethernet IP address port 4000") + IPADDRESS=$(ip addr show enp2s0 | grep 'inet ' | cut -d: -f2 | awk '{ print $2}' | cut -d '/' -f 1) + WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:4000 meteor run --exclude-archs web.browser.legacy,web.cordova --port 4000 + break + ;; + + "Run Meteor for development on Custom IP address and port") + ip address + echo "From above list, what is your IP address?" + read IPADDRESS + echo "On what port you would like to run Wekan?" + read PORT + WITH_API=true RICHER_CARD_COMMENT_EDITOR=false ROOT_URL=http://$IPADDRESS:$PORT meteor run --exclude-archs web.browser.legacy,web.cordova --port $PORT + break + ;; + + "Quit") break - ;; - *) echo invalid option;; + ;; + *) echo invalid option;; esac done |