Jiangjie Bai
ebf1d83a8e
Merge pull request #16961 from jumpserver/pr@dev_osm@merge
...
feat: merge dev custom
2026-07-01 15:12:12 +08:00
Bai
3c34cfec48
feat: merge dev custom
2026-07-01 15:09:50 +08:00
Jiangjie Bai
61822a6b11
feat: Merge to dev_osm from osm ( #16959 )
...
* perf: auth cert add settings
* perf: add config for cert
* feat: add auth cert ca cert/key upload supported
* fix: Change lang failed (#16861 )
Co-authored-by: wangruidong <940853815@qq.com >
* fix: third part user login many login logs
* fix: i18n cert to ukey
* fix: cert algo default -
* fix: cert logo to ukey
* fix: cert auth to ukey auth
* fix: wecom scan login only exist user login, but two login success
* fix: django5 for model.field through_fields apply to migrations
* fix: from apps. change to appname imported
* fix: LDAP user login exception
* feat: hsm sctu
* fix(static): remove invalid sourcemap references from vendor js
* fix:add ansible patchs to osm (#16886 )
* fix:add ansible patchs to osm
* fix: quote ansible gateway proxy command args
---------
Co-authored-by: Crane.z <1481445951@qq.com >
* feat: support ukey
* perf: auth ukey config interval time 5s
* perf: add ukey_sn unique and unbind devSN operation
* perf: profile not display ukey for other user
* perf: i18n ukey
* perf: ukey change pin support validate length
* perf: ukey settings default pin length
* perf: 512 to 256 rounds 1000
* perf: update gmssl builder
* perf: ukey auth security
* perf: ukey challenge ttl check
* feat: hsm
* fix(accounts): support new gateway proxy layout in ssh ping (#16895 )
Co-authored-by: Crane.z <1481445951@qq.com >
* fix: ukey api urls open
* fix: jida ukey show certAlg
* perf: update change role name
* perf: gmssl_python add copyright notice
* feat:upgrade ansible version
* fix: update user empty ukey_sn field value
* fix: ukey auth user invalid alert error
* perf: use prebuild gmssl image
* fix: do not view change-secret by settings
* perf: update last login
* fix: do not view change-secret by settings
* perf: support applet host filter
* fix: ukey login user deactive error no tips
* fix: add translate
* perf: Logout countdown
* fix: sys-site-msg support revoke
* perf: remove video player download
* perf: change lang trans
* perf: update config after migrate
* perf: translate
* perf: update migrate
* perf: update site url
* perf: translate
* fix: flash msg page redirect_url safe check
* fix: playbook clone_from check playbook scope
* fix: profile password patch method not allowed
* perf: translate
* perf: to tcpdump
* perf: traceroute
* perf: remove debug
* Revert "perf: to tcpdump"
This reverts commit 1413d57bfd#16947 )
* fix: Import prompts a interal error when the label is too long
* fix: Platform error translate
---------
Co-authored-by: wangruidong <940853815@qq.com >
* perf: update i18n
* perf: ansible forks to 20
* perf: BULK_SIZE to 80
* perf: hcp vault jumpserver change pam
* perf: add update user password script
* perf: add change user password pt
* perf: ru translate
---------
Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com >
Co-authored-by: wangruidong <940853815@qq.com >
Co-authored-by: xiaoc <648844981@qq.com >
Co-authored-by: Aaron3S <chenyang@fit2cloud.com >
Co-authored-by: Crane.z <1481445951@qq.com >
Co-authored-by: feng <1304903146@qq.com >
Co-authored-by: Eric <xplzv@126.com >
Co-authored-by: ibuler <ibuler@qq.com >
Co-authored-by: zhaojisen <1301338853@qq.com >
2026-07-01 14:58:29 +08:00
Jiangjie Bai
8254e3ede5
Merge branch 'dev_osm' into osm
2026-07-01 14:56:36 +08:00
feng
c0659cd220
perf: ru translate
2026-06-30 18:53:54 +08:00
feng
3209b7d9ce
perf: add change user password pt
2026-06-30 12:30:54 +08:00
ibuler
94b775c7ec
perf: add update user password script
2026-06-30 01:04:39 +08:00
wangruidong
8b04d75421
perf: gather mac address
2026-06-29 10:05:37 +08:00
feng
8f417d017a
perf: hcp vault jumpserver change pam
2026-06-28 12:21:21 +08:00
feng
9f0b51b5e5
perf: BULK_SIZE to 80
2026-06-26 17:47:08 +08:00
feng
5922449b3a
perf: ansible forks to 20
2026-06-26 17:17:27 +08:00
LDX
ec9e76e405
feat(assets): add user custom favorite folders ( #16949 )
...
* feat(assets): add user custom favorite folders
- Add FavoriteFolder model (per-user, nested via self parent FK)
- Add nullable folder FK on FavoriteAsset, allow one asset in multiple folders
- Add FavoriteFolderViewSet and folder filter on FavoriteAssetViewSet
- Serializer outputs asset_info for building connectable tree nodes
- Register favorite-folders route; exclude favoritefolder from rbac/audit
* feat(assets): register favorite-folders route and add migration
- Register favorite-folders router endpoint
- Add migration 0020 creating FavoriteFolder and folder FK on FavoriteAsset
* feat(rbac): exclude favoritefolder from permission management
Keep favoritefolder consistent with favoriteasset (user-owned, not RBAC managed)
* feat(audits): exclude FavoriteFolder from operate log
2026-06-26 16:29:25 +08:00
ibuler
0a436de927
perf: update i18n
2026-06-26 13:38:37 +08:00
fit2bot
dc98c2c436
fix: Platform error translate ( #16947 )
...
* fix: Import prompts a interal error when the label is too long
* fix: Platform error translate
---------
Co-authored-by: wangruidong <940853815@qq.com >
2026-06-25 17:00:03 +08:00
feng
22caa47c99
perf: translate
2026-06-25 16:43:25 +08:00
feng
46ae74d3e7
perf: indentation
2026-06-25 15:17:52 +08:00
feng
ef4cbc3e0c
perf: use mongo ping
2026-06-25 15:06:28 +08:00
feng
1011dddd1f
perf: es error
2026-06-25 13:55:29 +08:00
zhaojisen
e713c8cc52
fix: storage translate
2026-06-25 11:02:07 +08:00
feng
c78d4699b5
perf: add mongo utils
2026-06-25 10:48:01 +08:00
ibuler
d40cebd528
perf: update download
2026-06-24 17:57:59 +08:00
zhaojisen
3b2a6d316a
perf: add client unsupport tips
2026-06-24 17:30:39 +08:00
feng
7470f6d54d
perf: translate
2026-06-24 17:11:07 +08:00
ibuler
68a39a92e5
perf: update input secret type
2026-06-24 10:10:11 +08:00
feng
53f6d898d6
perf: account history
2026-06-23 19:57:56 +08:00
feng
cf4154af7b
perf: push account
2026-06-23 18:34:19 +08:00
feng
42b522b2b0
perf: user login filter filter_long_time
2026-06-22 16:22:26 +08:00
feng
36b3f8e8e2
perf: translate
2026-06-22 11:27:14 +08:00
feng
9283d26049
perf: translate
2026-06-22 11:20:28 +08:00
feng
042fe626a4
perf: import asset add error check
2026-06-22 11:09:36 +08:00
feng
a5021a3058
Revert "perf: to tcpdump"
...
This reverts commit 1413d57bfd
2026-06-17 16:30:39 +08:00
feng
b6bbf237e2
perf: remove debug
2026-06-17 16:24:59 +08:00
feng
0245a008d1
perf: traceroute
2026-06-17 16:20:07 +08:00
feng
1413d57bfd
perf: to tcpdump
2026-06-17 12:51:24 +08:00
feng
4011d1d72a
perf: translate
2026-06-16 18:44:34 +08:00
Bai
58bbe470fd
fix: profile password patch method not allowed
2026-06-16 17:42:52 +08:00
ibuler
0d621ae598
Merge branch 'osm' of github.com:jumpserver/jumpserver into osm
2026-06-16 17:24:56 +08:00
Bai
b0148ffadd
fix: playbook clone_from check playbook scope
2026-06-16 17:09:26 +08:00
Bai
fc0d5e2d33
fix: flash msg page redirect_url safe check
2026-06-16 17:06:31 +08:00
feng
88daad0a6e
perf: translate
2026-06-16 16:27:24 +08:00
ibuler
c80fbdfd32
Merge branch 'osm' of github.com:jumpserver/jumpserver into osm
2026-06-16 15:52:09 +08:00
ibuler
2241e641a6
perf: update site url
2026-06-16 15:51:54 +08:00
ibuler
bca4578d99
perf: update migrate
2026-06-16 15:35:10 +08:00
feng
b5c8a7dd60
perf: translate
2026-06-15 18:03:55 +08:00
ibuler
23ddd036c3
perf: update config after migrate
2026-06-15 16:51:15 +08:00
ibuler
b5ee575fd7
perf: change lang trans
2026-06-15 16:27:11 +08:00
ibuler
7e83c36288
Merge branch 'osm' of github.com:jumpserver/jumpserver into osm
2026-06-15 15:43:17 +08:00
ibuler
9a146780c7
perf: remove video player download
2026-06-15 15:42:59 +08:00
Bai
d3ca87418c
fix: sys-site-msg support revoke
2026-06-15 14:47:49 +08:00
ibuler
969cfd27cd
Merge branch 'dev_osm' of github.com:jumpserver/jumpserver into dev_osm
2026-06-15 14:03:11 +08:00
