Commit graph

2589 commits

Author SHA1 Message Date
Nicolas Fella
67efdc4fef s/Q_DECL_OVERRIDE/override 2019-05-09 01:03:20 +02:00
Albert Vaca Cintora
5ddaadd471 More logging and remove redundant check as per CR 2019-05-09 00:03:59 +02:00
Albert Vaca Cintora
8c65f093cb Fix build 2019-05-09 00:03:59 +02:00
Albert Vaca
3fc7df550b Better error handling when loading cert and key
BUG: 405207
2019-05-09 00:03:59 +02:00
Nicolas Fella
db0360a994 Simplify code in DeviceSortProxyModel 2019-05-08 21:29:31 +00:00
Nicolas Fella
2545ba5926 Use UDSEntry::reserve 2019-05-08 21:29:11 +00:00
l10n daemon script
ee1a535cc2 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-05-08 05:42:59 +02:00
l10n daemon script
437ded0aa6 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-05-06 05:50:17 +02:00
Simon Redman
db611fae67 Revert "Remove unneeded src"
This reverts commit 4c8c2b3d8f
2019-05-05 16:32:14 +00:00
Nicolas Fella
0ff45fdf49 Use QMap::firstKey() 2019-05-05 16:03:02 +02:00
Nicolas Fella
c1878d106a Fix global static warning 2019-05-05 15:58:50 +02:00
Nicolas Fella
0692295ae7 s/Q_NULLPTR/nullptr/ 2019-05-05 15:45:50 +02:00
Nicolas Fella
6dda515f29 Move Desktopdaemon object from heap to stack 2019-05-05 12:58:11 +00:00
Nicolas Fella
92a2da05e6 Don't unregister plugins from DBus in contructor 2019-05-05 12:57:28 +00:00
Nicolas Fella
89987eb025 Coding style 2019-05-04 19:27:04 +02:00
Nicolas Fella
eef04f124b [backends/lan] Don't fail silently when a UDP packet could not be unserialized 2019-05-04 18:34:59 +02:00
Nicolas Fella
137d504b58 [plugins/contacts] Unify coding style 2019-05-04 16:15:49 +02:00
Nicolas Fella
aff3d20e7e [lanlinkprovider] Improve method names 2019-05-04 13:10:27 +00:00
l10n daemon script
ac2ac5ba20 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-05-04 05:49:17 +02:00
Erik Duisters
6fb67d0261 Delete partially downloaded file when transfer is canceled locally 2019-05-03 17:34:17 +02:00
l10n daemon script
6c6cd751ba 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-05-03 05:51:06 +02:00
Nicolas Fella
ecacb0eb80 Remove unneeded disconnects 2019-05-02 12:05:52 +00:00
Nicolas Fella
d3b6d1717d Port old connects 2019-05-01 23:42:24 +02:00
Nicolas Fella
ad0acbfae3 move initialization to initializer list 2019-05-01 23:26:07 +02:00
Nicolas Fella
d3b41924b5 Revert "Make PulseAudioQT mandatory"
This breaks CI as PAQt is not yet available there

This reverts commit b48596d7c3.
2019-05-01 14:53:30 +02:00
Nicolas Fella
c18c7b27f1 Add sanity check to dbus-exposed requestConversation() 2019-05-01 12:47:33 +00:00
Albert Vaca Cintora
3eb2f67d38 Fixme from 2014 is probably not a fixme 2019-05-01 14:46:25 +02:00
Nicolas Fella
ad5428b054 Fix deviceTest 2019-05-01 12:46:02 +00:00
Nicolas Fella
b48596d7c3 Make PulseAudioQT mandatory 2019-05-01 14:41:50 +02:00
l10n daemon script
58e2f142e0 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-05-01 05:56:02 +02:00
Nicolas Fella
595e8d9a35 Add Macro for MinGW and fix GUID Macro Fix for Windows building 2019-05-01 00:21:19 +02:00
Nicolas Fella
4c8c2b3d8f Remove unneeded src 2019-04-30 19:09:26 +02:00
Nicolas Fella
278eed89d6 Fix build 2019-04-30 19:07:32 +02:00
Nicolas Fella
d4026861ab Clean up includes 2019-04-30 19:03:24 +02:00
Piyush Aggarwal
5b73c081da replace phonon with QtMultimedia 2019-04-30 16:24:09 +00:00
Simon Redman
459a1992e5 Check empty string using .isEmpty() instead of == "" 2019-04-30 10:11:57 -06:00
l10n daemon script
c9d85107e6 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-04-30 05:43:16 +02:00
Nicolas Fella
3f4f475991 [pausemusic] Port to PulseAudioQt 2019-04-28 19:31:39 +00:00
Nicolas Fella
b04dcde70e [sftp] Fix error message wording 2019-04-28 19:28:06 +00:00
Nicolas Fella
93ebcc99a9 Port to new connect syntax 2019-04-28 16:35:44 +02:00
Nicolas Fella
3fcb87e0ed [sftp] Improve error reporting 2019-04-25 18:53:09 +00:00
l10n daemon script
20e8f41bb4 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-04-23 06:05:52 +02:00
Nicolas Fella
8fd954b6d8 Use initializer for QJsonObject
This avoid detaching the QJsonObject
2019-04-22 20:03:52 +02:00
l10n daemon script
2c49558f32 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-04-22 05:58:13 +02:00
l10n daemon script
4fb4547666 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-04-20 06:00:49 +02:00
l10n daemon script
fe02874ca1 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-04-19 05:46:04 +02:00
l10n daemon script
da6da3f5d1 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-04-18 06:04:21 +02:00
l10n daemon script
5cbc921f97 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-04-17 05:46:24 +02:00
l10n daemon script
c1be806f9d 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-04-16 05:57:25 +02:00
Albert Vaca Cintora
c8b51fb339 Restore FileItemActionPlugin
The alternative using puropose is less mature than this and some of us
were missing the good old dolphin plugin.

This reverts commit a19713fbeb.

# Conflicts:
#	CMakeLists.txt
2019-04-15 22:36:34 +02:00