8161 Commits

Author SHA1 Message Date
nocobase[bot]
c4588b2e93 Merge branch 'next' into develop 2025-01-22 09:29:47 +00:00
Zeke Zhang
86b813850e
fix: loading mode (#6115) 2025-01-22 17:29:20 +08:00
nocobase[bot]
45524c1ad7 Merge branch 'next' into develop 2025-01-22 09:17:56 +00:00
Zeke Zhang
03db13f241
fix: refresh association field data after page switching (#6114) 2025-01-22 17:17:29 +08:00
nocobase[bot]
22bb0eba39 Merge branch 'next' into develop 2025-01-22 09:16:20 +00:00
nocobase[bot]
a55e8a8cca Merge branch 'main' into next 2025-01-22 09:15:57 +00:00
Junyi
b89f255d4c
fix(plugin-workflow-request): fix flow bug (#6120) 2025-01-22 17:15:30 +08:00
Katherine
778d98e038
fix: merge bug (#6118)
* fix: merge bug

* fix: merge bug
2025-01-22 14:32:41 +08:00
nocobase[bot]
8a06af7295 Merge branch 'next' into develop 2025-01-22 06:22:41 +00:00
katherinehhh
8243db5e3d fix: merge bug 2025-01-22 14:21:42 +08:00
nocobase[bot]
d441e523a4 Merge branch 'next' into develop 2025-01-22 02:15:14 +00:00
katherinehhh
982936963b Merge branch 'main' into next 2025-01-22 10:13:55 +08:00
Junyi
29f547bc26
fix(plugin-workflow-test): fix acl for mock data source (#6116) 2025-01-22 09:45:44 +08:00
Katherine
dddd4616ca
fix: drag issue in quick popup add action for association field (#6112) 2025-01-21 20:01:37 +08:00
nocobase[bot]
d7f6463c2b Merge branch 'next' into develop 2025-01-21 09:52:03 +00:00
nocobase[bot]
7601386e18 chore(versions): 😊 publish v1.5.0-beta.33 v1.5.0-beta.33 2025-01-21 09:51:26 +00:00
nocobase[bot]
431aead4b2 Merge branch 'next' into develop 2025-01-21 07:31:25 +00:00
nocobase[bot]
4fbf0ba3f3 Merge branch 'main' into next 2025-01-21 07:30:59 +00:00
nocobase[bot]
d311821943 docs: update changelogs 2025-01-21 07:30:32 +00:00
nocobase[bot]
7b5fab37a6 Merge branch 'next' into develop 2025-01-21 07:15:56 +00:00
nocobase[bot]
302e53ac24 Merge branch 'main' into next 2025-01-21 07:13:58 +00:00
nocobase[bot]
a326f7efae chore(versions): 😊 publish v1.4.29 v1.4.29 2025-01-21 07:13:43 +00:00
chenos
321e36fce2 Merge branch 'develop' of github.com:nocobase/nocobase into develop 2025-01-21 15:10:49 +08:00
chenos
4df4febc06 Merge branch 'next' into develop 2025-01-21 15:10:22 +08:00
nocobase[bot]
5f948c58ab Merge branch 'next' into develop 2025-01-21 07:10:21 +00:00
chenos
d6c624d17a Merge branch 'main' into next
# Conflicts:
#	.gitignore
2025-01-21 15:09:46 +08:00
Sheldon Guo
20ae334f4c
feat(template-print-support): provide auxiliary support for template printing functionality (#5713) (#6111)
* chore: update .gitignore to exclude print-templates and modify APIClient type definition
2025-01-21 15:05:29 +08:00
katherinehhh
ab5d51fa17 Merge branch 'next' into develop 2025-01-21 13:59:55 +08:00
katherinehhh
5b81a072f7 Merge branch 'main' into next 2025-01-21 13:52:46 +08:00
Katherine
b79e9035cb
feat: support configuring the number of icons per row in the mobile … (#6106)
* feat: support configuring  the number of icons per row in the mobile  action penal

* fix: bug
2025-01-21 13:36:56 +08:00
nocobase[bot]
37bcb5706d Merge branch 'next' into develop 2025-01-21 05:08:46 +00:00
nocobase[bot]
a2a3e08233 Merge branch 'main' into next 2025-01-21 05:08:20 +00:00
nocobase[bot]
0aae4f86db docs: update changelogs 2025-01-21 05:07:55 +00:00
nocobase[bot]
e12d21cf76 Merge branch 'main' into next 2025-01-21 04:32:32 +00:00
nocobase[bot]
38f247c33d chore(versions): 😊 publish v1.4.28 v1.4.28 2025-01-21 04:32:08 +00:00
nocobase[bot]
f3d1a6df68 Merge branch 'next' into develop 2025-01-21 04:10:44 +00:00
nocobase[bot]
54e7fa3616 Merge branch 'main' into next 2025-01-21 04:10:22 +00:00
chenos
e61637e1f8
fix: association field default value (#6103) 2025-01-21 12:09:56 +08:00
Sheldon Guo
c46cdd37ae
fix(plugin-auth): update migration rules for issued tokens and token policy config (#6107) 2025-01-21 10:46:33 +08:00
nocobase[bot]
67c1d9d131 Merge branch 'next' into develop 2025-01-21 01:57:00 +00:00
Junyi
8b0b46190b
fix(plugin-workflow): fix styles (#6095)
* fix(plugin-workflow): remove useless node id from node card

* fix(plugin-workflow): option locale

* fix(plugin-workflow): fix add node button style

* fix(plugin-workflow): fix styles

* fix(plugin-workflow): revert node id back
2025-01-21 09:56:37 +08:00
nocobase[bot]
3b58584e51 Merge branch 'next' into develop 2025-01-20 09:48:26 +00:00
chenos
d5df9c9621 fix: storages:getBasicInfo 2025-01-20 17:47:38 +08:00
chenos
5a6ddea268 Merge branch 'next' into develop
# Conflicts:
#	packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts
2025-01-20 17:43:46 +08:00
nocobase[bot]
273299cc3c Merge branch 'main' into next 2025-01-20 09:22:15 +00:00
chenos
4de54a1167
fix: permission denied for sock files (#6092)
* fix: permission denied for sock files

* fix: error
2025-01-20 17:21:50 +08:00
chenos
289274f85f
feat: variables and secrets (#6093) 2025-01-20 16:08:17 +08:00
Jiannx
7ccf088a06
Feat/support s3 storage next (#6096)
* feat: change upload components

* feat: restore original component in schema, support useUploadProps register

* feat: s3 upload support relation fileds

* feat: export buildin storages

* chore: remove invalid file

* fix: change getStorage action name

* fix: change action name getDesensitizedStorage to getDesensitized

* fix: add storage get action

* fix: remove useStorageRules

* fix: change action get to getBasicInfo

* fix: adjust server test case
2025-01-20 14:34:43 +08:00
nocobase[bot]
fa6d2178c0 Merge branch 'next' into develop 2025-01-20 04:15:34 +00:00
nocobase[bot]
f3c1761840 Merge branch 'main' into next 2025-01-20 04:15:10 +00:00