Commit Graph

2294 Commits

Author SHA1 Message Date
jzxc95 a6f0a538d0 后端没有连通性检测接口,暂时屏蔽 2023-11-13 15:46:28 +08:00
jzxc95 569963c2ac merge:合并最新代码 2023-11-13 14:05:05 +08:00
赵世旭 50408bf5ec Merge branch '1030' into 'yhkylin/v101'
update changelog

See merge request kylinos-src/kylin-nm!293
2023-11-01 07:33:58 +00:00
jzxc95 855f4780d0 update changelog 2023-11-01 15:34:22 +08:00
赵世旭 730e7ad3c6 Merge branch '0928-up' into 'yhkylin/v101'
feat: 内网连通性检测需求(#23680)

See merge request kylinos-src/kylin-nm!292
2023-11-01 02:46:53 +00:00
jzxc95 a070c22449 Merge branch 'yhkylin/v101' of https://gitlab2.kylin.com/kylinos-src/kylin-nm into 0928-up 2023-11-01 10:39:11 +08:00
jzxc95 aae488426c fix(icon):修改内网检测地址后,图标相应变化(#197648) 2023-11-01 10:38:24 +08:00
赵世旭 66dead1840 Merge branch '1018' into 'yhkylin/v101'
update changelog

See merge request kylinos-src/kylin-nm!290
2023-10-18 06:53:52 +00:00
jzxc95 9a8de3ed1a update changelog 2023-10-18 14:54:12 +08:00
赵世旭 c81d6a4f59 Merge branch 'v101-1008' into 'yhkylin/v101'
pref(ui): 单网卡显示优化(story#18148)

See merge request kylinos-src/kylin-nm!282
2023-10-18 06:44:13 +00:00
赵世旭 8c725e0ad1 Merge branch '1018' into 'yhkylin/v101'
fix(display):wayland display(#197411)

See merge request kylinos-src/kylin-nm!289
2023-10-18 06:21:42 +00:00
jzxc95 e98839feed fix(display):wayland display(#197411) 2023-10-18 14:20:36 +08:00
jzxc95 ebfe2ebf21 feat(connectivity):add connectivity detect page(#23680) 2023-10-17 10:08:04 +08:00
zhangyuanyuan1 a85a549082 fix(wlan device combobox): modify logic of device combobox display 2023-10-09 10:17:53 +08:00
zhangyuanyuan1 7ce857f0c8 pref(托盘界面): 调整托盘界面单网卡显示(story#18148) 2023-10-08 17:41:06 +08:00
zhangyuanyuan1 a771281f6b perf(plugins): 调整控制面板界面单网卡显示(story#18148) 2023-10-08 17:24:22 +08:00
赵世旭 389ebb35de Merge branch 'yhkylin/v101-2303' into 'yhkylin/v101'
合并2303改动 单例&多display

See merge request kylinos-src/kylin-nm!281
2023-10-08 06:55:59 +00:00
赵世旭 de12fe6166 Merge branch '0928-up' into 'yhkylin/v101-2303'
update changelog

See merge request kylinos-src/kylin-nm!280
2023-09-28 06:12:46 +00:00
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