From 46bd94cdd94840583916b237f1d8af1a8f2ff080 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jan 2022 07:11:34 +0000 Subject: [PATCH 01/20] chore(deps): Bump trim-off-newlines in /packages/nc-plugin Bumps [trim-off-newlines](https://github.com/stevemao/trim-off-newlines) from 1.0.1 to 1.0.3. - [Release notes](https://github.com/stevemao/trim-off-newlines/releases) - [Commits](https://github.com/stevemao/trim-off-newlines/compare/v1.0.1...v1.0.3) --- updated-dependencies: - dependency-name: trim-off-newlines dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/nc-plugin/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nc-plugin/package-lock.json b/packages/nc-plugin/package-lock.json index 9815b2c1fe..a5f8207106 100644 --- a/packages/nc-plugin/package-lock.json +++ b/packages/nc-plugin/package-lock.json @@ -8705,9 +8705,9 @@ "dev": true }, "trim-off-newlines": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz", - "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.3.tgz", + "integrity": "sha512-kh6Tu6GbeSNMGfrrZh6Bb/4ZEHV1QlB4xNDBeog8Y9/QwFlKTRyWvY3Fs9tRDAMZliVUwieMgEdIeL/FtqjkJg==", "dev": true }, "trim-repeated": { From 37684140fa0d05263173506bc4d8651b1a204d51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jan 2022 07:11:36 +0000 Subject: [PATCH 02/20] chore(deps): Bump trim-off-newlines in /packages/nc-common Bumps [trim-off-newlines](https://github.com/stevemao/trim-off-newlines) from 1.0.1 to 1.0.3. - [Release notes](https://github.com/stevemao/trim-off-newlines/releases) - [Commits](https://github.com/stevemao/trim-off-newlines/compare/v1.0.1...v1.0.3) --- updated-dependencies: - dependency-name: trim-off-newlines dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/nc-common/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/nc-common/package-lock.json b/packages/nc-common/package-lock.json index f528e44494..58ab48098b 100644 --- a/packages/nc-common/package-lock.json +++ b/packages/nc-common/package-lock.json @@ -9113,9 +9113,9 @@ "dev": true }, "trim-off-newlines": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz", - "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.3.tgz", + "integrity": "sha512-kh6Tu6GbeSNMGfrrZh6Bb/4ZEHV1QlB4xNDBeog8Y9/QwFlKTRyWvY3Fs9tRDAMZliVUwieMgEdIeL/FtqjkJg==", "dev": true }, "trim-repeated": { From 710087318e78345b61f3960487285a129770c002 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jan 2022 07:13:24 +0000 Subject: [PATCH 03/20] chore(deps): Bump trim-off-newlines from 1.0.1 to 1.0.3 Bumps [trim-off-newlines](https://github.com/stevemao/trim-off-newlines) from 1.0.1 to 1.0.3. - [Release notes](https://github.com/stevemao/trim-off-newlines/releases) - [Commits](https://github.com/stevemao/trim-off-newlines/compare/v1.0.1...v1.0.3) --- updated-dependencies: - dependency-name: trim-off-newlines dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- packages/nc-common/package-lock.json | 6 +++--- packages/nc-plugin/package-lock.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f34b226d3..cbb33b9fbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9400,9 +9400,9 @@ "dev": true }, "trim-off-newlines": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz", - "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.3.tgz", + "integrity": "sha512-kh6Tu6GbeSNMGfrrZh6Bb/4ZEHV1QlB4xNDBeog8Y9/QwFlKTRyWvY3Fs9tRDAMZliVUwieMgEdIeL/FtqjkJg==", "dev": true }, "tslib": { diff --git a/packages/nc-common/package-lock.json b/packages/nc-common/package-lock.json index f528e44494..58ab48098b 100644 --- a/packages/nc-common/package-lock.json +++ b/packages/nc-common/package-lock.json @@ -9113,9 +9113,9 @@ "dev": true }, "trim-off-newlines": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz", - "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.3.tgz", + "integrity": "sha512-kh6Tu6GbeSNMGfrrZh6Bb/4ZEHV1QlB4xNDBeog8Y9/QwFlKTRyWvY3Fs9tRDAMZliVUwieMgEdIeL/FtqjkJg==", "dev": true }, "trim-repeated": { diff --git a/packages/nc-plugin/package-lock.json b/packages/nc-plugin/package-lock.json index 9815b2c1fe..a5f8207106 100644 --- a/packages/nc-plugin/package-lock.json +++ b/packages/nc-plugin/package-lock.json @@ -8705,9 +8705,9 @@ "dev": true }, "trim-off-newlines": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz", - "integrity": "sha1-n5up2e+odkw4dpi8v+sshI8RrbM=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.3.tgz", + "integrity": "sha512-kh6Tu6GbeSNMGfrrZh6Bb/4ZEHV1QlB4xNDBeog8Y9/QwFlKTRyWvY3Fs9tRDAMZliVUwieMgEdIeL/FtqjkJg==", "dev": true }, "trim-repeated": { From 171fcae745c05f4e5c00fa32b911e9070633f661 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jan 2022 15:48:10 +0000 Subject: [PATCH 04/20] chore(deps): Bump node-fetch from 2.6.1 to 2.6.7 in /packages/noco-blog Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/noco-blog/package-lock.json | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/packages/noco-blog/package-lock.json b/packages/noco-blog/package-lock.json index aa3205a2c9..456304b64a 100644 --- a/packages/noco-blog/package-lock.json +++ b/packages/noco-blog/package-lock.json @@ -8038,9 +8038,12 @@ } }, "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } }, "node-html-parser": { "version": "3.3.6", @@ -11656,6 +11659,11 @@ "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz", "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==" }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, "trough": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", @@ -12458,6 +12466,11 @@ "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz", "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==" }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, "webpack": { "version": "4.46.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", @@ -12871,6 +12884,15 @@ } } }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", From d0ce64d7ffa164526541cf8578cde9c2ea5cdbed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jan 2022 15:48:15 +0000 Subject: [PATCH 05/20] chore(deps): Bump node-fetch from 2.6.1 to 2.6.7 in /packages/noco-docs Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/noco-docs/package-lock.json | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/packages/noco-docs/package-lock.json b/packages/noco-docs/package-lock.json index fa88282af7..464f15bb46 100644 --- a/packages/noco-docs/package-lock.json +++ b/packages/noco-docs/package-lock.json @@ -8038,9 +8038,12 @@ } }, "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } }, "node-html-parser": { "version": "3.3.6", @@ -11656,6 +11659,11 @@ "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz", "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==" }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, "trough": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", @@ -12458,6 +12466,11 @@ "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz", "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==" }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, "webpack": { "version": "4.46.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", @@ -12871,6 +12884,15 @@ } } }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", From e20527c72568cb4484e90ab1bc49c4e508da259a Mon Sep 17 00:00:00 2001 From: Pranav C <61551451+pranavxc@users.noreply.github.com> Date: Tue, 25 Jan 2022 19:16:59 +0530 Subject: [PATCH 06/20] fix: add proper spacing in left navigation drawer (#994) re #993 Signed-off-by: Pranav C --- packages/nc-gui/components/ProjectTreeView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui/components/ProjectTreeView.vue b/packages/nc-gui/components/ProjectTreeView.vue index 8b86dd8bd1..3c1d6040ad 100644 --- a/packages/nc-gui/components/ProjectTreeView.vue +++ b/packages/nc-gui/components/ProjectTreeView.vue @@ -12,7 +12,7 @@ permanent mini-variant-width="50" class="pl-2 nc-nav-drawer" - style="min-width: 100%; height: calc(100% - 0px)" + style="min-width: 100%; height: calc(100% - 30px)" >
From b40b2a89afc2bba3d3f4aa174419b6a74efbc4b2 Mon Sep 17 00:00:00 2001 From: pan93412 Date: Wed, 26 Jan 2022 12:48:37 +0800 Subject: [PATCH 07/20] l10n(zh_TW): reviewed and translated all Extended from #995 Signed-off-by: pan93412 --- packages/nc-gui/lang/zh_TW.json | 134 ++++++++++++++++---------------- 1 file changed, 69 insertions(+), 65 deletions(-) diff --git a/packages/nc-gui/lang/zh_TW.json b/packages/nc-gui/lang/zh_TW.json index 63d4de8481..ee4401288a 100644 --- a/packages/nc-gui/lang/zh_TW.json +++ b/packages/nc-gui/lang/zh_TW.json @@ -1,15 +1,15 @@ { "projects": { "my_projects": "我的專案", - "reload_projects_tooltip": "重新整理", + "reload_projects_tooltip": "重新整理專案", "create_new_project_button": { "text": "建立新專案", "subtext_1": "建立", "subtext_1_tooltip": "建立新專案", - "subtext_2": "連接外部資料庫來建立", - "subtext_2_tooltip": "支援 MySQL, PostgreSQL, SQL Server & SQLite", - "from_template": "從範本建立新專案", - "from_excel": "從 Excel 建立新專案" + "subtext_2": "連線至外部資料庫來建立", + "subtext_2_tooltip": "支援 MySQL、PostgreSQL、SQL Server 和 SQLite", + "from_template": "從模板建立專案", + "from_excel": "從 Excel 建立專案" }, "search_project": "搜尋專案", "import_metadata": "匯入中繼資料", @@ -17,20 +17,20 @@ "clear_metadata": "清除中繼資料", "stop_project": "停止專案", "start_project": "啟動專案", - "restart_project": "重新啟動專案", + "restart_project": "重啟專案", "delete_project": "刪除專案", - "project_api_type_tooltip_graphql": "可通過 GraphQL API 存取", - "project_api_type_tooltip_rest": "可通過 REST API 存取", - "project_empty_message": "開始建立新專案", + "project_api_type_tooltip_graphql": "可透過 GraphQL API 存取", + "project_api_type_tooltip_rest": "可透過 REST API 存取", + "project_empty_message": "從建立新專案開始", "import_button": { - "text": "通過上傳中繼資料 zip 檔案以匯入 NocoDB 專案" + "text": "透過上傳中繼資料 ZIP 檔案來匯入 NocoDB 專案" }, "show_community_star": "在 Github 上", "show_community_us_on_Github": "幫我們按讚", "show_community_book_a_free_demo": "預訂免費 Demo", - "show_community_get_your_questions_answered": "讓您的問題得到解答", + "show_community_get_your_questions_answered": "解惑您的問題", "show_community_join_discord": "加入 Discord", - "show_community_join_reddit": "加入 /r/NocoDB", + "show_community_follow_reddit": "加入 /r/NocoDB", "show_community_follow_nocodb": "追蹤 NocoDB", "search": { "your_search_found_no_results": "您的搜尋 {search} 找不到結果" @@ -38,10 +38,10 @@ "ext_db": { "title": { "edit": "編輯專案", - "create": "建立新專案" + "create": "建立專案" }, "project_name": "輸入專案名稱", - "project_type": "透過...存取專案", + "project_type": "存取專案方式", "button": { "save_project": "儲存專案", "update_and_restart": "更新並重新啟動", @@ -52,24 +52,24 @@ "title": "資料庫憑證", "db_type": "資料庫類型", "sqlite_file": "SQLite 檔案", - "host_address": "主機地址", - "port": "通訊埠編號", + "host_address": "主機位址", + "port": "連線埠號碼", "username": "使用者名稱", "password": "密碼", - "db_create_if_not_exists": "資料庫：如果不存在則建立", + "db_create_if_not_exists": "資料庫：不存在則建立", "button": { - "test_db_conn": "測試資料庫連接", - "remove_db_from_env": "從環境中刪除資料庫" + "test_db_conn": "測試資料庫連線", + "remove_db_from_env": "從環境移除資料庫" }, "advanced": { "title": "SSL 及進階參數", "ssl": { "client_key": { - "title": "客戶端金鑰", + "title": "用戶端金鑰", "toolip": "選擇 .key 檔案" }, "client_cert": { - "title": "客戶端憑證", + "title": "用戶端憑證", "toolip": "選擇 .cert 檔案" }, "server_ca": { @@ -78,58 +78,58 @@ }, "preferred": "首選", "usage": { - "no": "不", + "no": "否", "preferred": "首選", "required": "必填", - "requried_ca": "必填-CA", - "requried_identity": "必填-IDENTITY" + "requried_ca": "必填 - CA", + "requried_identity": "必填 - IDENTITY" } }, "inflection": { - "table_name": "拐點 - 表名", - "column_name": "拐點 - 列名稱" + "table_name": "屈折 - 表格名稱", + "column_name": "屈折 - 直行名稱" }, "button": { - "edit_conn_json": "編輯連接 JSON" + "edit_conn_json": "編輯連線 JSON" } } }, "error": { - "invalid_char_in_folder_path": "文件夾路徑中的字符無效。", - "invalid_db_credentials": "資料庫憑據無效。", - "unable_to_connect_to_db": "無法連接資料庫，請檢查您的資料庫已啟動。", - "user_doesnt_ve_sufficient_permission": "使用者不存在或具有足夠的權限來創建架構。" + "invalid_char_in_folder_path": "資料夾路徑有無效字元。", + "invalid_db_credentials": "資料庫憑證無效。", + "unable_to_connect_to_db": "無法連線至資料庫。請檢查您的資料庫是否已經上線。", + "user_doesnt_ve_sufficient_permission": "使用者不存在，或者是無權建立結構。" }, "head": { - "title": "建立新專案 | NocoDB" + "title": "建立新專案｜NocoDB" }, "dialog": { - "success": "連接成功", - "failure": "連接失敗：" + "success": "連線成功", + "failure": "連線失敗：" } }, "notifications": { - "no_new": "沒有新的通知", + "no_new": "沒有新通知", "clear": "清除" } }, "signin": { "title": "登入", - "enter_your_work_email": "輸入您的工作電子郵件地址", + "enter_your_work_email": "輸入您的工作電子信箱地址", "enter_your_password": "輸入您的密碼", "forget_password": "忘記密碼？", "dont_ve_an_account": "沒有帳號？", "sign_up": "註冊", "form": { "rules": { - "email_is_reqd": "電子郵件地址為必填", - "email_must_be_valid": "電子郵件地址無效", + "email_is_reqd": "電子信箱地址為必填", + "email_must_be_valid": "電子信箱地址格式錯誤", "passwd_required": "密碼為必填", - "passwd_must_be_8_chars": "您的密碼必須至少有 8 個字元" + "passwd_must_be_8_chars": "您的密碼應至少有 8 個字元" } }, "head": { - "title": "登入 | NocoDB", + "title": "登入｜NocoDB", "meta": { "hid": "登入 NocoDB", "name": "登入 NocoDB", @@ -138,25 +138,25 @@ }, "password": { "recovery": { - "title": "重置您的密碼", - "message_1": "請提供您註冊時使用的電子郵件地址。", - "message_2": "我們將向您發送一封電子郵件，其中包含重置密碼的連結。", - "success": "請檢查您的電子郵件信箱以重置密碼", + "title": "重設密碼", + "message_1": "請填入您註冊時使用的電子信箱位址。", + "message_2": "我們將傳給您一封電子郵件，其中包含重設密碼的連結。", + "success": "請確認您的電子郵件以重設密碼", "button": "傳送電子郵件" } } }, "signup": { "title": "註冊", - "you_will_be_the_super_admin": "你將成為「超級管理員」", - "already_ve_an_account": "已經有帳號了嗎？" + "you_will_be_the_super_admin": "您將是「超級管理員」", + "already_ve_an_account": "已經有帳號了？" }, "treeview": { "settings": { "title": "設定", "tooltip": "僅建立者可見" }, - "app_store": "應用商店", + "app_store": "應用程式商店", "team_n_auth": { "title": "團隊和認證", "tooltip": "角色和使用者管理" @@ -165,8 +165,12 @@ "title": "專案中繼資料", "tooltip": "中繼資料管理" }, - "preview_as": "預覽為", - "reset_review": "重置預覽" + "audit": { + "title": "稽核", + "tooltip": "稽核記錄" + }, + "preview_as": "預覽方式", + "reset_review": "重設預覽" }, "nav_drawer": { "title": "檢視表", @@ -180,35 +184,35 @@ "caption": "僅對建立者可見", "grid": { "title": "網格", - "create": "新增網格檢視表" + "create": "加入網格檢視表" }, "gallery": { "title": "圖庫", - "create": "新增圖庫檢視表" + "create": "加入圖庫檢視表" }, "calendar": { "title": "日曆", - "create": "新增日曆檢視表" + "create": "加入日曆檢視表" }, "kanban": { "title": "看板", - "create": "新增看板檢視表" + "create": "加入看板檢視表" }, "form": { "title": "表單", - "create": "新增表單檢視表" + "create": "加入表單檢視表" } }, "advanced": { "title1": "分享檢視表", - "views_list": "檢視列表", + "views_list": "檢視表清單", "copy_api_url": "複製 API 網址" }, "share_view": { "title": "此檢視表通過私人連結共享", - "body": "具有私有連結的人只能看到此檢視表中可見的欄位", + "body": "具有私有連結的人只能看到此檢視表中可見的儲存格", "toggle": { - "option1": "限制密碼存取權限", + "option1": "使用密碼限制存取權限", "option2": "存取受密碼限制" }, "password": { @@ -226,23 +230,23 @@ "meta": { "title": "中繼資料操作", "export_to_file": { - "title": "匯出至檔案", - "desc": "將所有中繼資料從中繼資料表匯出至目錄。" + "title": "匯出為檔案", + "desc": "將所有中繼資料從中繼資料表匯出至中繼目錄。" }, "import": { "title": "匯入", - "desc": "將所有中繼資料從目錄匯入中繼資料表。" + "desc": "將所有中繼資料從中繼目錄匯入至中繼資料表。" }, "export_to_zip": { - "title": "匯出 zip", - "desc": "將專案的中繼資料匯出成 zip 檔並下載。" + "title": "輸出 ZIP", + "desc": "將專案中繼資料匯出為 ZIP 檔案並下載。" }, "import_zip": { - "title": "匯入 zip", - "desc": "匯入專案的中繼資料 zip 檔案並重新啟動。" + "title": "匯入 ZIP", + "desc": "匯入專案中繼資料 ZIP 檔案並重新啟動。" }, "reset": { - "title": "重置", + "title": "重設", "desc": "清除中繼資料表中的所有中繼資料。" } } From dbec2c096ce3db5778ba92f4a2a03ee04db09e1b Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 05:25:59 +0000 Subject: [PATCH 08/20] docs: update README.md [skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a7d377fdf7..9f48fc428d 100644 --- a/README.md +++ b/README.md @@ -387,6 +387,7 @@ Our mission is to provide the most powerful no-code interface for databases whic
标
💻
诗人的咸鱼
💻
bitbytejoy
💻 +
pan93412
💻 From b306f3ac57554b44bd91ab1b80c697fac0d8247e Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 05:26:00 +0000 Subject: [PATCH 09/20] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9823fabc9f..ec1ac3214a 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -603,6 +603,15 @@ "contributions": [ "code" ] + }, + { + "login": "pan93412", + "name": "pan93412", + "avatar_url": "https://avatars.githubusercontent.com/u/28441561?v=4", + "profile": "http://blog.pan93.com", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, From 101d9fdcae442d0e52864d89a3405cdaac3784e3 Mon Sep 17 00:00:00 2001 From: Pranav C <61551451+pranavxc@users.noreply.github.com> Date: Wed, 26 Jan 2022 14:03:58 +0530 Subject: [PATCH 10/20] fix: save record on enter/shift-enter key press (#1003) closes #1002 Signed-off-by: Pranav C --- .../project/spreadsheet/components/editableCell.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue index 4aee3237a3..e0694ed377 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue @@ -5,8 +5,8 @@ @keydown.stop.right @keydown.stop.up @keydown.stop.down - @keydown.stop.enter.exact="changed=false,$emit('save'),$emit('navigateToNext')" - @keydown.stop.shift.enter.exact="changed=false,$emit('save'),$emit('navigateToPrev')" + @keydown.stop.enter.exact="$emit('save'),$emit('navigateToNext')" + @keydown.stop.shift.enter.exact="$emit('save'),$emit('navigateToPrev')" > Date: Wed, 26 Jan 2022 15:48:32 +0530 Subject: [PATCH 11/20] Hotfix/cell update (#1006) * fix: save record on enter/shift-enter key press closes #1002 Signed-off-by: Pranav C * fix: update cell value after claering cell using delete key closes #1005 Signed-off-by: Pranav C Co-authored-by: Wing-Kam Wong --- .../components/project/spreadsheet/views/xcGridView.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue b/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue index 85c07ba263..227018bb17 100644 --- a/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue +++ b/packages/nc-gui/components/project/spreadsheet/views/xcGridView.vue @@ -498,6 +498,8 @@ export default { } this.$set(rowObj, columnObj._cn, null) + // update/save cell value + this.onCellValueChange(this.selected.col, this.selected.row, columnObj) } break // left @@ -605,7 +607,7 @@ export default { if (this.selected.row > 0) { this.selected.row-- } - }, + }, addNewRelationTab(...args) { this.$emit('addNewRelationTab', ...args) }, From 3d355c235c3195959127d65b65ea83930f335b3a Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 26 Jan 2022 16:19:08 +0530 Subject: [PATCH 12/20] chore(publish): v0.84.8 Signed-off-by: Pranav C --- packages/nc-lib-gui/package.json | 2 +- packages/nocodb/package-lock.json | 18 +++++++++--------- packages/nocodb/package.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/nc-lib-gui/package.json b/packages/nc-lib-gui/package.json index b49e80f1c9..87257ea767 100644 --- a/packages/nc-lib-gui/package.json +++ b/packages/nc-lib-gui/package.json @@ -1,6 +1,6 @@ { "name": "nc-lib-gui", - "version": "0.84.7", + "version": "0.84.8", "description": "> TODO: description", "author": "“pranavxc” ", "homepage": "https://gitlab.com/xgenecloud-ts/xgenecloud-ts#readme", diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index b0aa2f4982..7387fd13ce 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -1,12 +1,12 @@ { "name": "nocodb", - "version": "0.84.6", + "version": "0.84.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nocodb", - "version": "0.84.6", + "version": "0.84.7", "license": "AGPL-3.0-or-later", "dependencies": { "@google-cloud/storage": "^5.7.2", @@ -67,7 +67,7 @@ "nanoid": "^3.1.20", "nc-common": "0.0.6", "nc-help": "^0.2.30", - "nc-lib-gui": "0.84.7", + "nc-lib-gui": "0.84.8", "nc-plugin": "^0.1.1", "ncp": "^2.0.0", "nodemailer": "^6.4.10", @@ -15943,9 +15943,9 @@ } }, "node_modules/nc-lib-gui": { - "version": "0.84.7", - "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.84.7.tgz", - "integrity": "sha512-ldUWySnI29nQ5bkDGI6Ru+lXwd/QJlQmHJp4RA/OX9cVZyyOpObvYCpu83MWXYmiaQBASvNsLKwNSooUeAmGng==", + "version": "0.84.8", + "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.84.8.tgz", + "integrity": "sha512-eaKH8oryxOv/gY/O57yE4THOtlU0NMFYlHskSBLlPUCjf1pQhYRE91jIt8bZtJl5N7IHWiQo3eeTbLPOkBxo9g==", "dependencies": { "axios": "^0.19.2", "body-parser": "^1.19.0", @@ -37219,9 +37219,9 @@ } }, "nc-lib-gui": { - "version": "0.84.7", - "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.84.7.tgz", - "integrity": "sha512-ldUWySnI29nQ5bkDGI6Ru+lXwd/QJlQmHJp4RA/OX9cVZyyOpObvYCpu83MWXYmiaQBASvNsLKwNSooUeAmGng==", + "version": "0.84.8", + "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.84.8.tgz", + "integrity": "sha512-eaKH8oryxOv/gY/O57yE4THOtlU0NMFYlHskSBLlPUCjf1pQhYRE91jIt8bZtJl5N7IHWiQo3eeTbLPOkBxo9g==", "requires": { "axios": "^0.19.2", "body-parser": "^1.19.0", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index fbd42c4b91..a3183cee42 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -1,6 +1,6 @@ { "name": "nocodb", - "version": "0.84.7", + "version": "0.84.8", "description": "NocoDB", "main": "dist/bundle.js", "repository": "https://github.com/nocodb/nocodb", @@ -148,7 +148,7 @@ "nanoid": "^3.1.20", "nc-common": "0.0.6", "nc-help": "^0.2.30", - "nc-lib-gui": "0.84.7", + "nc-lib-gui": "0.84.8", "nc-plugin": "^0.1.1", "ncp": "^2.0.0", "nodemailer": "^6.4.10", From 96409dea11466da28c4885c588c9bb056ca69440 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 10:50:22 +0000 Subject: [PATCH 13/20] chore(deps): Bump nanoid from 3.1.29 to 3.2.0 in /packages/noco-i18n Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.29 to 3.2.0. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.29...3.2.0) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/noco-i18n/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/noco-i18n/package-lock.json b/packages/noco-i18n/package-lock.json index 1d2cdce8f2..eec13984bc 100644 --- a/packages/noco-i18n/package-lock.json +++ b/packages/noco-i18n/package-lock.json @@ -7612,9 +7612,9 @@ "optional": true }, "nanoid": { - "version": "3.1.29", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.29.tgz", - "integrity": "sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==" }, "nanomatch": { "version": "1.2.13", From 834394473182d45e0d17dd3b1517f74da18570c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 10:50:40 +0000 Subject: [PATCH 14/20] chore(deps): Bump nanoid from 3.1.23 to 3.2.0 in /packages/noco-blog Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.2.0. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.2.0) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/noco-blog/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/noco-blog/package-lock.json b/packages/noco-blog/package-lock.json index aa3205a2c9..8af7c32115 100644 --- a/packages/noco-blog/package-lock.json +++ b/packages/noco-blog/package-lock.json @@ -7969,9 +7969,9 @@ "optional": true }, "nanoid": { - "version": "3.1.23", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz", - "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==" }, "nanomatch": { "version": "1.2.13", From 2b46a398e3a82134c74c6ca7428baf2dfb0732c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Jan 2022 09:40:17 +0000 Subject: [PATCH 15/20] chore(deps): Bump nanoid from 3.1.23 to 3.2.0 in /packages/noco-docs Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.2.0. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.2.0) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/noco-docs/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/noco-docs/package-lock.json b/packages/noco-docs/package-lock.json index fa88282af7..61c16c4753 100644 --- a/packages/noco-docs/package-lock.json +++ b/packages/noco-docs/package-lock.json @@ -7969,9 +7969,9 @@ "optional": true }, "nanoid": { - "version": "3.1.23", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz", - "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==" }, "nanomatch": { "version": "1.2.13", From cd0e464df161e072114391a08a4e6de16e1fb64d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Jan 2022 09:41:40 +0000 Subject: [PATCH 16/20] chore(deps): Bump node-fetch from 2.6.1 to 2.6.7 in /packages/nc-plugin Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/nc-plugin/package-lock.json | 33 ++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/packages/nc-plugin/package-lock.json b/packages/nc-plugin/package-lock.json index a5f8207106..96f17061b1 100644 --- a/packages/nc-plugin/package-lock.json +++ b/packages/nc-plugin/package-lock.json @@ -6415,10 +6415,13 @@ "dev": true }, "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", - "dev": true + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dev": true, + "requires": { + "whatwg-url": "^5.0.0" + } }, "node-preload": { "version": "0.2.1", @@ -8698,6 +8701,12 @@ "ieee754": "^1.2.1" } }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", + "dev": true + }, "trim-newlines": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz", @@ -9016,12 +9025,28 @@ "defaults": "^1.0.3" } }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", + "dev": true + }, "well-known-symbols": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz", "integrity": "sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==", "dev": true }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "dev": true, + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", From 6eae2bd376c44437208b2fd9d7289bbbd053e79d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Jan 2022 09:41:43 +0000 Subject: [PATCH 17/20] chore(deps): Bump node-fetch from 2.6.1 to 2.6.7 in /packages/nc-common Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- packages/nc-common/package-lock.json | 33 ++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/packages/nc-common/package-lock.json b/packages/nc-common/package-lock.json index 58ab48098b..fb0c9c1716 100644 --- a/packages/nc-common/package-lock.json +++ b/packages/nc-common/package-lock.json @@ -6694,10 +6694,13 @@ "dev": true }, "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", - "dev": true + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dev": true, + "requires": { + "whatwg-url": "^5.0.0" + } }, "node-preload": { "version": "0.2.1", @@ -9106,6 +9109,12 @@ "ieee754": "^1.2.1" } }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", + "dev": true + }, "trim-newlines": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.0.tgz", @@ -9412,12 +9421,28 @@ "defaults": "^1.0.3" } }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", + "dev": true + }, "well-known-symbols": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz", "integrity": "sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==", "dev": true }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "dev": true, + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", From db13307d9cdccda85459849ea4829cd2cda0f2ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 29 Jan 2022 10:18:34 +0000 Subject: [PATCH 18/20] chore(deps): Bump nanoid from 3.1.30 to 3.1.31 in /packages/nocodb Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.1.31. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.1.31) --- updated-dependencies: - dependency-name: nanoid dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- packages/nocodb/package-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index 7387fd13ce..fdcddc9944 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -1,12 +1,12 @@ { "name": "nocodb", - "version": "0.84.7", + "version": "0.84.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nocodb", - "version": "0.84.7", + "version": "0.84.8", "license": "AGPL-3.0-or-later", "dependencies": { "@google-cloud/storage": "^5.7.2", @@ -15799,9 +15799,9 @@ "optional": true }, "node_modules/nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", + "version": "3.1.31", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.31.tgz", + "integrity": "sha512-ZivnJm0o9bb13p2Ot5CpgC2rQdzB9Uxm/mFZweqm5eMViqOJe3PV6LU2E30SiLgheesmcPrjquqraoolONSA0A==", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -37108,9 +37108,9 @@ "optional": true }, "nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==" + "version": "3.1.31", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.31.tgz", + "integrity": "sha512-ZivnJm0o9bb13p2Ot5CpgC2rQdzB9Uxm/mFZweqm5eMViqOJe3PV6LU2E30SiLgheesmcPrjquqraoolONSA0A==" }, "nanomatch": { "version": "1.2.13", From 3318070f7790f45a218d3f16c74a987ba36cd0eb Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 31 Jan 2022 11:04:43 +0800 Subject: [PATCH 19/20] docs: keep development setup in english readme --- README.md | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f8b0c21794..2d1b076ac0 100644 --- a/README.md +++ b/README.md @@ -233,7 +233,58 @@ Please refer to [Environment variables](https://docs.nocodb.com/getting-started/ # Development Setup -Please refer to [Development Setup](https://github.com/nocodb/nocodb/tree/master#development-setup) +## Cloning the Project + +```shell +git clone https://github.com/nocodb/nocodb +cd nocodb +``` + +## Running Backend locally + +```shell +cd packages/nocodb +npm install +npm run watch:run +# open localhost:8080/dashboard in browser +``` + +## Running Frontend locally + +```shell +cd packages/nc-gui +npm install +npm run dev +# open localhost:3000/dashboard in browser +``` + +Changes made to code automatically restart. + +> nocodb/packages/nocodb includes nc-lib-gui which is the built version of nc-gui hosted in npm registry. You can visit localhost:8000/dashboard in browser after starting the backend locally if you just want to modify the backend only. + + +## Running Cypress tests locally + +```shell +# install dependencies(cypress) +npm install + +# run mysql database with required database using docker compose +docker-compose -f ./scripts/docker-compose-cypress.yml up + +# Run backend api using following command +npm run start:api + +# Run frontend web UI using following command +npm run start:web + +# wait until both 3000 and 8080 ports are available +# and run cypress test using following command +npm run cypress:run + +# or run following command to run it with GUI +npm run cypress:open +``` # Contributing From 0368d65867dae0dc670476fe5b4be88164d5689c Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 31 Jan 2022 13:25:16 +0800 Subject: [PATCH 20/20] fix: Update table failed - renaming column and changing field length issue Signed-off-by: Wing-Kam Wong --- packages/nocodb/package-lock.json | 14 +++++++------- packages/nocodb/package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/nocodb/package-lock.json b/packages/nocodb/package-lock.json index fdcddc9944..a5c310665e 100644 --- a/packages/nocodb/package-lock.json +++ b/packages/nocodb/package-lock.json @@ -66,7 +66,7 @@ "mysql2": "^2.2.5", "nanoid": "^3.1.20", "nc-common": "0.0.6", - "nc-help": "^0.2.30", + "nc-help": "^0.2.31", "nc-lib-gui": "0.84.8", "nc-plugin": "^0.1.1", "ncp": "^2.0.0", @@ -15850,9 +15850,9 @@ } }, "node_modules/nc-help": { - "version": "0.2.30", - "resolved": "https://registry.npmjs.org/nc-help/-/nc-help-0.2.30.tgz", - "integrity": "sha512-mCyqkDuCr9TsyWuHPgPDCjyxSAsh7QveXFMZuxJyjxeRTa+YVt5H+BbAb053xLYz5yk++0+EwPCd2Bf4jDU7BQ==", + "version": "0.2.31", + "resolved": "https://registry.npmjs.org/nc-help/-/nc-help-0.2.31.tgz", + "integrity": "sha512-To8vPGKb3PlpAkr0wrx2891GzhjxFhrlgyujf34DM08VUjAqfJjeEBpt/mN2qhR3KQnHocfpF3NIXubMcVN8sA==", "dependencies": { "axios": "^0.21.1", "boxen": "^4.2.0", @@ -37147,9 +37147,9 @@ "integrity": "sha512-3AryS9uwa5NfISLxMciUonrH7YfXp+nlahB9T7girXIsLQrmwX4MdnuKs32akduCOGpKmjTJSWmATULbuMkbfw==" }, "nc-help": { - "version": "0.2.30", - "resolved": "https://registry.npmjs.org/nc-help/-/nc-help-0.2.30.tgz", - "integrity": "sha512-mCyqkDuCr9TsyWuHPgPDCjyxSAsh7QveXFMZuxJyjxeRTa+YVt5H+BbAb053xLYz5yk++0+EwPCd2Bf4jDU7BQ==", + "version": "0.2.31", + "resolved": "https://registry.npmjs.org/nc-help/-/nc-help-0.2.31.tgz", + "integrity": "sha512-To8vPGKb3PlpAkr0wrx2891GzhjxFhrlgyujf34DM08VUjAqfJjeEBpt/mN2qhR3KQnHocfpF3NIXubMcVN8sA==", "requires": { "axios": "^0.21.1", "boxen": "^4.2.0", diff --git a/packages/nocodb/package.json b/packages/nocodb/package.json index a3183cee42..cd4ec8657d 100644 --- a/packages/nocodb/package.json +++ b/packages/nocodb/package.json @@ -147,7 +147,7 @@ "mysql2": "^2.2.5", "nanoid": "^3.1.20", "nc-common": "0.0.6", - "nc-help": "^0.2.30", + "nc-help": "^0.2.31", "nc-lib-gui": "0.84.8", "nc-plugin": "^0.1.1", "ncp": "^2.0.0",