3482 Commits

Author SHA1 Message Date
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]
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]
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]
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]
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]
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]
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
nocobase[bot]
26e30489da chore(versions): 😊 publish v1.6.14 2025-03-29 03:46:43 +00:00
nocobase[bot]
1d40bd1b8a chore(versions): 😊 publish v1.7.0-beta.12 2025-03-28 11:44:46 +00:00
nocobase[bot]
b2a46347e8 Merge branch 'next' into develop 2025-03-28 10:05:22 +00:00
nocobase[bot]
949db31725 Merge branch 'main' into next 2025-03-28 10:04:59 +00:00
Katherine
8e90850e14
fix: missing data on boundary dates in weekly calendar view (#6587) 2025-03-28 18:04:35 +08:00
nocobase[bot]
e84b7f16ba Merge branch 'next' into develop 2025-03-28 09:14:22 +00:00
nocobase[bot]
92cfafa70c Merge branch 'main' into next 2025-03-28 09:11:53 +00:00
nocobase[bot]
cf09e64821 chore(versions): 😊 publish v1.6.13 2025-03-28 09:11:21 +00:00
nocobase[bot]
cdd9244231 Merge branch 'next' into develop 2025-03-28 07:45:32 +00:00
nocobase[bot]
85082b84a3 Merge branch 'main' into next 2025-03-28 07:45:08 +00:00
Katherine
b86ea5dd61
fix: error when downloading async migration file (#6586) 2025-03-28 15:44:45 +08:00
chenos
68f63b359b Merge branch 'next' into develop
# Conflicts:
#	packages/presets/nocobase/package.json
2025-03-28 15:02:25 +08:00
chenos
9d3317fc45 Merge branch 'main' into next
# Conflicts:
#	packages/presets/nocobase/package.json
2025-03-28 15:00:16 +08:00
Zeke Zhang
cbc4ca252b fix: improve URL navigation by removing basename prefix 2025-03-28 14:21:05 +08:00
Katherine
28c633e369
fix: error in migration task popup during async export (#6584) 2025-03-28 13:58:16 +08:00
Sheldon Guo
d94c365e30
feat(qrcode-scanner): add an onScanSuccess callback to handle successful scans and exit the camera UI (#6580)
* fix(demos): set authentication token for mock API client in DesktopMode-basic

* feat(qrcode-scanner): add onScanSuccess callback to handle successful scans

* fix: include onScanSuccess in dependency array of useScanner hook

* fix: refactor onScanSuccess handling in QRCodeScanner and useScanner
2025-03-28 13:28:03 +08:00
nocobase[bot]
caace2ce0e Merge branch 'next' into develop 2025-03-28 04:57:20 +00:00
Katherine
1492a03f6e
fix: error in migration task popup during async export (#6583) 2025-03-28 12:57:00 +08:00
chenos
6bb754612c
feat: locale tester (#6576)
* feat: locale tester

* fix: locale

* fix: acl.registerSnippet

* feat: package.json

* fix: locale
2025-03-28 12:39:44 +08:00