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

1054 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
bdc2ff9ee6 SVN_SILENT made messages (after extraction) 2015-10-02 08:09:38 +00:00
l10n daemon script
47ee991548 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-01 10:36:43 +00:00
l10n daemon script
44b356108a SVN_SILENT made messages (after extraction) 2015-09-30 07:59:33 +00:00
l10n daemon script
ba818c743c 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-29 12:23:45 +00:00
l10n daemon script
7d1ce74d94 SVN_SILENT made messages (after extraction) 2015-09-29 09:51:20 +00:00
l10n daemon script
b05a90f090 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-28 10:20:36 +00:00
l10n daemon script
170fdf5bd2 SVN_SILENT made messages (after extraction) 2015-09-28 08:21:12 +00:00
Harald Sitter
66743cf11f do not runtime require Qt 5.5 for no good reason 
Layouts 1.2 appeared in Qt 5.5 [1] and introduced new fooMargin properties
[2]. We do however not use margins here, so we do not actually need
Layouts 1.2. Drop back down to Layouts 1.1 to be more compatible with
mainstream distros.

[1] http://doc.qt.io/qt-5.4/qtquick-layouts-qmlmodule.html
[2] http://doc.qt.io/qt-5.5/qml-qtquick-layouts-layout.html#bottomMargin-attached-prop

REVIEW: 125388
 2015-09-25 11:04:24 +02:00
l10n daemon script
f1cb1e42a2 SVN_SILENT made messages (after extraction) 2015-09-25 08:14:08 +00:00
l10n daemon script
f9db1e0fa5 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-22 12:23:31 +00:00
l10n daemon script
197e90586d SVN_SILENT made messages (after extraction) 2015-09-21 08:07:55 +00:00
l10n daemon script
d42bcb25a2 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-19 11:56:19 +00:00
l10n daemon script
708e49155f SVN_SILENT made messages (after extraction) 2015-09-19 09:10:00 +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
410d1c9d4a SVN_SILENT made messages (after extraction) 2015-09-17 09:26:59 +00:00
l10n daemon script
c1c1166e09 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-16 10:24:01 +00:00
l10n daemon script
0c95e5a2db SVN_SILENT made messages (after extraction) 2015-09-16 08:16:15 +00:00
Albert Vaca
8ac718872a Merge branch '0.9' 2015-09-15 08:34:57 -07:00
Albert Vaca
274ac99e8f Merge branch 'stable' into 0.9 2015-09-15 08:34:13 -07:00
Albert Vaca
66bf532964 Fixed bugtracker link in appdata.xml 2015-09-15 08:33:15 -07:00
Aleix Pol
13e3bee8f4 Merge branch 'stable' 2015-09-15 02:04:29 +02:00
Aleix Pol
bdc721b7d3 Properly install the renamed files 2015-09-15 02:03:31 +02:00
Aleix Pol
b3425e114a Another application desktop file to rename 2015-09-15 01:47:29 +02:00
Aleix Pol
00914240a5 Merge branch 'stable' 2015-09-15 01:45:00 +02:00
Aleix Pol
29911c7185 Provide an appdata file 
Needs work, Albert? :D

CCMAIL: albertvaka@gmail.com
 2015-09-15 01:41:41 +02:00
Aleix Pol
d1d196a15d Use correct notation for desktop file names 2015-09-15 01:29:39 +02:00
Albert Vaca
2a1b6d1abe Added a feature_summary line to CMakeLists.txt 2015-09-14 04:53:59 -07:00
l10n daemon script
42a3029b0e 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-14 10:22:08 +00:00
l10n daemon script
933cbd5bfd 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-13 10:31:01 +00:00
Albert Vaca
f4a3df0a26 Merge branch '0.9' 2015-09-12 14:29:35 -07:00
Albert Vaca
e04bb69f6a Bumped version number 2015-09-12 13:40:05 -07:00
Aleix Pol
f6cb042000 Revert "Add a hack to export auto generated interfaces" 
This reverts commit 1501090b41.
 2015-09-12 22:12:38 +02:00
Aleix Pol
50b9d331d1 Fix hack 
Expose the signal on the exported interface.
 2015-09-12 22:12:18 +02:00
David Edmundson
7f794c093a Fixed the CLI 
Enter discoverability mode if pairing with an unpaired device.

Use the correct isPaired. This exists as a method and a property,
callign the method returns QDbusPendingReply which shouldn't be checked
immediately
 2015-09-12 22:08:12 +02:00
David Edmundson
97034e3bbd Don't cleanup devices if pairing 2015-09-12 22:03:56 +02:00
David Edmundson
f1f3f48aaf Export pairStatus 2015-09-12 22:03:39 +02:00
David Edmundson
1501090b41 Add a hack to export auto generated interfaces 2015-09-12 22:03:26 +02:00
Aleix Pol
2c2cb21ee1 Don't clean the devices that looked us up in the first place 2015-09-12 20:53:05 +02:00
Aleix Pol
2707d1f0a8 Fix reload when changing current device on the kcm 2015-09-12 19:43:15 +02:00
Albert Vaca
217d4b60ff Fixed outging capabilities 2015-09-12 08:51:39 -07:00
Aleix Pol
3269b7a9c2 Fix tests when the Qt mobile app is not built 2015-09-12 15:17:08 +02:00
Aleix Pol
fe2679a8a5 Prevent the kcm from refreshing the UI while interacting with it 
Only refresh it when the available plugins actually change.
 2015-09-12 15:02:59 +02:00
Aleix Pol
27302c0450 Improve RunCommand configuration display 2015-09-12 13:51:15 +02:00
Aleix Pol
f25dc109f3 Don't lock the daemon when running a process is started 2015-09-12 13:51:15 +02:00
l10n daemon script
71874dbffb 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-12 11:52:20 +00:00
Albert Vaca
0f280b5345 Made the runcommands plugin re-send the config when it changes 2015-09-12 04:50:20 -07:00
Albert Vaca
4230f4fb44 Added a signal so plugins know when we update the config 2015-09-12 04:50:20 -07:00
Aleix Pol
cfe0e60eb9 Remove wrong include 2015-09-12 12:49:43 +02:00
Albert Vaca
cf4a9b8639 First implementation of runcommand plugin 2015-09-12 03:38:44 -07:00