9573 Commits

Author SHA1 Message Date
nocobase[bot]
8c74b44bd3 Merge branch 'next' into develop 2025-04-03 07:18:10 +00:00
nocobase[bot]
ca3ae0f90e Merge branch 'main' into next 2025-04-03 07:15:45 +00:00
nocobase[bot]
c37ea4d60a chore(versions): 😊 publish v1.6.16 v1.6.16 2025-04-03 07:15:19 +00:00
nocobase[bot]
267facce8b Merge branch 'next' into develop 2025-04-03 04:27:51 +00:00
nocobase[bot]
4eb79f7aa9 Merge branch 'main' into next 2025-04-03 04:27:29 +00:00
chenos
709e09b1c8
fix: rename 2025-04-03 12:27:06 +08:00
chenos
54b6078c26
fix: rename 2025-04-03 12:24:28 +08:00
nocobase[bot]
6be064bc57 Merge branch 'next' into develop 2025-04-03 01:33:24 +00:00
nocobase[bot]
9d6c04640f Merge branch 'main' into next 2025-04-03 01:33:01 +00:00
Katherine
92d15388a3
fix: style issue of tooltip-icon in form fields (#6615) 2025-04-03 09:32:39 +08:00
Katherine
1552245abc
fix: style issue of tooltip-icon in form fields (#6615) 2025-04-03 09:32:32 +08:00
nocobase[bot]
d36c35977d Merge branch 'next' into develop 2025-04-02 08:59:25 +00:00
nocobase[bot]
d7d85d179e Merge branch 'main' into next 2025-04-02 08:59:03 +00:00
Zeke Zhang
cf36a3216b chore: add comment 2025-04-02 16:58:01 +08:00
nocobase[bot]
d8f8a127f9 Merge branch 'next' into develop 2025-04-02 08:16:23 +00:00
nocobase[bot]
a2ab61d10d Merge branch 'main' into next 2025-04-02 08:15:58 +00:00
Katherine
7e993b867d
style: optimize title styling on the public form configuration page (#6614) 2025-04-02 16:15:36 +08:00
nocobase[bot]
d0483f07b3 Merge branch 'next' into develop 2025-04-02 07:42:12 +00:00
katherinehhh
05284f29a8 Merge branch 'main' into next 2025-04-02 15:41:20 +08:00
Katherine
d2025ee76f
fix: field label display issue to prevent truncation by colon (#6599)
* fix: form field label truncation due to colon

* fix: test

* fix: bug
2025-04-02 14:54:09 +08:00
Katherine
6632c755d6
fix: x-disabled property not taking effect on form fields (#6610) 2025-04-02 11:32:33 +08:00
Zeke Zhang
23f0fdefb1
fix(public-form): determine whether it is a mobile terminal based on the device type (#6611)
* Revert "fix: update mobile layout handling and clean up unused context (#6600)"

This reverts commit 3558fc3ced64cbdd8aedece062d9a221821ba55d.

* fix: update mobile detection logic in PublicFormPage component
2025-04-02 11:00:31 +08:00
nocobase[bot]
c3b4c06996 Merge branch 'next' into develop 2025-04-02 01:09:17 +00:00
nocobase[bot]
994be1a2a1 chore(versions): 😊 publish v1.7.0-beta.13 v1.7.0-beta.13 2025-04-02 01:08:51 +00:00
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 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