github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'develop' into enhancement/hm-mm-cells

pull/5724/head
Wing-Kam Wong 2 years ago
parent
fe638daabd 0b0257cbb8
commit
74c220a869
8 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      packages/nc-gui/lang/ru.json
  2. 2
      packages/nc-gui/package-lock.json
  3. 2
      packages/nc-lib-gui/package.json
  4. 4
      packages/nocodb-sdk/package-lock.json
  5. 2
      packages/nocodb-sdk/package.json
  6. 20
      packages/nocodb/package-lock.json
  7. 4
      packages/nocodb/package.json

2
packages/nc-gui/lang/ru.json
Unescape View File

@ -354,7 +354,7 @@
"account": { "account": {
"authToken": "Скопировать токен авторизации", "authToken": "Скопировать токен авторизации",
"swagger": "Swagger: REST APIs", "swagger": "Swagger: REST APIs",
"projInfo": "Скопировать информацию о проекте", "projInfo": "Информация о проекте",
"themes": "Темы" "themes": "Темы"
}, },
"sort": "Сортировать", "sort": "Сортировать",

2
packages/nc-gui/package-lock.json generated
Unescape View File

@ -110,7 +110,7 @@
} }
}, },
"../nocodb-sdk": { "../nocodb-sdk": {
"version": "0.107.5", "version": "0.108.0-beta.0",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"axios": "^0.21.1", "axios": "^0.21.1",

2
packages/nc-lib-gui/package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "nc-lib-gui", "name": "nc-lib-gui",
"version": "0.107.5", "version": "0.108.0-beta.0",
"description": "NocoDB GUI", "description": "NocoDB GUI",
"author": { "author": {
"name": "NocoDB", "name": "NocoDB",

4
packages/nocodb-sdk/package-lock.json generated
Unescape View File

@ -1,12 +1,12 @@
{ {
"name": "nocodb-sdk", "name": "nocodb-sdk",
"version": "0.107.5", "version": "0.108.0-beta.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "nocodb-sdk", "name": "nocodb-sdk",
"version": "0.107.5", "version": "0.108.0-beta.0",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"axios": "^0.21.1", "axios": "^0.21.1",

2
packages/nocodb-sdk/package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "nocodb-sdk", "name": "nocodb-sdk",
"version": "0.107.5", "version": "0.108.0-beta.0",
"description": "NocoDB SDK", "description": "NocoDB SDK",
"main": "build/main/index.js", "main": "build/main/index.js",
"typings": "build/main/index.d.ts", "typings": "build/main/index.d.ts",

20
packages/nocodb/package-lock.json generated
Unescape View File

@ -1,12 +1,12 @@
{ {
"name": "nocodb", "name": "nocodb",
"version": "0.107.5", "version": "0.108.0-beta.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "nocodb", "name": "nocodb",
"version": "0.107.5", "version": "0.108.0-beta.0",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@google-cloud/storage": "^5.7.2", "@google-cloud/storage": "^5.7.2",
@ -80,7 +80,7 @@
"mysql2": "^3.2.0", "mysql2": "^3.2.0",
"nanoid": "^3.1.20", "nanoid": "^3.1.20",
"nc-help": "^0.2.87", "nc-help": "^0.2.87",
"nc-lib-gui": "0.107.5", "nc-lib-gui": "0.108.0-beta.0",
"nc-plugin": "^0.1.3", "nc-plugin": "^0.1.3",
"ncp": "^2.0.0", "ncp": "^2.0.0",
"nocodb-sdk": "file:../nocodb-sdk", "nocodb-sdk": "file:../nocodb-sdk",
@ -190,7 +190,7 @@
} }
}, },
"../nocodb-sdk": { "../nocodb-sdk": {
"version": "0.107.5", "version": "0.108.0-beta.0",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"dependencies": { "dependencies": {
"axios": "^0.21.1", "axios": "^0.21.1",
@ -13157,9 +13157,9 @@
} }
}, },
"node_modules/nc-lib-gui": { "node_modules/nc-lib-gui": {
"version": "0.107.5", "version": "0.108.0-beta.0",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.107.5.tgz", "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.108.0-beta.0.tgz",
"integrity": "sha512-bFmKo6qDmrHY7a3itHMnp1A8qFecHyNKZABWK4GIdA8xCeSx6rLL8LGzxDRsD3fIXFwTCzSd8iPJECHaF5fcFg==", "integrity": "sha512-y6WWH11Jj8Di8bK7bupLhPrZAHJ69ut5vV7i26fG0346J7A6SLrCaUcc/SGcJwJoeSwEwER3gzq2RXuWkGt1vA==",
"dependencies": { "dependencies": {
"express": "^4.17.1" "express": "^4.17.1"
} }
@ -28442,9 +28442,9 @@
} }
}, },
"nc-lib-gui": { "nc-lib-gui": {
"version": "0.107.5", "version": "0.108.0-beta.0",
"resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.107.5.tgz", "resolved": "https://registry.npmjs.org/nc-lib-gui/-/nc-lib-gui-0.108.0-beta.0.tgz",
"integrity": "sha512-bFmKo6qDmrHY7a3itHMnp1A8qFecHyNKZABWK4GIdA8xCeSx6rLL8LGzxDRsD3fIXFwTCzSd8iPJECHaF5fcFg==", "integrity": "sha512-y6WWH11Jj8Di8bK7bupLhPrZAHJ69ut5vV7i26fG0346J7A6SLrCaUcc/SGcJwJoeSwEwER3gzq2RXuWkGt1vA==",
"requires": { "requires": {
"express": "^4.17.1" "express": "^4.17.1"
} }

4
packages/nocodb/package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "nocodb", "name": "nocodb",
"version": "0.107.5", "version": "0.108.0-beta.0",
"description": "NocoDB Backend", "description": "NocoDB Backend",
"main": "dist/bundle.js", "main": "dist/bundle.js",
"author": { "author": {
@ -113,7 +113,7 @@
"mysql2": "^3.2.0", "mysql2": "^3.2.0",
"nanoid": "^3.1.20", "nanoid": "^3.1.20",
"nc-help": "^0.2.87", "nc-help": "^0.2.87",
"nc-lib-gui": "0.107.5", "nc-lib-gui": "0.108.0-beta.0",
"nc-plugin": "^0.1.3", "nc-plugin": "^0.1.3",
"ncp": "^2.0.0", "ncp": "^2.0.0",
"nocodb-sdk": "file:../nocodb-sdk", "nocodb-sdk": "file:../nocodb-sdk",

Write Preview
Loading…
Cancel
Save