Commit Graph

6928 Commits

Author SHA1 Message Date
chenos
15774ee5c9 fix: merge error 2024-11-20 08:55:19 +08:00
nocobase[bot]
c7585aa026 Merge branch 'next' into develop
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / get-plugins (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
2024-11-19 16:18:42 +00:00
nocobase[bot]
ce4cd32646 Merge branch 'main' into next
Some checks failed
Build pro image / get-plugins (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 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 (20) (push) Waiting to run
Test on Windows / build (push) Waiting to run
Build docker image / build-and-push (push) Has been cancelled
2024-11-19 16:18:21 +00:00
chenos
b037bbe2f9 chore: update ci
Some checks failed
Build docker image / build-and-push (push) Waiting to run
Build pro image / get-plugins (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 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
Deploy client docs / Build (push) Has been cancelled
2024-11-20 00:17:51 +08:00
nocobase[bot]
673b7915d4 chore(versions): 😊 publish v1.5.0-alpha.1 2024-11-19 15:42:05 +00:00
nocobase[bot]
e68dfebe7a Merge branch 'next' into develop 2024-11-19 15:40:53 +00:00
chenos
090693fc6e Merge branch 'main' into next
# Conflicts:
#	Dockerfile
2024-11-19 23:40:16 +08:00
chenos
ce6d70b325 feat: install postgresql-client 2024-11-19 23:38:01 +08:00
nocobase[bot]
d4e06ff013 Merge branch 'next' into develop 2024-11-19 14:46:10 +00:00
nocobase[bot]
2a95c2ddef chore(versions): 😊 publish v1.4.0-beta.1 2024-11-19 14:45:55 +00:00
nocobase[bot]
433ae5955e Merge branch 'next' into develop 2024-11-19 14:42:40 +00:00
nocobase[bot]
c9d5ec0f3d Merge branch 'main' into next 2024-11-19 14:42:19 +00:00
nocobase[bot]
dadced28ae docs: update changelogs 2024-11-19 14:41:56 +00:00
nocobase[bot]
415cc7e138 Merge branch 'next' into develop 2024-11-19 14:34:48 +00:00
nocobase[bot]
cf460aaebd Merge branch 'main' into next 2024-11-19 14:34:29 +00:00
YANG QIA
bca0148e39
fix(docs): update changelogs (#5689)
* fix(docs): update changelogs

* fix: syntax

* fix: shell

* fix: quote

* fix: typo
2024-11-19 22:34:04 +08:00
nocobase[bot]
7ded91e4ef Merge branch 'next' into develop 2024-11-19 14:32:14 +00:00
chenos
acf6a51492 feat: install postgresql-client 2024-11-19 22:31:39 +08:00
nocobase[bot]
985e6f385a Merge branch 'next' into develop 2024-11-19 12:36:27 +00:00
nocobase[bot]
fb3d039d25 Merge branch 'main' into next 2024-11-19 12:36:06 +00:00
nocobase[bot]
6d5fac201d docs: update changelogs 2024-11-19 12:31:58 +00:00
nocobase[bot]
9756bad256 Merge branch 'next' into develop 2024-11-19 12:28:20 +00:00
Zeke Zhang
294f04ab54
chore(Tabs.TabPane): support hidden property (#5687) 2024-11-19 20:25:12 +08:00
nocobase[bot]
03e6625d38 Merge branch 'next' into develop 2024-11-19 12:22:07 +00:00
nocobase[bot]
96380f020a Merge branch 'main' into next 2024-11-19 12:13:03 +00:00
nocobase[bot]
17f381b93d chore(versions): 😊 publish v1.3.51 2024-11-19 12:12:54 +00:00
nocobase[bot]
f03dc40ed8 Merge branch 'next' into develop 2024-11-19 12:10:10 +00:00
nocobase[bot]
1279c3ddcf Merge branch 'main' into next 2024-11-19 12:09:48 +00:00
YANG QIA
7325ffe9b0
chore(ci): update (#5688)
* test: maunal-release

* chore: update

* test: manual-release-next

* test: manual-release-develop

* chore: update
2024-11-19 20:09:29 +08:00
nocobase[bot]
46996a796c Merge branch 'next' into develop
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / get-plugins (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
2024-11-19 08:45:26 +00:00
nocobase[bot]
8e0022c69e Merge branch 'main' into next
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / get-plugins (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 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 (20) (push) Waiting to run
Test on Windows / build (push) Waiting to run
2024-11-19 08:45:04 +00:00
YANG QIA
c1f1407cb3
chore(ci): release (#5686)
Some checks are pending
Build docker image / build-and-push (push) Waiting to run
Build pro image / get-plugins (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 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
* chore(ci): release

* fix: repositories

* fix: e2ed

* fix: e2e

* fix: e2e

* chore: update
2024-11-19 16:44:39 +08:00
nocobase[bot]
be156dcbd1 Merge branch 'next' into develop 2024-11-19 08:07:36 +00:00
Katherine
35e4f7db4f
fix: issue when switching operators in filter button and submit date field (#5684) 2024-11-19 16:07:16 +08:00
chenos
87b1011dbe Merge branch 'next' into develop
# Conflicts:
#	packages/core/database/package.json
#	packages/core/server/package.json
#	packages/presets/nocobase/package.json
2024-11-19 14:54:06 +08:00
Katherine
e218bc8d16
fix: linkage rule condition with date variable not working (#5675)
* fix: linkage rule condition with date variable not working

* fix: bug

* fix: bug
2024-11-19 14:20:21 +08:00
nocobase[bot]
b2bc5ff581 chore(versions): 😊 publish v1.4.0-alpha.17 2024-11-19 06:15:40 +00:00
nocobase[bot]
bf9b650fb7 Merge branch 'next' into develop 2024-11-19 04:20:20 +00:00
chenos
1b69ae7011 Merge branch 'main' into next
# Conflicts:
#	packages/core/server/src/application.ts
2024-11-19 11:58:47 +08:00
chenos
5518015347
feat: support restoring applications from backup (#5685) 2024-11-19 11:54:43 +08:00
mytharcher
fa5a61fc97 Merge branch 'next' into develop
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
2024-11-19 10:52:28 +08:00
nocobase[bot]
626e8ad5c4 Merge branch 'main' into next
Some checks are pending
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
2024-11-18 23:56:19 +00:00
xilesun
a63a19c8dd fix(ci): plugin-workflow-approval e2e
Some checks are pending
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
2024-11-19 07:55:50 +08:00
xilesun
9fd30b3605 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 (20) (push) Waiting to run
2024-11-19 00:38:01 +08:00
xilesun
1247f4cb63 chore(ci): update auto-merge.yml
Some checks are pending
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 frontEnd test / frontend-test (18) (push) Waiting to run
2024-11-19 00:36:57 +08:00
nocobase[bot]
1b79dc89a6 Merge branch 'main' into next 2024-11-18 14:55:50 +00:00
chenos
23e8a697b1 chore: update Dockerfile 2024-11-18 22:38:57 +08:00
xilesun
7b35b38087 fix(ci): typo 2024-11-18 22:32:36 +08:00
nocobase[bot]
786cb5ac3c Merge branch 'main' into next 2024-11-18 14:30:44 +00:00
YANG QIA
71d61313fd
chore(ci): update auto-merge.yml (#5679) 2024-11-18 22:30:24 +08:00