434 Commits

Author	SHA1	Message	Date
nocobase[bot]	9325669049	Merge branch 'next' into develop	2024-11-21 14:23:15 +00:00
mytharcher	9dd6bd4516	Merge branch 'main' into next	2024-11-21 22:16:35 +08:00
xilesun	575460e3e9	fix(ci): release.yml	2024-11-21 22:12:45 +08:00
nocobase[bot]	a1373b3126	Merge branch 'next' into develop	2024-11-20 15:28:58 +00:00
nocobase[bot]	8b619dea6d	Merge branch 'main' into next	2024-11-20 15:28:40 +00:00
chenos	f520f0c270	chore: update build ci	2024-11-20 23:28:09 +08:00
xilesun	ee3fcc0dc0	chore(ci): update	2024-11-20 21:38:40 +08:00
nocobase[bot]	96326341b2	Merge branch 'next' into develop	2024-11-20 13:05:21 +00:00
nocobase[bot]	4444e27d91	Merge branch 'main' into next	2024-11-20 13:05:03 +00:00
chenos	8195511b09	chore: update build ci	2024-11-20 21:04:29 +08:00
chenos	b846091456	Merge branch 'next' into develop ... # Conflicts: # .github/workflows/build-docker-image.yml # yarn.lock	2024-11-20 13:08:47 +08:00
chenos	37b9aade1f	Merge branch 'main' into next ... # Conflicts: # .github/workflows/build-docker-image.yml	2024-11-20 13:07:44 +08:00
chenos	3dd6d6d5ef	chore: update build ci	2024-11-20 12:31:10 +08:00
xilesun	fe8ea5089a	chore(ci): test	2024-11-20 09:38:52 +08:00
nocobase[bot]	c7585aa026	Merge branch 'next' into develop	2024-11-19 16:18:42 +00:00
nocobase[bot]	ce4cd32646	Merge branch 'main' into next	2024-11-19 16:18:21 +00:00
chenos	b037bbe2f9	chore: update ci	2024-11-20 00:17:51 +08: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	2024-11-19 08:45:26 +00:00
nocobase[bot]	8e0022c69e	Merge branch 'main' into next	2024-11-19 08:45:04 +00:00
YANG QIA	c1f1407cb3	chore(ci): release (#5686) ... * chore(ci): release * fix: repositories * fix: e2ed * fix: e2e * fix: e2e * chore: update	2024-11-19 16:44:39 +08:00
mytharcher	fa5a61fc97	Merge branch 'next' into develop	2024-11-19 10:52:28 +08:00
nocobase[bot]	626e8ad5c4	Merge branch 'main' into next	2024-11-18 23:56:19 +00:00
xilesun	a63a19c8dd	fix(ci): plugin-workflow-approval e2e	2024-11-19 07:55:50 +08:00
xilesun	9fd30b3605	Merge branch 'main' into next	2024-11-19 00:38:01 +08:00
xilesun	1247f4cb63	chore(ci): update auto-merge.yml	2024-11-19 00:36: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
nocobase[bot]	28c8757f56	Merge branch 'main' into next	2024-11-18 14:00:37 +00:00
YANG QIA	4992af56a8	chore(ci): create-branch.yml (#5678) ... * chore(ci): create branch * fix: bug * fix: bug * fix: secrets * fix: plugins * chore: test * chore: update * chore: update * chore: update * chore: update * chore: update * chore: update * chore: update * chore: update * chore: update * chore: update * chore: update * chore: update * chore: update	2024-11-18 22:00:16 +08:00
nocobase[bot]	aad163c4e1	Merge branch 'main' into next	2024-11-18 04:36:25 +00:00
Katherine	ed5c6edec6	fix: linkage rule saving empty value changes to static empty value (#5667) ... * chore(ci): add retry * fix: linkage rule saving empty value changes to static empty value --------- Co-authored-by: xilesun <2013xile@gmail.com>	2024-11-18 12:36:05 +08:00
xilesun	8836c655c1	chore(ci): update	2024-11-17 21:06:23 +08:00
nocobase[bot]	41c4919776	Merge branch 'main' into next	2024-11-16 02:37:39 +00:00
xilesun	bd3218f7cc	chore(ci): add retry	2024-11-16 10:24:25 +08:00
xilesun	9521aee152	Merge remote-tracking branch 'origin/next' into develop	2024-11-15 22:38:38 +08:00
Junyi	60225a11c5	chore(ci): change fe test based on node 20 (#5657) ... * chore(ci): change fe test based on node 20 * chore(ci): change setup-node to v4 * fix(client): fix test case * fix(client): fix test case	2024-11-15 18:12:36 +08:00
xilesun	efbc0c6a1d	Merge remote-tracking branch 'origin/next' into develop	2024-11-15 17:46:28 +08:00
nocobase[bot]	97358707f9	Merge branch 'main' into next	2024-11-15 09:44:18 +00:00
xilesun	4daf73b76c	chore(ci): update	2024-11-15 17:43:42 +08:00
mytharcher	601dd7217c	Merge branch 'T-4910' into develop	2024-11-15 14:34:28 +08:00
mytharcher	5824f1fb15	Merge branch 'next' into T-4910	2024-11-15 11:03:16 +08:00
nocobase[bot]	2df48e7316	Merge branch 'main' into next	2024-11-08 01:14:24 +00:00
xilesun	91b1c773a8	chore(ci): update	2024-11-08 09:13:56 +08:00
nocobase[bot]	1994566fbd	Merge branch 'main' into next	2024-11-08 00:25:07 +00:00
xilesun	206d449afa	fix: Dockerfile for next branch	2024-11-08 08:22:04 +08:00
nocobase[bot]	932f1c1fa5	Merge branch 'main' into next	2024-11-07 04:57:17 +00:00