10000 Sync master with develop branch by pranavxc · Pull Request #7909 · nocodb/nocodb · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Sync master with develop branch #7909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 19, 2024
Merged

Sync master with develop branch #7909

merged 10 commits into from
Mar 19, 2024

Conversation

pranavxc
Copy link
Member

Change Summary

Provide summary of changes with issue number if any.

Change type

  • feat: (new feature for the user, not a new feature for build script)
  • fix: (bug fix for the user, not a fix to a build script)
  • docs: (changes to the documentation)
  • style: (formatting, missing semi colons, etc; no production code change)
  • refactor: (refactoring production code, eg. renaming a variable)
  • test: (adding missing tests, refactoring tests; no production code change)
  • chore: (updating grunt tasks etc; no production code change)

Test/ Verification

Provide summary of changes.

Additional information / screenshots (optional)

Anything for maintainers to be made aware of

github-actions bot and others added 10 commits March 14, 2024 09:05
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Pranav C <pranavxc@gmail.com>
chore: downgrade sqlite version for executable
Signed-off-by: GitHub <noreply@github.com>
# Conflicts:
#	packages/nc-lib-gui/package.json
#	packages/nocodb-sdk/package.json
#	packages/nocodb/package.json
#	pnpm-lock.yaml
Signed-off-by: Pranav C <pranavxc@gmail.com>
@dstala dstala merged commit 7ba5724 into develop Mar 19, 2024
@dstala dstala deleted the sync-master branch March 19, 2024 14:39
pranavxc added a commit that referenced this pull request Mar 19, 2024
* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* chore: downgrade sqlite version for executable

Signed-off-by: Pranav C <pranavxc@gmail.com>

* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* chore: update sdk path

Signed-off-by: Pranav C <pranavxc@gmail.com>

---------

Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Pranav C <pranavxc@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: pranavxc <pranavxc@users.noreply.github.com>
dstala pushed a commit that referenced this pull request Mar 20, 2024
* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* chore: downgrade sqlite version for executable

Signed-off-by: Pranav C <pranavxc@gmail.com>

* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* Sync master with develop branch (#7909)

* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* chore: downgrade sqlite version for executable

Signed-off-by: Pranav C <pranavxc@gmail.com>

* [create-pull-request] automated change

Signed-off-by: GitHub <noreply@github.com>

* chore: update sdk path

Signed-off-by: Pranav C <pranavxc@gmail.com>

---------

Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Pranav C <pranavxc@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: pranavxc <pranavxc@users.noreply.github.com>

* chore: update sdk path

Signed-off-by: Pranav C <pranavxc@gmail.com>

* chore: update sdk path

Signed-off-by: Pranav C <pranavxc@gmail.com>

---------

Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Pranav C <pranavxc@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: pranavxc <pranavxc@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0