Commit Graph

2260 Commits

Author SHA1 Message Date
zhaoshixu a5e9fad934
!56 合并主线代码
Merge pull request !56 from zhaoshixu/0922-ok
2023-09-26 06:56:35 +00:00
jzxc95 ba5b609fcf merge:合并代码 2023-09-26 14:55:26 +08:00
jzxc95 3a9a41c08f merge:解决冲突 2023-09-26 09:46:37 +08:00
jzxc95 940569f7e1 Merge branch '0922-ok' of https://gitee.com/openkylin/kylin-nm into 0923 2023-09-22 18:21:54 +08:00
jzxc95 a7566033f9 fix:暂时屏蔽dns高级设置(开源后端无相关接口) 2023-09-22 17:54:21 +08:00
jzxc95 c051d72b6b merge(代码合并):合并主线代码,更新upstream 2023-09-20 15:59:02 +08:00
赵世旭 520bd25635 Merge branch '0918-up' into 'yhkylin/v101'
update changelog

See merge request kylinos-src/kylin-nm!271
2023-09-18 09:17:32 +00:00
jzxc95 0dfbb271a1 update changelog 2023-09-18 16:58:25 +08:00
赵世旭 923687cf41 Merge branch '0918' into 'yhkylin/v101'
fix(device switch):单网卡开关改为后端新提供的SetStatusDevice接口(#186655)

See merge request kylinos-src/kylin-nm!270
2023-09-18 03:37:56 +00:00
赵世旭 8158a43149 Merge branch '2309-0915' into 'yhkylin/v101'
fix(ui): hide minimize button for detailpage(bug#193349 #191910)

See merge request kylinos-src/kylin-nm!269
2023-09-18 03:37:32 +00:00
赵世旭 e54646913e Merge branch '2309-0912' into 'yhkylin/v101'
fix(ui): modify translation

See merge request kylinos-src/kylin-nm!268
2023-09-18 03:34:46 +00:00
jzxc95 25c1ca9692 fix(device switch):单网卡开关改为后端新提供的SetStatusDevice接口(#186655) 2023-09-18 11:30:46 +08:00
zhangyuanyuan1 e4ff9e5a64 fix(ui): hide minimize button for detailpage(bug#193349 #191910) 2023-09-18 09:40:42 +08:00
zhangyuanyuan1 7e15f9ad4c pref(listitem): delete duplicate signal-slot connection 2023-09-15 15:53:25 +08:00
zhangyuanyuan1 ea7a2ad542 fix(ui): modify translation 2023-09-12 16:29:21 +08:00
赵世旭 c42e1cea6c Merge branch '0912-up' into 'yhkylin/v101'
update changelog

See merge request kylinos-src/kylin-nm!267
2023-09-12 06:33:40 +00:00
jzxc95 f4ae067791 update changelog 2023-09-12 14:33:07 +08:00
赵世旭 5c82645ebf Merge branch 'bug-191904' into 'yhkylin/v101'
fix(dns):dns初始化时输入格式限制(#191906、#191904)

See merge request kylinos-src/kylin-nm!266
2023-09-12 06:10:07 +00:00
jzxc95 956925ccc8 Merge branch 'yhkylin/v101' of https://gitlab2.kylin.com/kylinos-src/kylin-nm into 0911 2023-09-12 14:04:18 +08:00
赵世旭 468503dfab Merge branch 'bug-191241' into 'yhkylin/v101'
fix(kylin-nm):获取企业网密码增加超时时间500ms(#191241)

See merge request kylinos-src/kylin-nm!265
2023-09-12 06:01:53 +00:00
jzxc95 c5085b9bae fix(dns):dns初始化时输入格式限制(#191906、#191904) 2023-09-11 15:44:47 +08:00
jzxc95 905ec4a10f fix(kylin-nm):获取企业网密码增加超时时间500ms(#191241) 2023-09-11 10:41:34 +08:00
赵世旭 e33c0abce1 Merge branch '0908-up' into 'yhkylin/v101'
update changelog

See merge request kylinos-src/kylin-nm!264
2023-09-08 09:34:33 +00:00
jzxc95 55d3c12a88 update changelog 2023-09-08 17:33:36 +08:00
赵世旭 8ae3e2c276 Merge branch '2309-0908' into 'yhkylin/v101'
fix(ui): modify ui  bug#191017 #191371 #191793

See merge request kylinos-src/kylin-nm!263
2023-09-08 09:29:50 +00:00
赵世旭 9bfc4d65e0 Merge branch '0908' into 'yhkylin/v101'
fix(translation):add translation

See merge request kylinos-src/kylin-nm!262
2023-09-08 07:50:36 +00:00
zhangyuanyuan1 ca7657d542 fix(mobile hotspot ui): modify qlabel to fixlabel(bug#191793) 2023-09-08 15:46:22 +08:00
jzxc95 14162b4096 fix(translation):add translation 2023-09-08 15:14:29 +08:00
zhangyuanyuan1 203b5adba9 fix(ui): modify detail-config page layout(bug#191017 #191371) 2023-09-08 14:40:27 +08:00
赵世旭 ed3f207b0d Merge branch '190779' into 'yhkylin/v101'
fix(hotspot):when ap name length less then max length, no need to set text(#190799)

See merge request kylinos-src/kylin-nm!261
2023-09-08 06:18:27 +00:00
赵世旭 2df0d6e660 Merge branch '190706' into 'yhkylin/v101'
fix(ipconflict):add ipv4 conflict detect on create net page(#190706)

See merge request kylinos-src/kylin-nm!260
2023-09-08 06:17:41 +00:00
赵世旭 53dabb2d8d Merge branch '0904' into 'yhkylin/v101'
fix(hotspot):fix error when a wirless device do not support Adhoc(#190431)

See merge request kylinos-src/kylin-nm!255
2023-09-08 06:17:26 +00:00
赵世旭 b71fe5ca71 Merge branch '190546' into 'yhkylin/v101'
fix(tooltip):add dns setting page close button tooltip(#190546)

See merge request kylinos-src/kylin-nm!258
2023-09-08 06:06:34 +00:00
赵世旭 73e5ffb11f Merge branch '2309-0905' into 'yhkylin/v101'
fix(wlan): modify onConnectionUpdate method and add signal(bug#190099)

See merge request kylinos-src/kylin-nm!256
2023-09-08 06:05:20 +00:00
zhangyuanyuan1 5190d5e838 fix(wlan): modify onConnectionUpdate method and add signal(bug#190099) 2023-09-08 14:02:36 +08:00
赵世旭 5137314355 Merge branch '190696' into 'yhkylin/v101'
fix(vpn):连接时如果为其他虚拟网络类型,也可执行(#190696)

See merge request kylinos-src/kylin-nm!257
2023-09-08 05:52:03 +00:00
jzxc95 5c5d475747 :fix(vpn):连接时如果为其他虚拟网络类型,也可执行(#190696) 2023-09-08 11:34:55 +08:00
jzxc95 fc767c4730 fix(hotspot):when ap name length less then max length, no need to set text(#190799) 2023-09-06 17:33:57 +08:00
jzxc95 b80e5a4016 fix(ipconflict):add ipv4 conflict detect on create net page(#190706) 2023-09-06 17:14:37 +08:00
jzxc95 0389d87fc9 fix(tooltip):add dns setting page close button tooltip(#190546) 2023-09-06 15:04:25 +08:00
jzxc95 b3c74a6d1b 重写initInfobyssid 2023-09-05 15:46:50 +08:00
jzxc95 6d43fd00dd fix(hotspot):fix error when a wirless device do not support Adhoc(#190431) 2023-09-04 14:06:56 +08:00
赵世旭 45c1d17acb Merge branch '0825-core' into 'yhkylin/v101'
fix(segment fault):线程非正常退出导致的崩溃问题

See merge request kylinos-src/kylin-nm!252
2023-08-28 06:59:26 +00:00
jzxc95 b9be1fd219 update changelog 2023-08-25 17:37:49 +08:00
jzxc95 8f867f7562 perf(hotspot):避免不必要的调用 2023-08-25 17:34:33 +08:00
jzxc95 313397e0d3 fix(segment fault):线程非正常退出导致的崩溃问题 2023-08-25 17:32:09 +08:00
赵世旭 acb36fdbda Merge branch '0823' into 'yhkylin/v101'
update changelog

See merge request kylinos-src/kylin-nm!251
2023-08-23 09:33:18 +00:00
jzxc95 561dde0674 update changelog 2023-08-23 17:12:00 +08:00
赵世旭 923d8a9870 Merge branch '0823' into 'yhkylin/v101'
fix(hotspot):修正判断是否支持开放5G热点的接口(#188540 #185863)

See merge request kylinos-src/kylin-nm!250
2023-08-23 09:02:27 +00:00
jzxc95 d6cab4f3d2 fix(hotspot):修正判断是否支持开放5G热点的接口(#188540 #185863) 2023-08-23 16:59:44 +08:00