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

824 Commits

Author SHA1 Message Date
ren peijia ba6c9658ef Merge branch '0908' into 'dbus-interface' 
fix:解决连接不能连接的网络时，有时不能发出lisupdate的信号

See merge request kylin-desktop/kylin-nm!241
 2021-09-09 10:51:19 +00:00
zhouxiali 790753f99f fix:解决连接不能连接的网络时，有时不能发出lisupdate的信号 2021-09-09 15:22:03 +08:00
Zhang Jiaping f613c9c45e Merge branch '0907-new' into 'dbus-interface' 
Feature:Add device comboBox.

See merge request kylin-desktop/kylin-nm!237
 2021-09-08 07:32:41 +00:00
zhangjiaping bfd337d4a6 Feature:Add device comboBox. 2021-09-08 09:46:19 +08:00
Zhang Jiaping 568eb6f60f Merge branch 'up-dbus' into 'dbus-interface' 
add dbus interface

See merge request kylin-desktop/kylin-nm!220
 2021-09-07 01:12:36 +00:00
ren peijia e278f6b568 Merge branch '0903' into 'dbus-interface' 
网络详情页部分功能

See merge request kylin-desktop/kylin-nm!230
 2021-09-06 06:06:03 +00:00
zhouxiali 597a2111a5 格式修改 2021-09-06 14:01:07 +08:00
zhouxiali efc853119a 格式修改 2021-09-06 13:51:54 +08:00
zhouxiali 344d87be08 网络详情页部分功能 2021-09-03 17:49:47 +08:00
jzxc95 ddea801445 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-09-03 17:40:27 +08:00
ren peijia 03cbc44537 Merge branch '0902' into 'dbus-interface' 
界面布局调整

See merge request kylin-desktop/kylin-nm!224
 2021-09-03 09:29:14 +00:00
jzxc95 d1d8c7781e delay connect hotspot 2021-09-03 15:48:19 +08:00
jzxc95 52576c13dd 去除魔鬼数字 2021-09-03 11:52:24 +08:00
jzxc95 4d2eda8529 modify hotspot 2021-09-03 11:47:11 +08:00
Zhang Jiaping 07f2d467c0 Merge branch 'dbus-interface' into '0902' 
# Conflicts:
#   src/frontend/tools/radioitembutton.cpp
 2021-09-03 01:59:36 +00:00
Zhang Jiaping 265af0251a Merge branch '0901-new' into 'dbus-interface' 
Adjust UI according to blueprint.

See merge request kylin-desktop/kylin-nm!222
 2021-09-03 01:55:47 +00:00
ksn 4ab98f7cda 界面布局调整 2021-09-02 19:30:08 +08:00
jzxc95 2f8f8a9e4a Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-09-02 15:41:18 +08:00
jzxc95 b0e51ef5af wifi channel 2021-09-02 12:14:56 +08:00
jzxc95 e9d917c90d get hotpot info 2021-09-02 12:11:28 +08:00
jzxc95 6b972e007d hotpot connect && disconnect signal 2021-09-01 17:59:50 +08:00
zhangjiaping 84683f59ae Adjust UI according to blueprint. 2021-09-01 17:46:43 +08:00
jzxc95 22bf3af64b add dbus interface 2021-09-01 15:54:00 +08:00
zhangjiaping 16643e8d2a Optimize code. 2021-09-01 14:51:02 +08:00
Zhang Jiaping e3a67771a8 Merge branch '0826-jxj' into 'dbus-interface' 
Add radioitembutton feature

See merge request kylin-desktop/kylin-nm!216
 2021-09-01 06:48:49 +00:00
Zhang Jiaping aa15b6d7c7 Update radioitembutton.cpp 2021-09-01 06:47:12 +00:00
jinxujie f919fd6d00 Add radioitembutton feature 2021-08-31 11:16:02 +08:00
zhangjiaping 4c9aecfa24 Update control. 2021-08-30 10:44:55 +08:00
Kang Shuning 619e370a54 Merge branch '0827-new' into 'dbus-interface' 
Feature:Add wlan switch function.

See merge request kylin-desktop/kylin-nm!200
 2021-08-30 02:23:16 +00:00
ren peijia 631b061b92 Merge branch 'aa' into 'dbus-interface' 
解决获取无线列表时，数组越界问题

See merge request kylin-desktop/kylin-nm!202
 2021-08-27 09:27:39 +00:00
ksn d8de4ffb01 解决获取无线列表时，数组越界问题 2021-08-27 17:23:38 +08:00
zhangjiaping 8b27a51583 Feature:Add wlan switch function. 2021-08-27 15:48:07 +08:00
Zhang Jiaping 5d8a6f3b3d Merge branch '0828' into 'dbus-interface' 
无线按钮触发事件

See merge request kylin-desktop/kylin-nm!199
 2021-08-27 07:40:28 +00:00
zhouxiali d3cf1a49a1 无线按钮触发事件 2021-08-27 15:39:12 +08:00
Zhang Jiaping fe08cd36a0 Merge branch '0826' into 'dbus-interface' 
feature: 支持有线连接连接、断开、新增、删除功能

See merge request kylin-desktop/kylin-nm!193
 2021-08-27 07:19:16 +00:00
Kang Shuning 34ecf9c787 Merge branch '0827' into '0826' 
0827

See merge request kangshuning/kylin-nm!3
 2021-08-27 07:17:03 +00:00
ksn 9e196acd99 修改冲突文件 2021-08-27 15:15:49 +08:00
Kang Shuning 8d6cc89a28 Merge branch '0827' into '0826' 
格式修改

See merge request kangshuning/kylin-nm!2
 2021-08-27 06:55:32 +00:00
ksn db93d2c498 格式修改 2021-08-27 14:54:28 +08:00
ren peijia 145b8e2102 Merge branch '0826-jxj' into 'dbus-interface' 
Feature: Function of connecting/disconnecting wlan.

See merge request kylin-desktop/kylin-nm!197
 2021-08-27 06:33:00 +00:00
jinxujie d98122b677 Optimize code. 2021-08-27 11:39:36 +08:00
jinxujie e54c6465cc Feature: Function of connecting/disconnecting wlan. 2021-08-27 10:54:37 +08:00
Zhang Jiaping 9ab5539561 Merge branch 'new-dbus' into 'dbus-interface' 
update default device && add getssid method

See merge request kylin-desktop/kylin-nm!194
 2021-08-27 01:02:55 +00:00
jzxc95 7786c3cab3 merge 2021-08-26 14:43:27 +08:00
jzxc95 a700ca7ee5 网线插拔对默认网卡的设置 2021-08-26 14:19:18 +08:00
zhou xiali fe64ffca4a Merge branch '3.1-0826' into '0826' 
后端代码同步更新

See merge request kangshuning/kylin-nm!1
 2021-08-26 05:50:23 +00:00
zhouxiali 5a565f5705 后端代码同步更新 2021-08-26 13:47:48 +08:00
jzxc95 fefc33372d update default device && add getssid method 2021-08-26 12:16:38 +08:00
ksn 8ad37e4a43 feature: 支持有线连接连接、断开、新增、删除功能 2021-08-26 11:26:41 +08:00
ren peijia d372242deb Merge branch 'new-dbus' into 'dbus-interface' 
fix segmentation fault

See merge request kylin-desktop/kylin-nm!192
 2021-08-26 02:58:06 +00:00