Zeke Zhang
3d7c52a53c
chore: add loading
2025-04-20 16:58:46 +08:00
Zeke Zhang
3e8f0be43f
fix(locale): add missing translations for password reset functionality in multiple languages
2025-04-20 16:47:09 +08:00
Zeke Zhang
c45840508b
fix(auth): add baseURL parameter to password reset functionality
2025-04-20 16:20:40 +08:00
Zeke Zhang
d2dd0f5ef2
fix(auth): enhance email template variable parsing for password reset notifications
2025-04-18 11:38:26 +08:00
Zeke Zhang
e79f111cf9
fix(ForgotPasswordPage): handle loading state correctly during password reset
2025-04-18 09:34:20 +08:00
Zeke Zhang
728b28632b
Merge branch 'develop' into 1921
2025-04-18 09:28:16 +08:00
nocobase[bot]
13c9627a61
Merge branch 'next' into develop
2025-04-18 01:24:54 +00:00
nocobase[bot]
e1e2f7a83c
Merge branch 'main' into next
2025-04-18 01:24:33 +00:00
Zeke Zhang
3067b3a4b1
fix(tree-block): the issue where the tree block filter condition was empty ( #6634 )
...
* fix: enhance useFilterAPI to support sourceKey in filter functions
* fix: update useFilterAPI to use key variable for dynamic field assignment
* feat: add treeFind function for depth-first traversal of tree structures
* feat: enhance getSupportFieldsByForeignKey to include target collection matching
* feat: add getInheritChain method to InheritanceCollectionMixin and corresponding tests
2025-04-18 09:24:08 +08:00
nocobase[bot]
fb860907ea
Merge branch 'next' into develop
2025-04-18 00:52:40 +00:00
nocobase[bot]
402c3f4b3a
chore(versions): 😊 publish v1.7.0-beta.20
2025-04-18 00:52:00 +00:00
nocobase[bot]
8e36ec3611
Merge branch 'next' into develop
2025-04-17 14:42:34 +00:00
Junyi
42cbe1e1dd
fix(plugin-workflow-manual): acl ( #6693 )
...
* fix(plugin-workflow-manual): fix acl for tasks
* test(plugin-workflow-manual): add test case
* fix(plugin-workflow-manual): fix test case
2025-04-17 22:42:13 +08:00
nocobase[bot]
c69572f148
Merge branch 'next' into develop
2025-04-17 12:27:09 +00:00
Junyi
e9560bb42c
fix(client): fix error thrown when no block context ( #6696 )
2025-04-17 20:26:49 +08:00
nocobase[bot]
2c315066e0
Merge branch 'next' into develop
2025-04-17 08:13:53 +00:00
nocobase[bot]
b04e877d31
chore(versions): 😊 publish v1.7.0-beta.19
2025-04-17 08:13:12 +00:00
nocobase[bot]
e3cc7e2b8f
Merge branch 'next' into develop
2025-04-17 07:11:41 +00:00
chenos
0fc8f5d0cf
Merge branch 'main' into next
...
# Conflicts:
# yarn.lock
2025-04-17 15:11:07 +08:00
chenos
8abdb8eaac
chore: upgrade tar to version 7.4.3
2025-04-17 15:09:10 +08:00
nocobase[bot]
351c3bd1ac
Merge branch 'next' into develop
2025-04-17 07:01:36 +00:00
nocobase[bot]
af82078998
Merge branch 'main' into next
2025-04-17 07:01:14 +00:00
nocobase[bot]
3413bffcbb
docs: update changelogs
2025-04-17 07:00:50 +00:00
nocobase[bot]
104cc6fb36
Merge branch 'next' into develop
2025-04-17 06:54:26 +00:00
nocobase[bot]
2c6547e95c
Merge branch 'main' into next
2025-04-17 06:52:14 +00:00
nocobase[bot]
7f1d642848
chore(versions): 😊 publish v1.6.21
2025-04-17 06:51:36 +00:00
nocobase[bot]
11b57d0de4
Merge branch 'next' into develop
2025-04-17 06:31:20 +00:00
nocobase[bot]
66ecba9d96
Merge branch 'main' into next
2025-04-17 06:30:55 +00:00
Junyi
9add517d75
refactor(client): add delay API for scenarios without delay ( #6681 )
2025-04-17 14:30:32 +08:00
nocobase[bot]
a8e0a6e826
Merge branch 'next' into develop
2025-04-17 04:35:28 +00:00
Katherine
f5fb2844da
feat(custom-request): support selected table records in custom request ( #6647 )
...
* feat: support selected table records in custom request
* fix: test
* fix: bug
* fix: bug
* fix: bug
* fix: bug
* fix: merge bug
* fix: e2e test
* fix: e2e test
2025-04-17 12:35:03 +08:00
nocobase[bot]
11d1d2497d
Merge branch 'next' into develop
2025-04-17 04:19:40 +00:00
nocobase[bot]
1c343cad66
Merge branch 'main' into next
2025-04-17 04:19:18 +00:00
Junyi
18447848ca
fix(client): add fault tolerant when no x-component in schema ( #6691 )
2025-04-17 12:18:51 +08:00
nocobase[bot]
f9cb9bd376
Merge branch 'next' into develop
2025-04-17 04:14:27 +00:00
nocobase[bot]
00629d118e
Merge branch 'main' into next
2025-04-17 04:14:06 +00:00
ajie
454ab34921
fix: ci build ( #6687 )
2025-04-17 12:13:41 +08:00
nocobase[bot]
1e9967697f
Merge branch 'next' into develop
2025-04-17 03:45:21 +00:00
nocobase[bot]
ff772fc5cf
Merge branch 'main' into next
2025-04-17 03:44:59 +00:00
Katherine
0961c4399d
fix: association field detection to be based on type ( #6692 )
2025-04-17 11:44:38 +08:00
nocobase[bot]
41949b31e2
Merge branch 'next' into develop
2025-04-17 02:33:08 +00:00
Katherine
38f8cf9d56
fix: linkage rules compatibility with legacy data ( #6686 )
...
* fix: linkage rules compatibility with legacy data
* fix: bug
2025-04-17 10:32:41 +08:00
nocobase[bot]
f25c740fea
Merge branch 'next' into develop
2025-04-17 01:07:03 +00:00
nocobase[bot]
78fefe197b
Merge branch 'main' into next
2025-04-17 01:06:30 +00:00
xilesun
83be9b1013
chore: update ci
2025-04-17 09:05:38 +08:00
nocobase[bot]
d775eb1280
Merge branch 'next' into develop
2025-04-17 01:04:32 +00:00
nocobase[bot]
1652b50edf
Merge branch 'main' into next
2025-04-17 01:04:09 +00:00
YANG QIA
824ad7f29e
fix: bug ( #6684 )
2025-04-17 09:03:33 +08:00
nocobase[bot]
e6f6246be7
Merge branch 'next' into develop
2025-04-16 13:48:14 +00:00
mytharcher
10a6fbba41
fix(plugin-workflow-manual): fix merge error
2025-04-16 21:47:18 +08:00
