Commit Graph

1815 Commits

Author SHA1 Message Date
zhangyuanyuan1 b7aa610c36 更新企业网页面翻译 2022-10-31 16:39:05 +08:00
chenxuechao dfd834fafb 新增VPN dbus接口,删除多余代码 2022-10-27 09:15:37 +08:00
zhangyuanyuan1 76db59ecef 多DNS按钮逻辑调整 删除无效代码 2022-10-25 10:53:57 +08:00
zhaoshixu 2f9c41d0c5
!10 解决因有线连接没有指定网卡造成的VPN崩溃问题
Merge pull request !10 from chenxuechao/openkylin/yangtze-fork
2022-10-21 08:49:23 +00:00
chenxuechao 8a3158268a 修改changelog 2022-10-21 16:37:22 +08:00
chenxuechao 43df804cab 解决因有线连接没有指定网卡造成的VPN崩溃问题 2022-10-21 16:35:05 +08:00
赵世旭 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
zhaoshixu 268b3fe4df
!9 合并3.22 vpn需求
Merge pull request !9 from zhaoshixu/1020-ok
2022-10-20 12:27:40 +00:00
chenxuechao 4b8ad410a9 vpn merge 2022-10-20 20:22:42 +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
zhaoshixu c8e801e65c
!8 合并3.22 需求
Merge pull request !8 from zhaoshixu/3.22
2022-10-20 02:26:48 +00:00
zhaoshixu 68150b4c36 fix segament fault 2022-10-19 13:45:49 +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
zhaoshixu a6dad2d75e 同步3.22需求 2022-10-19 10:04:47 +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