openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,326 Commits 29 Branches 46 Tags 44 MiB
Commit Graph

2326 Commits

Author SHA1 Message Date
jzxc95 c7cb51b17f update changelog 2023-09-28 14:12:34 +08:00
赵世旭 b4298949bd Merge branch 'bug-194718' into 'yhkylin/v101-2303' 
fix(display):多display显示适配 (#194718)

See merge request kylinos-src/kylin-nm!279
 2023-09-28 06:09:37 +00:00
jzxc95 71741d538b merge:同步代码 解决冲突 2023-09-28 14:08:21 +08:00
jzxc95 58f5d4d27a fix(display):多display显示适配(#194718) 2023-09-28 14:05:23 +08:00
赵世旭 586c1ffec2 Merge branch '0928' into 'yhkylin/v101-2303' 
fix(单例):使用QtSingleApplication处理单例

See merge request kylinos-src/kylin-nm!277
 2023-09-28 01:47:35 +00:00
jzxc95 0e88ecccf8 fix(单例):使用QtSingleApplication处理单例 2023-09-28 09:46:24 +08:00
赵世旭 dfd58e3f61 Merge branch '0926-up' into 'yhkylin/v101' 
update changelog

See merge request kylinos-src/kylin-nm!276
 2023-09-26 09:50:50 +00:00
jzxc95 8d98e36056 update changelog 2023-09-26 17:47:32 +08:00
赵世旭 d87f99ea9f Merge branch 'bug-195043' into 'yhkylin/v101' 
fix(hotspot):无线网卡热点能力判断修改(#195043)

See merge request kylinos-src/kylin-nm!275
 2023-09-26 09:37:13 +00:00
jzxc95 890e3ca577 fix(hotspot):无线网卡热点能力判断修改(#195043) 2023-09-26 16:01:46 +08:00
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
赵世旭 2061a0a35e Merge branch '2309-0922' into 'yhkylin/v101' 
fix(ui): modify ui of system proxy manual mode(bug#190970 #190975)

See merge request kylinos-src/kylin-nm!272
 2023-09-26 06:49:11 +00:00
赵世旭 c844a3b539 Merge branch '2309-0922pm' into 'yhkylin/v101' 
pref(ui): 自定义托盘无线密码框色板，覆盖KPasswordEdit默认色板(bug#191685)

See merge request kylinos-src/kylin-nm!273
 2023-09-26 06:49:06 +00:00
赵世旭 baeb261ad5 Merge branch '2309-0925' into 'yhkylin/v101' 
fix(ui): set firewall dialog to skip taskbar, modify main logic(bug#194718)

See merge request kylinos-src/kylin-nm!274
 2023-09-26 06:49:00 +00:00
zhangyuanyuan1 435749c5c7 fix(ui): set firewall dialog to skip taskbar, modify main logic(bug#194718) 2023-09-26 10:38:51 +08:00
jzxc95 3a9a41c08f merge:解决冲突 2023-09-26 09:46:37 +08:00
zhangyuanyuan1 259aadfbf6 pref(ui): 自定义托盘无线密码框色板，覆盖KPasswordEdit默认色板(bug#191685) 2023-09-25 17:16:53 +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
zhangyuanyuan1 641e80d184 fix(ui): modify ui of system proxy manual mode(bug#190970 #190975) 2023-09-22 10:30:12 +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