8568 Commits

Author SHA1 Message Date
katherinehhh
b5ba47f5b4 fix: bug 2025-02-19 15:05:56 +08:00
katherinehhh
6c7a20aa2e Merge branch 'develop' into feat/system-extension 2025-02-19 10:33:43 +08:00
nocobase[bot]
0463a522e4 Merge branch 'next' into develop 2025-02-19 02:17:35 +00:00
nocobase[bot]
e2d62ef802 Merge branch 'main' into next 2025-02-19 02:17:12 +00:00
Katherine
1955499178
fix: inferPickerType (#6244) 2025-02-19 10:16:49 +08:00
nocobase[bot]
2cdabf1fa0 Merge branch 'next' into develop 2025-02-19 02:11:03 +00:00
nocobase[bot]
6de6928cc2 Merge branch 'main' into next 2025-02-19 02:10:41 +00:00
Katherine
dcd2279eeb
fix: datepicker missing picker (#6243) 2025-02-19 10:10:21 +08:00
katherinehhh
5260d3e277 Merge branch 'develop' into feat/system-extension 2025-02-19 09:59:29 +08:00
nocobase[bot]
7d3d1fc657 Merge branch 'next' into develop 2025-02-19 01:47:56 +00:00
nocobase[bot]
2a75f6d0ad Merge branch 'main' into next 2025-02-19 01:47:31 +00:00
Katherine
d62911b646
fix: picker format mismatch in filter form field (#6234)
* fix: picker format mismatch in filter form field

* fix: bug
2025-02-19 09:47:05 +08:00
katherinehhh
b3f6045a9a refactor: code improve 2025-02-18 23:29:02 +08:00
nocobase[bot]
58d0f58430 Merge branch 'next' into develop 2025-02-18 14:26:02 +00:00
nocobase[bot]
08bff8f04a Merge branch 'main' into next 2025-02-18 14:25:37 +00:00
Junyi
211e688547
fix(client): fix variable component disabled height (#6197)
* fix(client): fix variable component disabled height

* fix(client): fix type
2025-02-18 22:25:13 +08:00
katherinehhh
9131bd4fbe fix: bug 2025-02-18 22:11:57 +08:00
katherinehhh
0a90f69ebf Merge branch 'develop' into feat/system-extension 2025-02-18 21:18:24 +08:00
nocobase[bot]
def75b475f chore(versions): 😊 publish v1.6.0-alpha.28 v1.6.0-alpha.28 2025-02-18 11:31:06 +00:00
Katherine
90f27dfb60
fix: getFontColor (#6241) 2025-02-18 17:58:21 +08:00
chenos
da0821d20e fix: improve code 2025-02-18 17:13:01 +08:00
katherinehhh
a71ad4c0bb Merge branch 'develop' into feat/system-extension 2025-02-18 17:07:49 +08:00
katherinehhh
5164b57135 Merge branch 'develop' of github.com:nocobase/nocobase into develop 2025-02-18 16:43:20 +08:00
nocobase[bot]
32de5ffea6 Merge branch 'next' into develop 2025-02-18 05:57:52 +00:00
nocobase[bot]
26a95a8f3b Merge branch 'main' into next 2025-02-18 05:57:28 +00:00
Junyi
418a27bf41
feat(plugin-workflow): add api to register group of instruction (#6237)
* feat(plugin-workflow): add api to register group of instruction

* fix(plugin-workflow): fix type
2025-02-18 13:57:03 +08:00
nocobase[bot]
fd7db9257f Merge branch 'next' into develop 2025-02-18 01:50:24 +00:00
nocobase[bot]
74836f20d7 Merge branch 'main' into next 2025-02-18 01:50:00 +00:00
Katherine
a5b00ca6a3
fix: association block associate action popup issue on mobile (#6235) 2025-02-18 09:49:37 +08:00
nocobase[bot]
5bbdc768ae Merge branch 'next' into develop 2025-02-17 17:55:43 +00:00
nocobase[bot]
bc16520a4f Merge branch 'main' into next 2025-02-17 17:55:20 +00:00
nocobase[bot]
50cad8476e docs: update changelogs 2025-02-17 17:54:53 +00:00
nocobase[bot]
c5a86c9cb7 Merge branch 'next' into develop 2025-02-17 17:19:29 +00:00
nocobase[bot]
26c086a02a Merge branch 'main' into next 2025-02-17 17:16:09 +00:00
nocobase[bot]
db26c82cce chore(versions): 😊 publish v1.5.10 v1.5.10 2025-02-17 17:15:46 +00:00
nocobase[bot]
160f487ef4 Merge branch 'next' into develop 2025-02-17 16:17:24 +00:00
nocobase[bot]
bd81a6f3fa Merge branch 'main' into next 2025-02-17 16:17:01 +00:00
Junyi
a96783a4b0
fix(plugin-workflow-loop): fix pending nodes in loop but resolved (#6236)
* fix(plugin-workflow-loop): fix pending nodes in loop but resolved

* fix(plugin-workflow-test): fix test instruction
2025-02-18 00:16:35 +08:00
nocobase[bot]
f3be51cd78 Merge branch 'next' into develop 2025-02-17 12:43:00 +00:00
nocobase[bot]
798f8074fe Merge branch 'main' into next 2025-02-17 12:42:33 +00:00
chenos
82000ee5f2 fix: vditor error 2025-02-17 20:41:47 +08:00
nocobase[bot]
aaad59f78a Merge branch 'next' into develop 2025-02-17 12:11:10 +00:00
nocobase[bot]
f0e48918fd Merge branch 'main' into next 2025-02-17 12:10:45 +00:00
chenos
e33fc10f00
fix: vditor cdn use local resources (#6229) 2025-02-17 20:10:20 +08:00
nocobase[bot]
0fefb15688 Merge branch 'next' into develop 2025-02-17 10:17:25 +00:00
nocobase[bot]
e32fb4b6d7 Merge branch 'main' into next 2025-02-17 10:17:00 +00:00
nocobase[bot]
e99c1cd9b3 docs: update changelogs 2025-02-17 10:16:31 +00:00
nocobase[bot]
75f449696d Merge branch 'next' into develop 2025-02-17 09:49:21 +00:00
nocobase[bot]
63129fd854 Merge branch 'main' into next 2025-02-17 09:48:55 +00:00
nocobase[bot]
bede58c86b chore(versions): 😊 publish v1.5.9 v1.5.9 2025-02-17 09:48:38 +00:00