diff --git a/.all-contributorsrc b/.all-contributorsrc index bfbb10622a..57dcbecf6b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -729,6 +729,33 @@ "contributions": [ "code" ] + }, + { + "login": "iamnamananand996", + "name": "Naman Anand", + "avatar_url": "https://avatars.githubusercontent.com/u/31537362?v=4", + "profile": "https://github.com/iamnamananand996", + "contributions": [ + "code" + ] + }, + { + "login": "GeoffMaciolek", + "name": "Geo Maciolek", + "avatar_url": "https://avatars.githubusercontent.com/u/10995633?v=4", + "profile": "https://github.com/GeoffMaciolek", + "contributions": [ + "code" + ] + }, + { + "login": "mudream4869", + "name": "神楽坂帕琪", + "avatar_url": "https://avatars.githubusercontent.com/u/6008539?v=4", + "profile": "http://blog.mukyu.tw/", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index ce8c3e689d..88af4f801d 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -4,14 +4,14 @@ name: "CI/CD" on: push: - branches: [master, develop, cypress] + branches: [develop, cypress] paths: - "packages/nc-gui/**" - "scripts/cypress/**" - "packages/nocodb/**" - ".github/workflows/ci-cd.yml" pull_request: - branches: [master, develop] + branches: [develop] paths: - "packages/nc-gui/**" - "scripts/cypress/**" diff --git a/.github/workflows/sync-to-develop.yml b/.github/workflows/sync-to-develop.yml index e3c327f3ae..28a770b963 100644 --- a/.github/workflows/sync-to-develop.yml +++ b/.github/workflows/sync-to-develop.yml @@ -9,16 +9,11 @@ jobs: sync-to-develop: runs-on: ubuntu-latest steps: - # See https://github.com/actions/checkout/issues/766 - - name: Workaround for unsafe repository issue - run: | - git config --global --add safe.directory ${GITHUB_WORKSPACE} - - name: Checkout uses: actions/checkout@v1 - name: Merge from master to develop - uses: robotology/gh-action-nightly-merge@v1.3.1 + uses: wingkwong/gh-action-nightly-merge@master with: stable_branch: 'master' development_branch: 'develop' diff --git a/README.md b/README.md index 5416a2244d..a2b6d01ddc 100644 --- a/README.md +++ b/README.md @@ -442,6 +442,9 @@ Our mission is to provide the most powerful no-code interface for databases whic
- {{ $t('msg.info.userInviteNoSMTP') }} - - - - {{ invite_token && (invite_token.email || invite_token.emails && invite_token.emails.join(', ')) }}. + +
{{ $t('msg.info.userInviteNoSMTP') }} {{ invite_token && (invite_token.email || invite_token.emails && invite_token.emails.join(', ')) }}.
@@ -215,9 +223,7 @@ | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
- |
|
- |
||||||||||||
- |
- |
|
- |
- {{ $t('labels.syncState') }} + {{ $t("labels.syncState") }} | @@ -76,7 +76,12 @@ | |||||||||
{{ model.detectedChanges.map(m => m.msg).join(', ') }} - {{ + model.detectedChanges.map((m) => m.msg).join(", ") + }} + - {{ $t('msg.info.metaNoChange') }} + {{ $t("msg.info.metaNoChange") }} - + | ||||||||||||||
- {{ $t('labels.tableName') }} + {{ $t("labels.tableName") }} | - {{ $t('labels.viewName') }} + {{ $t("labels.viewName") }} | -+ | {{ role.charAt(0).toUpperCase() + role.slice(1) }} | |||||||||||
|
- |
- + |
+
+ |
|
||||||||||
- {{ $t('msg.info.importZip') }} + {{ $t("msg.info.importZip") }} |
|
@@ -25,7 +29,7 @@
|
|
- {{ $t('general.title') }}
+ {{ $t("general.title") }}
|
- {{ $t('general.event') }}
+ {{ $t("general.event") }}
|
- {{ $t('general.condition') }}
+ {{ $t("general.condition") }}
|
- {{ $t('labels.notifyVia') }}
+ {{ $t("labels.notifyVia") }}
|
- {{ $t('labels.action') }}
+ {{ $t("labels.action") }}
|
| |||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -136,12 +122,18 @@
mdi-check-bold
- {{ item.notification && item.notification.type }} |
- |
+
+ |
@@ -151,17 +143,15 @@
|
||||||||||
- {{ $t('labels.columnName') }} + {{ $t("labels.columnName") }} | - {{ $t('labels.columnType') }} + {{ $t("labels.columnType") }} | - - + + | ||||||||||||
-
+
+
{{ col.column_name }}
|
|
-
+ |
{{ col.rtn }}
-
+
{{ col.rtn && col.rtn.table_name }}
- ({{ col.rcn }})
+
+ ({{ col.rcn }})
-
+
{{ col.rtn && col.rtn.table_name }}
- ({{ col.fn }})
+
+ ({{ col.fn }})
|
|
|
-
+
|
-
+
{{ col.rcn }}
@@ -310,17 +417,27 @@
dense
class="caption"
hide-details="auto"
- :rules="[v => !!v || 'Related column name required']"
- :items="(project.tables.find(t => t.table_name === (col.rtn && col.rtn.table_name || col.rtn)) || {columns:[]}).columns.filter(v=> !isVirtual(v))"
+ :rules="[
+ (v) =>
+ !!v || 'Related column name required',
+ ]"
+ :items="
+ (
+ project.tables.find(
+ (t) =>
+ t.table_name ===
+ ((col.rtn &&
+ col.rtn.table_name) ||
+ col.rtn)
+ ) || { columns: [] }
+ ).columns.filter((v) => !isVirtual(v))
+ "
item-text="column_name"
item-value="column_name"
/>
|
-
+
{{ col.fn }}
@@ -332,19 +449,18 @@
dense
class="caption"
hide-details="auto"
- :rules="[v => !!v || 'Rollup aggregate function name required']"
+ :rules="[
+ (v) =>
+ !!v ||
+ 'Rollup aggregate function name required',
+ ]"
:items="rollupFnList"
/>
|
-
+
-
+
{{ col.dtxp }}
|
- |
+ |
| | |
@@ -215,30 +188,30 @@
indeterminate
/>
-
- {{
- props.item.title
- }}
+ {{ props.item.title }}
|
- + |
|