Commit Graph

5836 Commits

Author SHA1 Message Date
mytharcher
db5f254bd2 Merge branch 'next' into T-4910 2024-08-27 09:30:44 +08:00
nocobase[bot]
ec3dc60910 Merge branch 'main' into next
Some checks failed
Build Docker Image / build-and-push (push) Waiting to run
Build Pro Image / app-token (push) Waiting to run
Build Pro Image / build-and-push (push) Blocked by required conditions
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-27 00:37:55 +00:00
nocobase[bot]
3403e8d766 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 / app-token (push) Waiting to run
Build Pro Image / build-and-push (push) Blocked by required conditions
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: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
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
mytharcher
d0dc0428fb fix(plugin-field-sort): fix build and test cases 2024-08-26 23:28:58 +08:00
Junyi
845a6bd447 fix(server): fix import crypto in pub sub manager (#5111) 2024-08-26 21:04:09 +08:00
mytharcher
bce81bd4ca chore(plugin-data-source-main): remove unused import 2024-08-26 21:04:09 +08:00
mytharcher
15593b5185 fix(plugin-data-source-main): fix lock usage 2024-08-26 21:04:09 +08:00
mytharcher
2251742b86 fix(plugin-field-sort): fix load logic 2024-08-26 21:04:09 +08:00
mytharcher
fa15b49c0a fix(plugin-field-sort): fix register move action 2024-08-26 21:04:08 +08:00
mytharcher
086364de84 fix(plugin-field-sort): fix test case 2024-08-26 21:02:11 +08:00
mytharcher
65b6fb7b03 fix(server): fix build errors 2024-08-26 21:02:10 +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
chenos
5580dc8fd1 chore: update build ci 2024-08-26 18:27:13 +08:00
mytharcher
9b9e03ea19 refactor(plugin-field-sort): move sort field to plugin 2024-08-26 18:27:10 +08:00
mytharcher
ac0bae6be9 fix(plugins): revert lock usage back for some plugins 2024-08-26 18:26:18 +08:00
Chareice
9e8436ce19 fix: ttl 2024-08-26 18:26:18 +08:00
Chareice
ce353d7ba8 chore: ttl of sort field lock 2024-08-26 18:26:18 +08:00
mytharcher
c1db4f2e0c fix(auth): fix test case 2024-08-26 18:26:16 +08:00
GitHub Actions Bot
7327aa347b Merge branch 'main' into next 2024-08-26 10:06:21 +00:00
mytharcher
c49c1704fd refactor(plugins): change to new lock manager to use locks 2024-08-26 17:59:18 +08:00
mytharcher
0935b898fb refactor(core): move lock-manager to independent package to be used in db 2024-08-26 17:59:16 +08:00
mytharcher
483ea698b1 feat(server): add api 2024-08-26 17:57:45 +08:00
mytharcher
c17dfd36b8 refactor(server): adjust types 2024-08-26 17:57:45 +08:00
chenos
dcb22c8ce3 fix: lockManager.close 2024-08-26 17:57:45 +08:00
mytharcher
387e16f3bf refactor(server): change variable names and use singleton for local lock 2024-08-26 17:57:45 +08:00
mytharcher
47ced56eb6 refactor(server): refactor api and local lock 2024-08-26 17:57:45 +08:00