mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 17:36:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,786 Commits 93 Branches 321 Tags 223 MiB
459fbb6cd7
Commit Graph

5786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GitHub Actions Bot
459fbb6cd7 Merge branch 'main' into next 2024-08-28 04:07:07 +00:00
Zeke Zhang
67d2f85a99
fix(defaultValue): ignores variable values that do not match the current field (#5122) 
* refactor(variable): refactor parseVariable to support return more context

* fix(defaultValue): ignore no matching value

* fix: make unit tests pass

* chore: fix unit test
 2024-08-28 11:53:52 +08:00
GitHub Actions Bot
a53e8fd89b Merge branch 'main' into next 2024-08-28 03:15:11 +00:00
dependabot[bot]
77281af61d
chore(deps-dev): bump eslint-plugin-jest-dom from 5.1.0 to 5.4.0 (#5138) 
Bumps [eslint-plugin-jest-dom](https://github.com/testing-library/eslint-plugin-jest-dom) from 5.1.0 to 5.4.0.
- [Release notes](https://github.com/testing-library/eslint-plugin-jest-dom/releases)
- [Commits](https://github.com/testing-library/eslint-plugin-jest-dom/compare/v5.1.0...v5.4.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-jest-dom
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-08-28 11:14:35 +08:00
Zeke Zhang
3f461ad8f0 Revert "chore(deps): bump @ant-design/pro-layout from 7.17.16 to 7.19.12 (#5137)" 
This reverts commit f4b7a8d58b.
 2024-08-28 11:08:30 +08:00
GitHub Actions Bot
7725745922 Merge branch 'main' into next 2024-08-28 03:08:03 +00:00
dependabot[bot]
f4b7a8d58b
chore(deps): bump @ant-design/pro-layout from 7.17.16 to 7.19.12 (#5137) 
Bumps [@ant-design/pro-layout](https://github.com/ant-design/pro-components) from 7.17.16 to 7.19.12.
- [Release notes](https://github.com/ant-design/pro-components/releases)
- [Changelog](https://github.com/ant-design/pro-components/blob/master/docs/changelog.md)
- [Commits](https://github.com/ant-design/pro-components/compare/@ant-design/pro-layout@7.17.16...@ant-design/pro-layout@7.19.12)

---
updated-dependencies:
- dependency-name: "@ant-design/pro-layout"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-08-28 11:07:45 +08:00
GitHub Actions Bot
1b9bc53754 Merge branch 'main' into next 2024-08-28 02:52:23 +00:00
Zeke Zhang
af77f3c408
fix(template): fix error on form block submission (#5133) 
* fix(template): fix error on form block submission

* fix(template): fix error on form block submission

* fix: make unit tests pass

* fix: make e2e tests pass
 2024-08-28 10:52:06 +08:00
GitHub Actions Bot
30420a0ff2 Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / app-token (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Blocked by required conditions
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
2024-08-27 13:59:12 +00:00
Zeke Zhang
dec3c838a3
feat: add support for opening via URL (#5098)
Some checks are pending
auto-merge / push-commit (push) Waiting to run
Details
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / app-token (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Blocked by required conditions
Details
deploy client docs / Build (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
Test on Windows / build (push) Waiting to run
Details 
* feat(map): add support for opening via URL

* feat(calendar): add support for opening via URL

* feat(gantt): add support for opening via URL

* fix(duplicate,bulk-edit): resolve issues with popups

* fix: useDetailsBlockProps

---------

Co-authored-by: katherinehhh <katherine_15995@163.com>
 2024-08-27 21:58:55 +08:00
GitHub Actions Bot
db2a8103c1 Merge branch 'main' into next 2024-08-27 11:50:18 +00:00
YANG QIA
ce3d6ac233
fix(release): decrypt token error occasionally (#5143) 
* fix(release): decrypt token error occasionally

* chore: update
 2024-08-27 19:50:01 +08:00
nocobase[bot]
9e73e83698 Merge branch 'main' into next 2024-08-27 10:28:08 +00:00
nocobase[bot]
b315174c21 chore: update changelog 2024-08-27 10:28:00 +00:00
nocobase[bot]
a0117480e0 chore(versions): 😊 publish v1.3.4-beta 2024-08-27 10:27:55 +00:00
GitHub Actions Bot
562526c29d Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / app-token (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Blocked by required conditions
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
2024-08-27 06:54:20 +00:00
Katherine
2eaa0b8081
refactor: set remainsTheSame as the default value for field editing in bulk editing action (#5124)
Some checks are pending
auto-merge / push-commit (push) Waiting to run
Details
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / app-token (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Blocked by required conditions
Details
deploy client docs / Build (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details 
* refactor: bulk edit set remainsTheSame as default value

* fix: test
 2024-08-27 14:54:02 +08:00
nocobase[bot]
ec3dc60910 Merge branch 'main' into next
Some checks failed
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / app-token (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Blocked by required conditions
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
NocoBase Backend Test / sqlite-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / sqlite-test (20, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
Details
NocoBase Backend Test / mysql-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / mysql-test (20, true) (push) Has been cancelled
Details
NocoBase Backend Test / mariadb-test (20, false) (push) Has been cancelled
Details
NocoBase Backend Test / mariadb-test (20, true) (push) Has been cancelled
Details
Test on Windows / build (push) Has been cancelled
Details
2024-08-27 00:37:55 +00:00
nocobase[bot]
3403e8d766 chore: update changelog
Some checks are pending
auto-merge / push-commit (push) Waiting to run
Details
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / app-token (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Blocked by required conditions
Details
deploy client docs / Build (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
Test on Windows / build (push) Waiting to run
Details
2024-08-27 00:37:47 +00:00
nocobase[bot]
9dffefb90a chore(versions): 😊 publish v1.3.3-beta 2024-08-27 00:37:42 +00:00
GitHub Actions Bot
60c03d3d44 Merge branch 'main' into next 2024-08-27 00:32:00 +00:00
xilesun
5a41ab063c fix(release): remove continue-on-error for build step 2024-08-27 08:25:43 +08:00
GitHub Actions Bot
5e8a735136 Merge branch 'main' into next 2024-08-26 23:19:54 +00:00
chenos
1de0ce5e1a
fix: use the built-in logo file (#5032) 
* fix: logo url

* fix: logo with internal url

* fix: tz

* fix: improve code

* fix: tz

* fix: tz

* fix: test case

* fix: tz
 2024-08-27 07:15:54 +08:00
GitHub Actions Bot
24b4c7047f Merge branch 'main' into next 2024-08-26 22:46:43 +00:00
YANG QIA
685f0764f1
chore: optimize pro image build ci (#5140) 
* chore: optimize pro image build ci

* chore: update

* chore: update

* fix: branch
 2024-08-27 06:46:25 +08:00
Zhi Chen
2c757c43c5
feat: user data sync plugin (#4986) 
* feat: user data sync plugin

* fix: nickname bug

* feat: adjust sync

* fix: delete package-lock.json

* feat: adjust push

* feat: adjust user-data-sync plugin

* fix: delete submodule

* fix: sync bug

* fix: adjust log

* fix: adjust log

* chore: add to build-in

* chore: update version

* chore: add api doc

* chore: add plugin description

* chore: api doc

* chore: change keywords

* feat: add no source type prompt

* chore: text to json

* feat: optimize resource manager

* fix: test & typo

* test: add tests for resource manager & fix bug

* fix: user sync

* chore: remove department resource

* fix: test

* fix: build

* fix: push data

* fix: push api add default sourceName

* test: add api test

* fix: uniqueKey support any

* chore: single user belongs to multi department situation

* chore: department

* fix: fix sync bugs

* fix: sync departments

* chore: remove department logic

* chore: remove department

* fix: fix logger type error

* fix: fix sync bug

* fix: logger & role

* fix: fix sync bugs

* fix: fix sync bug

* fix: fix sync bugs

* test: update test cases

* chore: update

* chore: update

* fix: test

* fix: test

* fix: test

* fix: bugs

* fix: version

---------

Co-authored-by: chenzhi <chenzhi@zhuopaikeji.com>
Co-authored-by: xilesun <2013xile@gmail.com>
 2024-08-27 05:25:30 +08:00
nocobase[bot]
c552402480 Merge branch 'main' into next 2024-08-26 20:58:37 +00:00
nocobase[bot]
7c28f4d066 chore: update changelog 2024-08-26 20:58:31 +00:00
nocobase[bot]
dcadaa6665 chore(versions): 😊 publish v1.3.2-beta 2024-08-26 20:58:26 +00:00
GitHub Actions Bot
7851a76e8f Merge branch 'main' into next 2024-08-26 20:56:54 +00:00
xilesun
6987d46b3e chore(release): optimize release workflow 2024-08-27 04:56:27 +08:00
nocobase[bot]
7774088938 Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
Test on Windows / build (push) Waiting to run
Details
2024-08-26 16:26:01 +00:00
xilesun
dd247edba2 fix(release): job dependency
Some checks are pending
auto-merge / push-commit (push) Waiting to run
Details
Build Docker Image / build-and-push (push) Waiting to run
Details
Build Pro Image / build-and-push (push) Waiting to run
Details
deploy client docs / Build (push) Waiting to run
Details
E2E / Build (push) Waiting to run
Details
E2E / Core and plugins (push) Blocked by required conditions
Details
E2E / plugin-workflow (push) Blocked by required conditions
Details
E2E / plugin-workflow-approval (push) Blocked by required conditions
Details
E2E / plugin-data-source-main (push) Blocked by required conditions
Details
E2E / Comment on PR (push) Blocked by required conditions
Details
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
Details
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
Details
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
Details
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Details
Test on Windows / build (push) Waiting to run
Details
2024-08-27 00:18:43 +08:00
nocobase[bot]
388b0e2a88 chore: update changelog 2024-08-26 16:07:28 +00:00
nocobase[bot]
4aff92ad3b chore(versions): 😊 publish v1.3.1-beta 2024-08-26 16:07:23 +00:00
GitHub Actions Bot
e20588eea0 Merge branch 'main' into next 2024-08-26 15:48:42 +00:00
xilesun
90967c77de fix(release): token 2024-08-26 23:48:14 +08:00
GitHub Actions Bot
c3faf7f238 Merge branch 'main' into next 2024-08-26 15:41:07 +00:00
YANG QIA
c069fbebd4
feat(publish): publish pro repos (#5129) 
* feat(publish): publish pro repos

* feat: use app token

* chore: add trigger branch

* chore: ref main

* chore: add owner

* chore: change owner

* chore: set repos

* chore: get repo name

* chore: update

* chore: update

* chore: update

* chore: update

* chore: update branch

* fix: bug

* fix: bug

* fix: private key

* feat: encrypt github app token

* fix: bug

* fix: token

* fix: output

* fix: base64

* fix: error

* fix: token cut

* fix: base64

* fix: repo name

* chore: print token

* chore: skip token revoke

* fix: clone

* fix: clone

* fix: job

* chore: shell bash

* fix: ignore

* fix: ignore

* fix: invalid

* fix: branch

* fix: bug

* fix: jq

* fix: jq

* fix: jq

* fix: remove quotes

* fix: directory

* fix: directory

* chore: update

* chore: update

* fix: invalid

* fix: branch
 2024-08-26 23:40:48 +08:00
GitHub Actions Bot
998f411122 Merge branch 'main' into next 2024-08-26 11:20:14 +00:00
chenos
97096f8a6a fix: test env file 2024-08-26 19:18:05 +08:00
GitHub Actions Bot
f5226596bc Merge branch 'main' into next 2024-08-26 10:45:43 +00:00
chenos
c4b819528a fix: missing schema 2024-08-26 18:42:59 +08:00
GitHub Actions Bot
7327aa347b Merge branch 'main' into next 2024-08-26 10:06:21 +00:00
chenos
1a85719657
fix(tree): missing collection schema (#5131) 2024-08-26 17:49:32 +08:00
GitHub Actions Bot
22ad2b4a91 Merge branch 'main' into next 2024-08-26 07:51:36 +00:00
chenos
da966813ee
fix(cli): support upgrade to next (#5130) 2024-08-26 15:51:12 +08:00
GitHub Actions Bot
12f76aed2c Merge branch 'main' into next 2024-08-26 07:43:43 +00:00