9536 Commits

Author SHA1 Message Date
aaaaaajie
a5c9a62ae3 fix: merge develop and fix confliect 2025-04-02 15:52:55 +08:00
chenos
ab95c13a73 fix: assign 2025-04-02 14:46:41 +08:00
chenos
5046d68c8e fix: assign getKeys 2025-04-02 12:48:00 +08:00
aaaaaajie
ee70b65d1b feat: plugins in mssql 2025-04-02 02:43:52 +08:00
aaaaaajie
fcfeffe504 refactor: union role acl 2025-04-01 23:49:01 +08:00
aaaaaajie
18b8f9bc0e refactor: union role acl 2025-04-01 21:13:28 +08:00
aaaaaajie
9ef9dd4c15 refactor: union role acl 2025-04-01 20:36:53 +08:00
aaaaaajie
bd87d74ce1 refactor: enhance role merging logic: prioritize strategy actions over existing actions 2025-04-01 17:38:06 +08:00
nocobase[bot]
219a5875b8 Merge branch 'main' into next 2025-04-01 05:25:32 +00:00
Junyi
4c3255d455
feat(database): add trim option for string field (#6565)
* feat(database): add trim option for string field

* refactor(database): change to setDataValue instead of hooks

* fix(database): fix test case of view collection
2025-04-01 13:25:08 +08:00
nocobase[bot]
4f5097f3a1 Merge branch 'main' into next 2025-04-01 03:38:37 +00:00
Katherine
69fac11204
fix: oneToMa ny e2e test (#6601) 2025-04-01 11:38:15 +08:00
nocobase[bot]
e3c82ecf13 Merge branch 'main' into next 2025-04-01 03:01:21 +00:00
YANG QIA
04e943a0b2
fix(m2m-array): error of filtering by fields in an association collection with a m2m array field (#6596)
* fix(m2m-array): error of filtering by fields in an association collection with a m2m array field

* test: add test

* feat: generateJoinOnForJSONArray
2025-04-01 11:00:59 +08:00
nocobase[bot]
5e70257416 Merge branch 'main' into next 2025-04-01 00:34:28 +00:00
Junyi
ce28c68018
refactor(plugin-workflow): improve code of schedule trigger (#6589) 2025-04-01 08:34:06 +08:00
aaaaaajie
1e23c28601 feat: plugin users in mssql 2025-04-01 02:27:00 +08:00
aaaaaajie
bc7fe14d54 feat: auth plugin in mssql 2025-04-01 01:03:33 +08:00
aaaaaajie
6db58cdd8a Merge branch 'develop' of github.com:nocobase/nocobase into feat-main-datasource-mssql 2025-03-31 23:14:25 +08:00
aaaaaajie
431dfeffa6 feat: auth plugin in mssql 2025-03-31 23:13:25 +08:00
nocobase[bot]
6ffa450966 Merge branch 'next' into develop 2025-03-31 14:52:03 +00:00
nocobase[bot]
f5e0f41ecd Merge branch 'main' into next 2025-03-31 14:51:42 +00:00
Junyi
4ef6b9037d
fix(plugin-workflow): fix sync option display incorrectly (#6595) 2025-03-31 22:51:19 +08:00
nocobase[bot]
2dbce800d5 Merge branch 'next' into develop 2025-03-31 12:12:01 +00:00
Katherine
cb96426ecd
feat: support configuring colon visibility in form field labels based on layout (#6561)
* feat:  support hiding colons in form field labels

* refactor: colon default value
2025-03-31 20:11:36 +08:00
nocobase[bot]
71a288218f Merge branch 'next' into develop 2025-03-31 08:50:00 +00:00
nocobase[bot]
79e1bf024e Merge branch 'main' into next 2025-03-31 08:49:38 +00:00
estheryo
9db2c533e3
Update README.ja-JP.md 2025-03-31 16:49:17 +08:00
nocobase[bot]
829f745e3d Merge branch 'next' into develop 2025-03-31 08:42:56 +00:00
nocobase[bot]
99d910a4fc Merge branch 'main' into next 2025-03-31 08:42:34 +00:00
estheryo
1a5963a775
Update README.zh-CN.md 2025-03-31 16:42:09 +08:00
nocobase[bot]
2b025ffa1c Merge branch 'next' into develop 2025-03-31 08:40:38 +00:00
nocobase[bot]
cfd4fb2233 Merge branch 'main' into next 2025-03-31 08:40:15 +00:00
estheryo
480e36221f
Update README.md 2025-03-31 16:39:51 +08:00
nocobase[bot]
ca6fbf1082 Merge branch 'next' into develop 2025-03-31 07:19:26 +00:00
nocobase[bot]
591bdc0c73 Merge branch 'main' into next 2025-03-31 07:19:05 +00:00
chenos
c178c215a9 fix: to error message 2025-03-31 15:18:09 +08:00
nocobase[bot]
c5f8b21051 Merge branch 'next' into develop 2025-03-31 06:59:34 +00:00
Katherine
39a07fe546
fix: build error for action props (#6594) 2025-03-31 14:59:14 +08:00
nocobase[bot]
1344b1ce22 Merge branch 'next' into develop 2025-03-31 06:43:01 +00:00
nocobase[bot]
963681b809 Merge branch 'main' into next 2025-03-31 06:42:41 +00:00
Katherine
a7775c25db
fix: association field (select) displaying N/A when exposing related collection fields (#6582)
* fix: association field (select) displaying N/A when exposing related collection fields

* fix: cascade issue: 'The value of xxx cannot be in array format' when deleting and re-selecting

* fix: bug
2025-03-31 14:42:16 +08:00
nocobase[bot]
864e3caddf Merge branch 'next' into develop 2025-03-31 04:54:10 +00:00
nocobase[bot]
c94bc96f86 Merge branch 'main' into next 2025-03-31 04:53:49 +00:00
YANG QIA
febaef9cf9
fix(auth): token assignment in AuthProvider (#6593) 2025-03-31 12:53:25 +08:00
nocobase[bot]
dae5706bdc Merge branch 'next' into develop 2025-03-31 02:25:49 +00:00
Katherine
22f521cf72
fix: submit and refresh buttons not displaying icon-only mode correctly (#6592) 2025-03-31 10:25:26 +08:00
nocobase[bot]
6f9fc22b1e Merge branch 'next' into develop 2025-03-31 01:47:05 +00:00
nocobase[bot]
6cb5bcee92 Merge branch 'main' into next 2025-03-31 01:46:36 +00:00
Katherine
19a263ff5a
fix: prevent map management from passing required validation with space input (#6575) 2025-03-31 09:46:13 +08:00