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
Robin Fourcade

💻
zprial

💻
Nils Reichardt

💻 +
Naman Anand

💻 +
Geo Maciolek

💻 +
神楽坂帕琪

💻 diff --git a/packages/nc-gui/assets/style/style.css b/packages/nc-gui/assets/style/style.css index cdf119f2e5..b3fa43aa70 100644 --- a/packages/nc-gui/assets/style/style.css +++ b/packages/nc-gui/assets/style/style.css @@ -362,3 +362,10 @@ html { .cursor-pointer{ cursor: pointer; } + + +/* sorting and filter */ +.menu-filter-dropdown { + max-height: 500px; + overflow-y: auto; +} \ No newline at end of file diff --git a/packages/nc-gui/components/ProjectTreeView.vue b/packages/nc-gui/components/ProjectTreeView.vue index 118e339d3f..f77494d607 100644 --- a/packages/nc-gui/components/ProjectTreeView.vue +++ b/packages/nc-gui/components/ProjectTreeView.vue @@ -1,13 +1,21 @@ - +