aaaaaajie
a5c9a62ae3
fix: merge develop and fix confliect
2025-04-02 15:52:55 +08:00
aaaaaajie
ee70b65d1b
feat: plugins in mssql
2025-04-02 02:43:52 +08:00
aaaaaajie
fcfeffe504
refactor: union role acl
2025-04-01 23:49:01 +08:00
aaaaaajie
9ef9dd4c15
refactor: union role acl
2025-04-01 20:36:53 +08:00
aaaaaajie
bd87d74ce1
refactor: enhance role merging logic: prioritize strategy actions over existing actions
2025-04-01 17:38:06 +08: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]
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
aaaaaajie
1e23c28601
feat: plugin users in mssql
2025-04-01 02:27:00 +08:00
aaaaaajie
6db58cdd8a
Merge branch 'develop' of github.com:nocobase/nocobase into feat-main-datasource-mssql
2025-03-31 23:14:25 +08:00
aaaaaajie
431dfeffa6
feat: auth plugin in mssql
2025-03-31 23:13:25 +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
aaaaaajie
d2ff34e17e
feat: field sort plugin in mssql
2025-03-30 21:58:42 +08:00
aaaaaajie
09eda5ffdc
feat: mock server access to plugin mssql import static and compatible mssql function
2025-03-30 19:24:28 +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
Zeke Zhang
9eaa47863d
fix: remove refreshComponent in Grid component ( #6578 )
...
* fix: remove refreshComponent in Grid component
* test: add e2e test for modal content persistence after reopening
2025-03-28 12:01:13 +08:00
nocobase[bot]
ecdf6e839a
Merge branch 'next' into develop
2025-03-28 03:02:05 +00:00
nocobase[bot]
93a7035230
Merge branch 'main' into next
2025-03-28 03:01:43 +00:00
chenos
1b782c4f95
refactor: async tasks ( #6531 )
...
* refactor: async tasks
* refactor: selectWithTitle support optionRender
* refactor: adjust export filename
* fix: build error
* fix: export file name
---------
Co-authored-by: katherinehhh <katherine_15995@163.com>
2025-03-28 11:01:20 +08:00
nocobase[bot]
03c167d999
Merge branch 'next' into develop
2025-03-28 03:00:53 +00:00
ajie
e59cec0e69
fix: incorrect current role assignment during login ( #6581 )
...
* fix: incorrect current role assignment during login
2025-03-28 11:00:29 +08:00
nocobase[bot]
aad023cfc0
chore(versions): 😊 publish v1.6.12
2025-03-27 12:58:32 +00:00
nocobase[bot]
57b5774556
Merge branch 'next' into develop
2025-03-27 10:53:02 +00:00
