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

1732 Commits

Author SHA1 Message Date
赵世旭 1cf2aeb8ca Merge branch '1021-tablet' into 'yhkylin/v101-tablet' 
fix 143364

See merge request kylinos-src/kylin-nm!15
 2022-10-21 08:34:38 +00:00
jzxc95 cd19f858b7 fix 143364 2022-10-21 16:32:14 +08:00
赵世旭 2dfe5479b0 Merge branch 'yhkylin/v101-tablet-fork' into 'yhkylin/v101-tablet' 
解决平板设备外接有线网卡，再拔掉网卡前端网络的崩溃问题

See merge request kylinos-src/kylin-nm!14
 2022-10-21 07:22:27 +00:00
chenxuechao 37a510da0d 更新changelog 2022-10-21 15:21:48 +08:00
chenxuechao 87f2ec7c84 解决平板设备外接有线网卡，再拔掉网卡前端网络的崩溃问题 2022-10-21 15:13:48 +08:00
赵世旭 55491edece Merge branch '1021-tablet' into 'yhkylin/v101-tablet' 
fix build error

See merge request kylinos-src/kylin-nm!13
 2022-10-21 06:19:12 +00:00
jzxc95 3f0ce2a0b7 fix build error 2022-10-21 14:19:10 +08:00
赵世旭 548c223e37 Merge branch '1021-tablet' into 'yhkylin/v101-tablet' 
1021 tablet

See merge request kylinos-src/kylin-nm!12
 2022-10-21 05:41:10 +00:00
jzxc95 ed7c6f08da update change;og 2022-10-21 13:40:47 +08:00
jzxc95 72ca367c65 fix build error 2022-10-21 13:39:45 +08:00
赵世旭 9b62befa55 Merge branch '1021-tablet' into 'yhkylin/v101-tablet' 
1021 tablet

See merge request kylinos-src/kylin-nm!11
 2022-10-21 03:27:29 +00:00
jzxc95 1e23f4917b update changelog 2022-10-21 11:17:33 +08:00
jzxc95 264bf84b97 fix bug 143364 2022-10-21 11:12:04 +08:00
赵世旭 ab2f346c1d Merge branch '1020' into 'yhkylin/v101-tablet' 
update changelog

See merge request kylinos-src/kylin-nm!9
 2022-10-20 11:51:50 +00:00
zhaoshixu 605b5b726b update changelog 2022-10-20 19:50:54 +08:00
赵世旭 3063ac6127 Merge branch 'yhkylin/v101-tablet-fork' into 'yhkylin/v101-tablet' 
开发需求109637,前端网络增加VPN托盘

See merge request kylinos-src/kylin-nm!8
 2022-10-20 11:41:26 +00:00
chenxuechao 8dfbacd5f6 开发需求109637,前端网络增加VPN托盘 2022-10-20 19:25:33 +08:00
赵世旭 ea2a3b7dbe Merge branch '1019-tablet' into 'yhkylin/v101-tablet' 
1019 tablet

See merge request kylinos-src/kylin-nm!5
 2022-10-19 05:43:56 +00:00
zhaoshixu fadba3608f fix segament fault 2022-10-19 13:34:22 +08:00
zhaoshixu 9f584959e6 fix bug 143364 2022-10-19 10:38:16 +08:00
zhaoshixu 04b48ec43f 3.22需求&&同步主线代码 2022-10-19 10:36:35 +08:00
赵世旭 6b88de7b42 Merge branch 'y2209bug' into 'dbus-interface' 
fix bug 140561

See merge request kylin-desktop/kylin-nm!731
 2022-10-18 07:15:14 +00:00
zhangyuanyuan1 702332be05 fix bug 140561 2022-10-18 14:52:32 +08:00
赵世旭 3af4488c9a Merge branch 'plugin-zdev' into 'dbus-interface' 
Task #107168: 控制面板网络状态显示 网络连接/断开/删除入口功能优化

See merge request kylin-desktop/kylin-nm!707
 2022-10-18 04:00:08 +00:00
赵世旭 1435fed3ef Merge branch 'multiple-dns' into 'dbus-interface' 
Task #107168: 多个DNS

See merge request kylin-desktop/kylin-nm!729
 2022-10-18 04:00:01 +00:00
zhangyuanyuan1 8b5fb65f50 DNS不完全输入 双击可编辑问题 2022-10-18 11:46:55 +08:00
zhangyuanyuan1 927282c5aa 合并冲突 2022-10-17 14:41:09 +08:00
zhangyuanyuan1 91c99a6e82 新建有线网络 必填提示 2022-10-17 11:42:17 +08:00
zhangyuanyuan1 9ea4fb823a 更新翻译 2022-10-14 17:40:48 +08:00
zhangyuanyuan1 766f920bc8 多DNS界面优化 2022-10-14 17:40:20 +08:00
赵世旭 bd7e1dc447 Merge branch 'dbus-interface-fork' into 'dbus-interface' 
新增kylin-nm代理部分藏文翻译，去掉不应翻译的词条

See merge request kylin-desktop/kylin-nm!727
 2022-10-13 08:16:55 +00:00
chenxuechao 6ba6cfaea4 新增kylin-nm代理部分藏文翻译，去掉不应翻译的词条 2022-10-13 15:47:33 +08:00
赵世旭 4ffa0eb4fe Merge branch 'y2209bug' into 'dbus-interface' 
ui间距调整 bug 141204 140441 143412

See merge request kylin-desktop/kylin-nm!726
 2022-10-13 06:25:56 +00:00
赵世旭 ec6ccc6267 Merge branch 'approxy' into 'dbus-interface' 
应用代理ui适配

See merge request kylin-desktop/kylin-nm!719
 2022-10-13 06:25:45 +00:00
张圆圆 9efb55180b Update plugins/proxy/proxy.cpp 2022-10-13 05:59:14 +00:00
zhangyuanyuan1 38e7bc50fb dbus reply 合法性检查 2022-10-13 11:41:56 +08:00
zhangyuanyuan1 6ff370056a Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into approxy 2022-10-13 11:39:15 +08:00
zhangyuanyuan1 9496fb36c5 网络防火墙配置弹居中窗 2022-10-13 11:09:27 +08:00
zhangyuanyuan1 cb3fbb5eac ui间距调整 2022-10-13 09:47:44 +08:00
赵世旭 a75e820cc1 Merge branch '1011-up' into 'dbus-interface' 
fix bug 143422

See merge request kylin-desktop/kylin-nm!725
 2022-10-12 07:26:16 +00:00
jzxc95 552579de1d fix bug 143422 2022-10-12 15:25:17 +08:00
赵世旭 2b4f676117 Merge branch '1010' into 'dbus-interface' 
fix bug 143023

See merge request kylin-desktop/kylin-nm!723
 2022-10-10 03:12:22 +00:00
赵世旭 3af0ff9eac Merge branch 'y2209bug' into 'dbus-interface' 
QGSettings判空 设置托盘内圆角半径

See merge request kylin-desktop/kylin-nm!722
 2022-10-10 03:11:59 +00:00
jzxc95 ff5fba7afd fix bug 143023 2022-10-10 09:48:40 +08:00
zhangyuanyuan1 0c893731c6 QGSettingsa判空 设置托盘内圆角半径 2022-10-09 16:12:28 +08:00
赵世旭 311ef6aa13 Merge branch 'tabbartooltip' into 'dbus-interface' 
bug 132105 set ktabbar tooltip

See merge request kylin-desktop/kylin-nm!720
 2022-10-08 01:26:32 +00:00
kylin 0ead844ae7 bug 132105 set ktabbar tooltip 2022-10-01 16:46:27 +08:00
zhaoshixu 283478537e update version 2022-09-30 13:59:01 +08:00
zhaoshixu 1ee3ff0222 update changelog && control 2022-09-30 13:23:16 +08:00
赵世旭 e076b8be07 Merge branch '0926' into 'dbus-interface' 
fix bug:140403

See merge request kylin-desktop/kylin-nm!717
 2022-09-28 01:50:48 +00:00