nocobase[bot]
f59270f179
Merge branch 'next' into develop
2025-04-01 15:29:41 +00:00
nocobase[bot]
6a191f390c
Merge branch 'main' into next
2025-04-01 15:29:17 +00:00
YANG QIA
12e6824153
fix(db): filterByTk is ignored when both filter and filterByTk are used in o2m deletion ( #6606 )
...
* fix(db): `filterByTk` is ignored when both `filter` and `filterByTk` are used in o2m deletion
* test: add test
2025-04-01 23:28:41 +08:00
nocobase[bot]
ea50c3b057
Merge branch 'next' into develop
2025-04-01 13:31:48 +00:00
nocobase[bot]
690fd6d44f
Merge branch 'main' into next
2025-04-01 13:31:26 +00:00
Zhou
33bfdf6cd7
Update LICENSE.txt
2025-04-01 21:31:02 +08:00
nocobase[bot]
a6389f3d46
Merge branch 'next' into develop
2025-04-01 13:21:03 +00:00
nocobase[bot]
2aa06baff0
Merge branch 'main' into next
2025-04-01 13:20:38 +00:00
nocobase[bot]
d6db010952
docs: update changelogs
2025-04-01 13:20:13 +00:00
nocobase[bot]
b665177bd0
Merge branch 'next' into develop
2025-04-01 13:02:03 +00:00
nocobase[bot]
5862d97754
Merge branch 'main' into next
2025-04-01 12:59:30 +00:00
nocobase[bot]
71a55d6f10
chore(versions): 😊 publish v1.6.15
2025-04-01 12:59:02 +00:00
nocobase[bot]
b5edb03e7a
Merge branch 'next' into develop
2025-04-01 12:26:23 +00:00
chenos
f75f65f588
Merge branch 'main' into next
...
# Conflicts:
# packages/plugins/@nocobase/plugin-public-forms/src/server/plugin.ts
2025-04-01 20:19:43 +08:00
chenos
bc158ac66c
fix: view permissions include list and get ( #6607 )
2025-04-01 19:55:25 +08:00
nocobase[bot]
dad5bf37c0
Merge branch 'next' into develop
2025-04-01 09:49:25 +00:00
nocobase[bot]
3b7120fd46
Merge branch 'main' into next
2025-04-01 09:49:02 +00:00
Junyi
b04d4a82d9
refactor(file-manager-storage): add trim option for text fields ( #6604 )
2025-04-01 17:48:41 +08:00
nocobase[bot]
d13718a1c0
Merge branch 'next' into develop
2025-04-01 09:47:56 +00:00
nocobase[bot]
de2e49acda
Merge branch 'main' into next
2025-04-01 09:47:35 +00:00
Junyi
54817e1453
feat(database): add trim option for text field ( #6603 )
2025-04-01 17:47:12 +08:00
nocobase[bot]
04ced54224
Merge branch 'next' into develop
2025-04-01 09:39:39 +00:00
nocobase[bot]
ecff95627e
Merge branch 'main' into next
2025-04-01 09:39:15 +00:00
hongboji
e6a3cbf613
fix: approval e2e POM
2025-04-01 17:38:46 +08:00
nocobase[bot]
b81615d700
Merge branch 'next' into develop
2025-04-01 07:19:54 +00:00
nocobase[bot]
0d3de9b463
Merge branch 'main' into next
2025-04-01 07:19:22 +00:00
hongboji
d0f866da0c
fix: approval e2e POM
2025-04-01 15:18:43 +08:00
nocobase[bot]
3f3c7f3e91
Merge branch 'main' into next
2025-04-01 07:14:46 +00:00
Junyi
520ffa3e3e
fix(client): support disabled props for SchemaInitializerItem when has items ( #6597 )
...
* fix(client): support disabled props for SchemaInitializerItem when has items
* refactor(client): use default menu props for disabled
2025-04-01 15:14:23 +08:00
nocobase[bot]
ce118fa479
Merge branch 'next' into develop
2025-04-01 07:11:17 +00:00
nocobase[bot]
ff57b76a0c
Merge branch 'main' into next
2025-04-01 07:10:52 +00:00
Junyi
164772afb8
fix(database): fix datetimeNoTz field ( #6588 )
...
* fix(database): fix datetimeNoTz field
* fix(database): fix test case
2025-04-01 15:10:28 +08:00
nocobase[bot]
97c310e9f2
Merge branch 'next' into develop
2025-04-01 05:25:53 +00: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
Zeke Zhang
3558fc3ced
fix: update mobile layout handling and clean up unused context ( #6600 )
2025-04-01 11:36:37 +08:00
nocobase[bot]
b8b539dbc8
Merge branch 'next' into develop
2025-04-01 03:01:44 +00: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]
a1748e1da1
Merge branch 'next' into develop
2025-04-01 00:34:56 +00: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
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
