Commit Graph

5961 Commits

Author SHA1 Message Date
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
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Test on Windows / build (push) Waiting to run
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
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
deploy client docs / Build (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Test on Windows / build (push) Waiting to run
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
Junyi
eaf23766c7
fix(client): fix field names of variable input (#5128) 2024-08-26 15:43:26 +08:00
GitHub Actions Bot
d23a11e076 Merge branch 'main' into next 2024-08-26 07:40:44 +00:00
chenos
ffcc60cadf
fix: cannot access 'ActionPage' before initialization (#5125) 2024-08-26 15:40:22 +08:00
GitHub Actions Bot
4c1a480136 Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Test on Windows / build (push) Waiting to run
2024-08-25 17:42:05 +00:00
chenos
7ff13ff39e chore: update Dockerfile
Some checks are pending
auto-merge / push-commit (push) Waiting to run
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
deploy client docs / Build (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Test on Windows / build (push) Waiting to run
2024-08-26 01:41:31 +08:00
GitHub Actions Bot
df3354d9c2 Merge branch 'main' into next 2024-08-25 17:15:54 +00:00
chenos
f9526e644a chore: update Dockerfile 2024-08-26 01:15:24 +08:00
GitHub Actions Bot
5aa76d1039 Merge branch 'main' into next 2024-08-25 16:52:04 +00:00
chenos
74271a9d7c chore: update package.json 2024-08-26 00:51:37 +08:00
chenos
29433aa441 feat: 1.4.0-alpha 2024-08-26 00:16:25 +08:00
GitHub Actions Bot
4515f0220f chore: update changelog 2024-08-25 16:12:19 +00:00
GitHub Actions Bot
dea6a58878 chore(versions): 😊 publish v1.3.0-beta 2024-08-25 16:12:14 +00:00
chenos
a461e6fb1a fix: release ci 2024-08-26 00:10:29 +08:00
GitHub Actions Bot
9250cf2b30 Merge branch 'main' into next
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
2024-08-25 14:09:10 +00:00
GitHub Actions Bot
c2d5be679c chore: update changelog
Some checks are pending
auto-merge / push-commit (push) Waiting to run
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
deploy client docs / Build (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
Test on Windows / build (push) Waiting to run
2024-08-25 14:09:06 +00:00
GitHub Actions Bot
9e3075218a chore(versions): 😊 publish v1.2.39-alpha 2024-08-25 14:09:00 +00:00
chenos
c940da4527 fix: release ci 2024-08-25 22:07:44 +08:00
GitHub Actions Bot
1eb87946c3 Merge branch 'main' into next 2024-08-25 13:49:48 +00:00
chenos
6e10a84625
fix: the time zone defaults to the system time zone (#5121)
* fix: set time zone automatically

* fix: getTimezonesByOffset
2024-08-25 21:49:31 +08:00
xilesun
a60c36bcca fix(tree): migration version
Some checks are pending
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase Backend Test / sqlite-test (20, false) (push) Waiting to run
NocoBase Backend Test / sqlite-test (20, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Waiting to run
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, false) (push) Waiting to run
NocoBase Backend Test / mysql-test (20, true) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, false) (push) Waiting to run
NocoBase Backend Test / mariadb-test (20, true) (push) Waiting to run
Test on Windows / build (push) Waiting to run
2024-08-25 09:37:47 +08:00
GitHub Actions Bot
6caaaf3303 Merge branch 'main' into next
Some checks failed
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase FrontEnd Test / frontend-test (18) (push) Has been cancelled
2024-08-24 02:50:34 +00:00
Zhou
7eb15cc3f8
Update README.zh-CN.md
Some checks failed
auto-merge / push-commit (push) Has been cancelled
2024-08-24 10:50:17 +08:00
Junyi
0735038770
feat(plugin-workflow-mailer): add variables (#5120) 2024-08-24 08:32:50 +08:00
GitHub Actions Bot
1bfa277b79 Merge branch 'main' into next
Some checks failed
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / build-and-push (push) Waiting to run
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase FrontEnd Test / frontend-test (18) (push) Waiting to run
NocoBase Backend Test / sqlite-test (20, false) (push) Has been cancelled
NocoBase Backend Test / sqlite-test (20, true) (push) Has been cancelled
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Has been cancelled
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Has been cancelled
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
NocoBase Backend Test / mysql-test (20, false) (push) Has been cancelled
NocoBase Backend Test / mysql-test (20, true) (push) Has been cancelled
NocoBase Backend Test / mariadb-test (20, false) (push) Has been cancelled
NocoBase Backend Test / mariadb-test (20, true) (push) Has been cancelled
Test on Windows / build (push) Has been cancelled
2024-08-23 10:01:45 +00:00
Junyi
8749ba16f8
fix(plugin-workflow-parallel): fix missed transaction causing dead lock in mysql (#5118)
Some checks failed
auto-merge / push-commit (push) Waiting to run
Build Docker Image / build-and-push (push) Has been cancelled
Build Pro Image / build-and-push (push) Has been cancelled
deploy client docs / Build (push) Has been cancelled
E2E / Build (push) Has been cancelled
NocoBase Backend Test / sqlite-test (20, false) (push) Has been cancelled
NocoBase Backend Test / sqlite-test (20, true) (push) Has been cancelled
NocoBase Backend Test / postgres-test (public, 20, nocobase, false) (push) Has been cancelled
NocoBase Backend Test / postgres-test (public, 20, nocobase, true) (push) Has been cancelled
NocoBase Backend Test / postgres-test (public, 20, public, false) (push) Has been cancelled
NocoBase Backend Test / postgres-test (public, 20, public, true) (push) Has been cancelled
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, false) (push) Has been cancelled
NocoBase Backend Test / postgres-test (user_schema, 20, nocobase, true) (push) Has been cancelled
NocoBase Backend Test / postgres-test (user_schema, 20, public, false) (push) Has been cancelled
NocoBase Backend Test / postgres-test (user_schema, 20, public, true) (push) Has been cancelled
NocoBase Backend Test / mysql-test (20, false) (push) Has been cancelled
NocoBase Backend Test / mysql-test (20, true) (push) Has been cancelled
NocoBase Backend Test / mariadb-test (20, false) (push) Has been cancelled
NocoBase Backend Test / mariadb-test (20, true) (push) Has been cancelled
NocoBase FrontEnd Test / frontend-test (18) (push) Has been cancelled
Test on Windows / build (push) Has been cancelled
E2E / Core and plugins (push) Has been cancelled
E2E / plugin-workflow (push) Has been cancelled
E2E / plugin-workflow-approval (push) Has been cancelled
E2E / plugin-data-source-main (push) Has been cancelled
E2E / Comment on PR (push) Has been cancelled
2024-08-23 18:01:27 +08:00