tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3953 commits 81 branches 117 tags 12 MiB
Commit graph

124 commits

Author SHA1 Message Date
Wojciech Stachurski
755091b447 Assign notification area category 
Summary: This is a supplement for D11352.

Reviewers: #plasma, #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D11751
 2018-04-23 22:33:04 +02:00
l10n daemon script
6f224477e7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2018-02-17 05:01:18 +01:00
l10n daemon script
057a114629 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-09-19 04:58:52 +02:00
l10n daemon script
dadcc76841 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-08-06 06:02:06 +02:00
l10n daemon script
cc43a72884 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-07-14 05:43:50 +02:00
l10n daemon script
36269e6506 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-06-20 04:26:54 +02:00
l10n daemon script
0d217c58e1 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-05-27 04:22:53 +02:00
l10n daemon script
fd64a8bcc7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-01-06 05:54:14 +01:00
Raymond Wooninck
0023a3297d Remove depreciated Servicetypes from metadata.desktop 2016-12-22 16:10:55 +01:00
l10n daemon script
e6a7df25aa SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-12-20 12:45:03 +01:00
l10n daemon script
b4e008847a SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-11-25 04:58:17 +01:00
l10n daemon script
73c6e1a306 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-11-24 05:29:38 +01:00
l10n daemon script
f0eb32c350 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-10-19 09:02:51 +00:00
l10n daemon script
3be06839a8 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-10-11 13:08:45 +00:00
l10n daemon script
ec0ca3976d SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-09-29 12:27:06 +00:00
l10n daemon script
2664b99864 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-08-30 10:03:14 +00:00
l10n daemon script
ae766f5839 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-08-04 12:30:52 +00:00
l10n daemon script
60c3bf9b90 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-06-22 16:33:04 +00:00
l10n daemon script
f6724de704 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-02-14 09:18:22 +00:00
l10n daemon script
5eb9a54bcc SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-02-05 09:16:28 +00:00
l10n daemon script
2b9217fab3 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-01-17 10:49:15 +00:00
l10n daemon script
f9f7f2bbcb SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2016-01-16 10:23:35 +00:00
l10n daemon script
fc2bd97e69 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-11-17 12:54:36 +00:00
l10n daemon script
0145c837db SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-11-11 10:30:30 +00:00
l10n daemon script
e424bcec1a SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-11-04 17:00:05 +00:00
l10n daemon script
633952b638 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-10-27 12:30:00 +00:00
l10n daemon script
dda5ec5385 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-10-26 03:37:32 +00:00
l10n daemon script
4239b0525b SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-10-25 03:57:27 +00:00
l10n daemon script
9f291d9ef7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-10-02 10:15:24 +00:00
l10n daemon script
d33800a748 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-09-17 11:59:25 +00:00
l10n daemon script
5795e27191 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-09-10 11:33:23 +00:00
l10n daemon script
af97d4476c SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-09-08 12:50:45 +00:00
l10n daemon script
8349588c77 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-04-06 09:54:12 +00:00
l10n daemon script
92cd693566 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-03-29 09:58:52 +00:00
l10n daemon script
08eaaf11e1 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2015-03-25 09:09:47 +00:00
Aleix Pol
21ab5a4f81 Merge branch 'master' into frameworks 
Mostly kDebug -> qCDebug
Also some KCmdLineArgs -> QCommandLineParser

Conflicts:
	cli/kdeconnect-cli.cpp
	core/CMakeLists.txt
	core/backends/lan/lanlinkprovider.cpp
	core/daemon.cpp
	core/pluginloader.cpp
	interfaces/CMakeLists.txt
	kio/kiokdeconnect.cpp
	plugins/mousepad/CMakeLists.txt
	plugins/mousepad/mousepadplugin.h
	plugins/mpriscontrol/mpriscontrolplugin.cpp
	plugins/sftp/sftpplugin.cpp
 2014-11-04 19:12:29 +01:00
l10n daemon script
3b192ea18e SVN_SILENT made messages (.desktop file) 2014-11-02 04:01:28 +00:00
Elias Probst
16f2251019 Streamline internal naming (kdeconnect → org.kde.kdeconnect) 
- correct PluginName in metadata
- correct plasmoid installation directory
- correct appName in aboutData
- remove trailing whitespace.

REVIEW: 119937
 2014-08-26 01:37:35 +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
l10n daemon script
7bbf49cc61 SVN_SILENT made messages (.desktop file) 2014-06-21 04:25:08 +00:00
Aleix Pol
16aaa9f77c Merge branch 'master' into frameworks 2014-06-21 02:06:50 +02:00
Aleix Pol
cb23fc1691 Change plasmoid name capitalization 
It looks better when we display it to the end-user, which happens quite
easily in Plasma Next.
 2014-06-21 02:04:28 +02:00
Aleix Pol
3e74a97304 Port plasmoid to Plasma Next 2014-06-18 02:35:48 +02:00
l10n daemon script
c641fd50c0 SVN_SILENT made messages (.desktop file) 2014-06-04 04:19:06 +00:00
l10n daemon script
ab3d38d677 SVN_SILENT made messages (.desktop file) 2014-05-31 04:21:12 +00:00
l10n daemon script
51429b9ebe SVN_SILENT made messages (.desktop file) 2014-03-29 04:57:06 +00:00
l10n daemon script
13970fed8b SVN_SILENT made messages (.desktop file) 2014-03-26 04:43:05 +00:00
l10n daemon script
b6475a8d37 SVN_SILENT made messages (.desktop file) 2014-03-24 04:36:04 +00:00
l10n daemon script
bd89104599 SVN_SILENT made messages (.desktop file) 2014-03-19 07:06:09 +00:00
l10n daemon script
b3bfb41f29 SVN_SILENT made messages (.desktop file) 2014-03-10 04:46:57 +00:00
Albert Vaca
29719ccce5 New icon by Malcer <malcer@gmx.com> 2014-02-19 21:10:41 +01:00
l10n daemon script
0ec9ea1706 SVN_SILENT made messages (.desktop file) 2014-02-19 05:17:04 +00:00
l10n daemon script
a64d6cd215 SVN_SILENT made messages (.desktop file) 2014-02-01 04:09:05 +00:00
Albert Vaca
1eb1ffdef2 Remove X-Plasma-DefaultSize= property in applet metadata files 2013-12-05 14:29:37 +01:00
l10n daemon script
e9a4e939ef SVN_SILENT made messages (.desktop file) 2013-11-25 04:11:57 +00:00
l10n daemon script
7e270bbc80 SVN_SILENT made messages (.desktop file) 2013-11-11 04:03:02 +00:00
l10n daemon script
714867d01d SVN_SILENT made messages (.desktop file) 2013-11-02 03:45:01 +00:00
l10n daemon script
b27651e2e6 SVN_SILENT made messages (.desktop file) 2013-10-14 04:20:28 +00:00
l10n daemon script
5119d17d6d SVN_SILENT made messages (.desktop file) 2013-10-11 04:30:46 +00:00
l10n daemon script
eb346a6d61 SVN_SILENT made messages (.desktop file) 2013-10-07 04:10:17 +00:00
l10n daemon script
7c9bda8d59 SVN_SILENT made messages (.desktop file) 2013-10-01 04:24:39 +00:00
Albert Vaca
ddad10016e Merge branch 'filetransfer-debug' 2013-10-01 03:20:29 +02:00
l10n daemon script
f7bf963efe SVN_SILENT made messages (.desktop file) 2013-09-27 04:29:59 +00:00
l10n daemon script
28f00e0371 SVN_SILENT made messages (.desktop file) 2013-09-20 16:02:43 +02:00
l10n daemon script
40c6ed7388 SVN_SILENT made messages (.desktop file) 2013-09-20 16:02:11 +02:00
l10n daemon script
a344022202 SVN_SILENT made messages (.desktop file) 2013-09-19 04:15:35 +00:00
l10n daemon script
874ac43dab SVN_SILENT made messages (.desktop file) 2013-09-15 04:17:17 +00:00
l10n daemon script
cc8261b849 SVN_SILENT made messages (.desktop file) 2013-09-14 04:02:16 +00:00
Albert Vaca
faf2b61f1d Plasmoid settings show kcm 2013-09-10 15:37:35 +02:00
Albert Vaca
87e949e3a3 Changed plasmoid description 
Old text was a stub :P
 2013-09-10 15:36:25 +02:00
Albert Vaca
14b35e05d3 Plasmoid settings show kcm 2013-09-09 18:24:32 +02:00
Albert Vaca
a9113e9604 Changed plasmoid description 
Old text was a stub :P
 2013-09-06 21:14:20 +02:00
Albert Vaca
8d40335182 First working implementation of notifications plasmoid 
Some fixes to libkdeconnect models
Added slot connected() to plugins
 2013-08-22 03:21:08 +02:00
Albert Vaca
60b3c3c1d4 Base source borrowed from device-notifier 2013-08-21 18:28:11 +02:00