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

2860 commits

This branch
This branch
All branches
Author SHA1 Message Date
l10n daemon script
3bb1814faa 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"
 2019-12-09 08:50:56 +01:00
l10n daemon script
bf0c2e54e3 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"
 2019-12-09 05:15:13 +01:00
Nicolas Fella
173e388177 Bump version number for 1.4 release 2019-12-07 18:14:56 +01:00
Nicolas Fella
fdda1cd0d6 Require recent KF5 version 
We require a recent-ish Kirigami version for the app
 # Please enter the commit message for your changes. Lines starting
 2019-12-07 18:09:56 +01:00
Nicolas Fella
3f574a8488 Don't build runners 2019-12-07 16:10:18 +00:00
Andy Holmes
cc655348eb Nautilus Extension: fix gettext usage 
Apparently the way we did this in GSConnect never actually worked, it
just took years for someone to report it. Since this extension is
derived from GSConnect's it's likely that's the case here, too.

This is the appropriate way to use gettext according to the Python3
documentation.
 2019-12-07 16:08:25 +00:00
Nicolas Fella
9afa6b6d91 Revert "Port deprecated method" 
This requires a newer KF5 version than the current minimum.

This reverts commit e933ae5450.
 2019-12-06 23:14:19 +01:00
Laurent Montel
e933ae5450 Port deprecated method 2019-12-06 13:33:13 +01:00
l10n daemon script
b0134a5881 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"
 2019-12-05 05:16:07 +01:00
l10n daemon script
e11eca64af 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"
 2019-12-02 05:30:09 +01:00
Rajdeep Roy Chowdhury
646aecc47b Pairing Notification is made persistent 2019-12-01 12:01:41 +05:30
l10n daemon script
82974505ed 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"
 2019-12-01 05:28:44 +01:00
l10n daemon script
56880448fd 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"
 2019-11-30 05:34:44 +01:00
l10n daemon script
447158038d 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"
 2019-11-28 05:47:09 +01:00
l10n daemon script
83df9f1f47 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"
 2019-11-27 05:46:04 +01:00
Nicolas Fella
fe22d26f85 Add missing file 2019-11-25 16:14:24 +01:00
Nicolas Fella
fcbb28d1c4 Port fileitemactionplugin to json metadata 2019-11-25 16:13:27 +01:00
l10n daemon script
4a6a98d8a9 GIT_SILENT made messages (after extraction) 2019-11-20 02:39:59 +01:00
Rishabh Sharma
325f193bf6 Grammatical fixes in readme 2019-11-17 17:04:58 +00:00
l10n daemon script
cb307e16b2 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"
 2019-11-17 05:06:27 +01:00
l10n daemon script
3ba783d819 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"
 2019-11-08 05:29:51 +01:00
Nicolas Fella
ac791640a6 Merge conditions 2019-10-27 20:41:24 +01:00
Nicolas Fella
0f9fa8e339 Merge find_package calls 2019-10-27 20:39:19 +01:00
Nicolas Fella
724a5a14a8 Don't use KIO in core when building for Sailfish 2019-10-27 19:35:18 +00:00
Nicolas Fella
1c6d45654c Correct indentation 2019-10-27 17:12:57 +01:00
Nicolas Fella
c568827735 merge two if(SAILFISHOS) calls 2019-10-27 17:11:58 +01:00
Nicolas Fella
ae7a3693d5 Rework cmake find calls 2019-10-27 17:02:45 +01:00
Nicolas Fella
0836195f4b Refactor add test cmake code 2019-10-27 16:54:49 +01:00
Nicolas Fella
9d3789e7fd Don't build smsapp on sfos 2019-10-27 16:53:39 +01:00
Yuri Chornoivan
bef029b8f5 Add i18n() 2019-10-23 22:26:33 +03:00
Simon Redman
8a908e5c69 Correct error interpreting vcard timestamp size 
This requires an upgrade to the Android app to be useful but won't make the situation any worse for now.
 2019-10-23 01:09:54 +00:00
Nicolas Fella
b407571ef1 Fix coding style 2019-10-20 01:49:14 +02:00
Nicolas Fella
41ba3990cc Add missing provides description to appdata 2019-10-18 01:19:32 +02:00
Nicolas Fella
f7296dfcf5 Don't highlight entries in device and plugin list 2019-10-15 20:19:40 +02:00
Nicolas Fella
f58a99e388 Fix background of device name on Plasma Mobile 2019-10-15 20:13:17 +02:00
Nicolas Fella
8d8989ea09 Coding style++ 2019-10-15 20:07:45 +02:00
Nicolas Fella
92ac51465f Simplify page pushing 2019-10-15 20:06:04 +02:00
Aleix Pol
36bcade705 plasmoid: move plasmoid buttons into a menu 
This way we get to see what they do together with the icon.
Removes some visual clutter as well.

Reviewed by Albert Vaca
 2019-10-12 20:06:12 +02:00
Aleix Pol
8a919a8015 Remove clipboard integration on the plasmoid 
It's redundant to the clipboard plugin and remote keyboard.
It clutters the UI.

Reviewed by Albert Vaca
 2019-10-12 19:44:09 +02:00
l10n daemon script
caa3e159c9 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"
 2019-10-10 05:23:28 +02:00
l10n daemon script
58dca31212 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"
 2019-10-02 05:26:15 +02:00
Piyush Aggarwal
118d91ae78 add title to pairing request notification 2019-09-30 20:53:46 +00:00
l10n daemon script
7d27ef1417 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"
 2019-09-30 05:04:12 +02:00
l10n daemon script
b5ebbfc0b4 GIT_SILENT made messages (after extraction) 2019-09-30 02:34:49 +02:00
Nicolas Fella
30806667f0 fix executable name 2019-09-29 20:21:25 +02:00
l10n daemon script
0856c297c1 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"
 2019-09-29 05:09:20 +02:00
l10n daemon script
fe6f1b79bf GIT_SILENT made messages (after extraction) 2019-09-29 02:40:21 +02:00
l10n daemon script
55b7533251 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"
 2019-09-27 05:08:50 +02:00
l10n daemon script
7ec2662ae9 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"
 2019-09-26 05:13:20 +02:00
l10n daemon script
81e8d3a700 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"
 2019-09-25 05:17:51 +02:00