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

156 commits

Author SHA1 Message Date
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
e6a759a071 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-01 12:31:29 +00:00
l10n daemon script
a794d51c4e 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-07-21 15:07:44 +00:00
l10n daemon script
7d514bdd29 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-06-30 13:47:48 +00:00
l10n daemon script
69d8a40aa6 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-06-24 10:38:32 +00:00
l10n daemon script
d8b3d829e4 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-06-20 11:56:14 +00:00
l10n daemon script
700eff446e 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-06-18 11:49:24 +00:00
l10n daemon script
4ed16c9f49 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-06-17 10:08:57 +00:00
l10n daemon script
d4074b42fa 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-06-15 09:58:46 +00:00
l10n daemon script
e31eed3243 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-06-13 11:32:14 +00:00
l10n daemon script
a0fdfe9c31 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-06-12 10:28:51 +00:00
l10n daemon script
2e5b8ae265 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-06-10 10:43:22 +00:00
l10n daemon script
e890207d07 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-06-09 14:10:28 +00:00
Markus S
e6e8106063 Unify desktop files 
and bring it in line with official KDE brand guidelines
 2015-06-08 20:37:24 -07: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
Albert Vaca
6cc6d287fc Merge branch 'master' into frameworks 
Conflicts:
	cli/kdeconnect-cli.cpp
	core/filetransferjob.cpp
	core/filetransferjob.h
	interfaces/notificationsmodel.cpp
	plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.h
	plugins/sftp/sftpplugin.cpp
 2015-01-20 22:44:31 -08:00
l10n daemon script
c805f91411 SVN_SILENT made messages (.desktop file) 2015-01-21 03:54:34 +00:00
l10n daemon script
917104ff99 SVN_SILENT made messages (.desktop file) 2014-12-26 04:20:08 +00:00
l10n daemon script
365b2c55b2 SVN_SILENT made messages (.desktop file) 2014-12-25 04:06:46 +00:00
Albert Vaca
2b13d0825c Merge branch 'master' into frameworks 
Conflicts:
	kded/CMakeLists.txt
 2014-11-22 09:29:05 -08:00
l10n daemon script
e15af622b7 SVN_SILENT made messages (.desktop file) 2014-11-15 04:11:51 +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
0b67371b11 Correct kcmshell version in desktop files (4 → 5). 
REVIEW: 119856
 2014-08-20 14:58: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
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
bb28de3373 SVN_SILENT made messages (.desktop file) 2014-03-18 05:07:34 +00:00
l10n daemon script
b3bfb41f29 SVN_SILENT made messages (.desktop file) 2014-03-10 04:46:57 +00:00
Albert Vaca
a2ece14400 Hashbang not needed on desktop files 2014-03-08 10:08:39 +01:00
l10n daemon script
5290189811 SVN_SILENT made messages (.desktop file) 2014-03-05 04:38:53 +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
l10n daemon script
787e8e892f SVN_SILENT made messages (.desktop file) 2013-12-06 04:27:58 +00:00
Albert Vaca
0e3b062f5e Changed KCM name from "Devices" to "KDE Connect" 2013-12-05 14:30:22 +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
4aac44801f KCM icon, name and other texts changed 2013-08-15 21:59:19 +02:00
Albert Vaca
975892dcd0 Yet another refactor, mostly moving code from from daemon class to device class 
Device now has a public dbus interface
Removed wizard from kcm: now the main list shows all the devices and you can pair/unpair using a checkbox
Both Kde and Android now use unique device ids
 2013-07-03 03:52:44 +02:00
Renamed from kcm/kdeconnect-kcm.desktop (Browse further)