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

1027 Commits

Author SHA1 Message Date
kangshuning 600555fef6 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into 1012 
1015 pull
 2021-10-15 11:51:50 +08:00
kangshuning 957cad7653 bug#83296 2021-10-15 11:50:41 +08:00
jzxc95 9af122ceaf Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-10-15 10:48:56 +08:00
jzxc95 6a0806dae0 out arg 2021-10-15 09:21:52 +08:00
king 10ae024e48 Merge remote-tracking branch 'refs/remotes/upstream/dbus-interface' into d-interface 2021-10-15 09:14:20 +08:00
ren peijia 24fa8f1fe9 Merge branch '1012' into 'dbus-interface' 
add delay

See merge request kylin-desktop/kylin-nm!320
 2021-10-15 01:10:00 +00:00
ren peijia 814752f446 Merge branch 'dev3.1' into 'dbus-interface' 
simplify translation methods； Ignore dependent details to prevent compilation errors

See merge request kylin-desktop/kylin-nm!319
 2021-10-15 00:52:08 +00:00
king 1705488d60 Fix:the wlanitem show bug 10-14 2021-10-14 20:53:14 +08:00
jzxc95 808613285c remove useless code 2021-10-14 20:33:09 +08:00
jzxc95 92efbe52c3 add device name when actvating or deactivating && lan list sort 2021-10-14 20:30:53 +08:00
kangshuning 7aa0c68525 update icon 2021-10-14 09:56:27 +08:00
fensite 1b1ac4a0b1 simplify translation methods； Ignore dependent details to prevent compilation errors 
简化翻译加载方式；忽略依赖的详情以防止编译报错
 2021-10-14 09:03:05 +08:00
king d2e035ed8a trayIcon and itemshow bug 2021-10-13 21:05:32 +08:00
kangshuning 26bf3bf216 bug#81259:delay 2021-10-13 13:54:57 +08:00
ren peijia b1690dc2ec Merge branch '1012' into 'dbus-interface' 
update translation

See merge request kylin-desktop/kylin-nm!311
 2021-10-13 01:00:18 +00:00
kangshuning 35cbd19864 update translation 2021-10-13 08:53:37 +08:00
ren peijia 23c6004659 Merge branch 'up-dbus' into 'dbus-interface' 
Up dbus

See merge request kylin-desktop/kylin-nm!310
 2021-10-12 12:49:13 +00:00
ren peijia 32ce39d737 Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:bug#84473

See merge request kylin-desktop/kylin-nm!308
 2021-10-12 12:47:55 +00:00
jzxc95 ac5ed03294 add scan dbus 2021-10-12 19:01:31 +08:00
jxj 0161531376 Fix:bug#84473 2021-10-12 17:30:58 +08:00
jzxc95 205bd5b3c5 解决控制面板调用属性页的问题和直接删除配置控制面板不断连问题 2021-10-11 15:24:42 +08:00
ren peijia 0e19d97a88 Merge branch '0930-new' into 'dbus-interface' 
Delete useless files.

See merge request kylin-desktop/kylin-nm!298
 2021-10-11 02:11:41 +00:00
ren peijia a6d1cd6969 Merge branch '1008-new' into 'dbus-interface' 
Fix bug

See merge request kylin-desktop/kylin-nm!300
 2021-10-11 02:10:33 +00:00
Zhang Jiaping 9c9a65759d Merge branch 'dbus-interface' into '1008-new' 
# Conflicts:
#   src/frontend/list-items/wlanlistitem.cpp
 2021-10-11 01:44:08 +00:00
zhangjiaping d4fb9b05b6 resolv conflict. 2021-10-11 09:41:09 +08:00
ren peijia 88c313a801 Merge branch 'dbus-interface' into 'dbus-interface' 
bug#83877#83495#83487#83312 10-08

See merge request kylin-desktop/kylin-nm!303
 2021-10-11 01:25:16 +00:00
jinxujie 0b2d010bb8 bug#83877#83495#83487#83312 10-08 2021-10-08 21:01:15 +08:00
ren peijia e5c5cee195 Merge branch 'kylin-nm-lan-switch' into 'dbus-interface' 
修改有线代码中发现的一些问题

See merge request kylin-desktop/kylin-nm!301
 2021-10-08 09:56:40 +00:00
zhangjiaping bbae955f1c Fix:#83887 2021-10-08 14:32:03 +08:00
zhangjiaping 97b650dc0c Fix:#83636 2021-10-08 13:55:59 +08:00
renpeijia 9b313a2272 Merge branch 'ukui-dbus-interface' into kylin-nm-lan-switch 2021-10-08 13:52:40 +08:00
ren peijia 0c9577e568 Merge branch '0929' into 'kylin-nm-lan-switch' 
connection change to currentDevice

See merge request renpeijia/kylin-nm!1
 2021-10-08 03:43:03 +00:00
zhangjiaping c0d2a259c2 Fix:#83378 #84147 2021-10-08 11:38:58 +08:00
kangshuning 87f205b31b connection change to currentDevice 2021-10-08 11:17:49 +08:00
Zhang Jiaping 45f4817cfb Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:wlanpage refresh and close wifiswitchbutton

See merge request kylin-desktop/kylin-nm!299
 2021-10-08 01:24:35 +00:00
Zhang Jiaping 333272daed Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:#83335 #83336 #83709

See merge request kylin-desktop/kylin-nm!294
 2021-10-08 01:21:30 +00:00
Zhang Jiaping 1a7927e53d Merge branch '0929-new' into 'dbus-interface' 
bug#83002#83284

See merge request kylin-desktop/kylin-nm!293
 2021-10-08 01:07:28 +00:00
renpeijia 360ee2a96e fix:the lan area show error list, when change name of activate connection and disactivate the connection. 2021-09-30 19:32:03 +08:00
jinxujie e497f99c1b Fix:wlanpage refresh and close wifiswitchbutton 2021-09-30 17:23:37 +08:00
renpeijia 9e5a79fcf3 fix:1)it will crash,when it's name is changed. 
2)it will not change name, when it's name is cahnged.
 2021-09-30 14:48:42 +08:00
zhangjiaping b7c93803e1 Delete useless files. 2021-09-30 11:09:56 +08:00
renpeijia 112572cc4d modify: it can not show connection list, when add wired device. 2021-09-30 08:59:22 +08:00
ren peijia d6b43dfddd Merge branch 'up-dbus' into 'dbus-interface' 
Up dbus

See merge request kylin-desktop/kylin-nm!296
 2021-09-29 09:16:48 +00:00
jzxc95 b0e6c79906 格式修改 2021-09-29 16:56:57 +08:00
jzxc95 d3c0ac06a6 fixed:control center show detail page info wrong && add key-ring 2021-09-29 16:40:09 +08:00
Zhang Jiaping e1788e262c Merge branch 'dbus-interface' into 'dbus-interface' 
Fix:bug#83125#83143#81343

See merge request kylin-desktop/kylin-nm!290
 2021-09-29 08:13:57 +00:00
zhangjiaping ea55b6735e Fix:#83335 #83336 #83709 2021-09-29 15:19:10 +08:00
kangshuning b883cb5896 bug#83002#83284 2021-09-29 15:13:47 +08:00
jzxc95 f483d7c5b2 Merge branch 'dbus-interface' of http://gitlab2.kylin.com/kylin-desktop/kylin-nm into up-dbus 2021-09-29 14:46:59 +08:00
jzxc95 2326bb2fab 限制新建名称最长32位 2021-09-29 14:46:48 +08:00