Commit graph

2464 commits

Author SHA1 Message Date
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
Nicolas Fella
b50b794250 Fix crash in daemon 2019-04-14 17:25:02 +00:00
Nicolas Fella
d6de041324 Coding style 2019-04-14 19:23:29 +02:00
Nicolas Fella
331cedfa2f Don't connect to action invoked signals multiple times 2019-04-14 19:20:25 +02:00
Nicolas Fella
54df89809e Don't show multiple windows when replying to a notification 2019-04-14 17:05:01 +00:00
l10n daemon script
af97c5f1ff 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-14 05:49:06 +02:00
Matthijs Tijink
2c44f55f55 Add zsh autocomplete file 2019-04-12 16:20:15 +00:00
Volker Krause
834f9c3790 Handle sms: URLs too
Handling those URLs works perfectly fine already, for transferring the
phone number and the body, we just need to register for it.
2019-04-11 17:58:14 +02:00
l10n daemon script
0fa2bcd464 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-10 06:05:14 +02:00
l10n daemon script
7df58d0d04 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-08 05:48:13 +02:00
l10n daemon script
9ec0d04f4d 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-02 06:03:00 +02:00
Nicolas Fella
147fb6f35f Tweak Upload job finished notification 2019-03-31 19:19:28 +00:00
l10n daemon script
faf9297574 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-03-31 06:36:52 +02:00
l10n daemon script
e2d1284a93 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-03-30 05:58:33 +01:00
Simon Redman
362b0ba2e2 Move ConversationsDbusInterface pointer handling to ConversationsDbusInterface 2019-03-29 22:30:13 +00:00
l10n daemon script
dd8ee45bac 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-03-29 05:57:07 +01:00
l10n daemon script
45be89c5ad 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-03-28 05:49:11 +01:00
l10n daemon script
c6b04d60a3 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-03-27 05:47:40 +01:00
Rituka Patwal
d0cb028a84 add icons for pair, accept, reject 2019-03-26 12:30:04 +00:00
l10n daemon script
abce7a194c 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-03-25 05:51:13 +01:00
Nicolas Fella
5e5275ffb8 Revert "QtGui is not needed in interfaces"
It breaks icons in several places

This reverts commit 2538a6a3e6.
2019-03-24 17:12:42 +01:00
Nicolas Fella
afe78214ac More https 2019-03-24 10:42:34 +01:00
l10n daemon script
e1618b1ad8 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-03-24 05:23:24 +01:00
Nicolas Fella
0c5a8e5a1e More https 2019-03-23 17:38:09 +01:00
Nicolas Fella
3b8fedea1a Replace http GNU urls with https 2019-03-23 17:29:26 +01:00
l10n daemon script
633b08d83e 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-03-23 06:07:48 +01:00