Albert Vaca
|
c7c1974ea9
|
Merge branch 'master' into frameworks
Conflicts:
core/backends/lan/lanlinkprovider.cpp
plugins/ping/pingplugin.h
plugins/telephony/telephonyplugin.cpp
|
2015-01-10 20:14:01 -08:00 |
|
Pramod Dematagoda
|
0779377337
|
Added a plugin to inhibit the screensaver when a device is connected.
The inhibition is lifted when the plugin disconnects.
REVIEW: 121692
|
2014-12-29 23:31:25 -08:00 |
|
Albert Vaca
|
a58fab4fb3
|
Merge branch 'master' into frameworks
Conflicts:
cli/kdeconnect-cli.cpp
core/device.cpp
core/filetransferjob.cpp
core/filetransferjob.h
core/networkpackage.h
kded/CMakeLists.txt
plugins/share/shareplugin.cpp
plugins/telephony/telephonyplugin.cpp
|
2014-11-11 21:40:54 -08:00 |
|
Albert Vaca
|
7d3fe6239c
|
Updating .notifyrc file
|
2014-11-09 20:36:45 -08:00 |
|
Aleix Pol
|
1a1969f42f
|
Port to new QCA cmake structure, now it's called Qca
and the target name is qca
|
2014-09-23 20:05:22 +02:00 |
|
Albert Vaca
|
a303b73238
|
Merge branch 'master' into frameworks
Conflicts:
cli/kdeconnect-cli.cpp
core/CMakeLists.txt
plasmoid/package/contents/ui/FullRepresentation.qml
plugins/ping/pingplugin.cpp
|
2014-07-01 23:59:38 +02:00 |
|
Ahmed Ibrahim Khalil
|
d14b4411cd
|
Implementation of mousepad plugin
CCMAIL: ahmedibrahimkhali@gmail.com
|
2014-06-27 15:43:34 +02:00 |
|
Aleix Pol
|
349a42cf16
|
Port libraries to translation domains
|
2014-06-18 02:49:07 +02:00 |
|
Aleix Pol
|
741abafaf7
|
Move the plugins into a different top-ĺevel directory
Reviewed by Albert Vaca
|
2014-06-14 16:34:11 +02:00 |
|