l10n daemon script
e40312bf5e
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"
2018-06-18 05:27:46 +02:00
Albert Vaca
171eb0b571
Added -o reconnect to sshfs
...
It has been reported to fix some errors
2018-04-09 18:30:14 +02:00
Adam Pigg
ebc316f703
Add a method for creating simple notifications
...
Summary:
Add a helper function to the daemon interface, which must be subclassed
by the implementations, which creates a simple notification.
For more complex needs, involving interacting with the notification, it
will still be nescessary to use KNotification directly, but this allows
for other future implementations to create a simple notification without
ifdef'ing the code.
Reviewers: kdeconnect, apol
Reviewed By: apol
Subscribers: kdeconnect
Differential Revision: https://phabricator.kde.org/D11104
2018-03-18 12:52:22 +01:00
Friedrich W. H. Kossebau
bb3ab8b631
Clean-up requirements: cmake 3.0, qt 5.7, use min versions, deduplicate KF5
...
Summary:
* cmake 2.8.12 is really outdated, 3.0 is minimum in plasma & kf5
* cmake_minimum_required should be at begin of toplevel CMakeLists.txt
* bump qt version to 5.7, matching the min Qt version of kf5 5.42
* with ecm being part of kf5 since early versions, share ${KF5_MIN_VERSION}
* use QT_MIN_VERSION & KF5_MIN_VERSION also for separate find_package calls
* deduplicate all KF5 components searched for in unconditionally included
subdirs
Test Plan: Still configures and builds with all options OFF & ON
Reviewers: #kde_connect, nicolasfella
Reviewed By: #kde_connect, nicolasfella
Subscribers: nicolasfella
Differential Revision: https://phabricator.kde.org/D11418
2018-03-17 23:34:33 +01:00
Friedrich W. H. Kossebau
1f0d6b2a62
Remove unused "Encoding": "UTF-8" from plugins' metadata JSON
...
Summary:
Had slipped in from conversion of metadata in desktop file format,
but are of no use in the JSON variant.
Test Plan: Plugins load and work as before
Reviewers: #kde_connect, nicolasfella
Reviewed By: #kde_connect, nicolasfella
Differential Revision: https://phabricator.kde.org/D11417
2018-03-17 23:32:27 +01:00
Albert Vaca
f47f517827
Rename NetworkPackage -> NetworkPacket
...
Summary: KDE Connect, now with correct naming!
Test Plan: It still builds.
Reviewers: #kde_connect, apol, nicolasfella
Reviewed By: #kde_connect, apol, nicolasfella
Subscribers: nicolasfella
Differential Revision: https://phabricator.kde.org/D11036
2018-03-05 20:03:23 +01:00
l10n daemon script
057a114629
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"
2017-09-19 04:58:52 +02:00
Aleix Pol
956d515fe9
Merge branch '1.x'
2017-09-18 20:02:53 +02:00
Tobias C. Berner
c93d83dfb2
Add support for the normal 'umount' porgram.
...
Summary: FreeBSD does not install fusermount, so we need to use 'umount'.
Reviewers: #kde_connect, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: albertvaka, #kde_connect
Differential Revision: https://phabricator.kde.org/D6945
2017-09-05 22:25:01 +02:00
l10n daemon script
b825bee1c9
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"
2017-09-04 04:35:03 +02:00
Albert Vaca
84bba9429f
Merge branch 'master' into 1.x
...
# Conflicts:
# core/backends/lan/downloadjob.cpp
# core/backends/lan/downloadjob.h
# core/filetransferjob.cpp
# core/filetransferjob.h
# plugins/notifications/sendreplydialog.cpp
# plugins/notifications/sendreplydialog.h
# plugins/telephony/sendsmsdialog.cpp
# plugins/telephony/sendsmsdialog.h
2017-09-03 22:05:54 +02:00
Jean Vincent
72535ecf48
Make member variable names, & placement and * placement more coherent
...
Summary:
Change all member variables to the form m_fooBar because it is the preferred form in Qt (it was half and half between this and mFooBar, and a minority didn't have anything).
Place all references and pointers on the side of the type since it is the majority.
Basically:
- mFoo -> m_foo
- foo -> m_foo (if it is a member variable)
- Type &ref -> Type& ref
- Type *ptr -> Type* ptr
Reviewers: #kde_connect, nicolasfella, albertvaka
Reviewed By: #kde_connect, nicolasfella, albertvaka
Subscribers: albertvaka, #kde_connect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D7312
2017-09-03 21:45:08 +02:00
l10n daemon script
dadcc76841
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"
2017-08-06 06:02:06 +02:00
l10n daemon script
0356908fc8
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"
2017-08-06 04:42:32 +02:00
Albert Vaca
7907f41cc0
Triggers a bug -> fixes a bug
...
lol
2017-07-26 00:10:10 +02:00
Albert Vaca
aec736fe56
Fix file corruption bug on SFTP plugin
2017-07-25 15:20:11 +02:00
Albert Vaca
ef0e80c91f
Merge branch 'master' into 1.x
...
# Conflicts:
# indicator/org.kde.kdeconnect.nonplasma.desktop
# org.kde.kdeconnect.kcm.appdata.xml
# plugins/runcommand/kdeconnect_runcommand.json
# urlhandler/org.kde.kdeconnect.telhandler.desktop
2017-07-24 16:49:06 +02:00
Jean Vincent
25b86c6c7f
Determine which IP address to use for sshfs
...
Summary:
There is currently an issue where the device doesn't send the correct IP address for sshfs when a VPN is present.
Instead of asking the device to find and send its address, we can store it from when the device link is created then reuse it.
Test Plan:
All unit tests pass.
In these different situations:
- without a VPN
- with a VPN running
- with a VPN started then stopped (the tun interface might still be there)
Try to remotely browse the device. It should work in all cases.
Reviewers: #kde_connect, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: albertvaka, apol, nicolasfella, sredman
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D6730
2017-07-22 11:18:06 +02:00
l10n daemon script
cc43a72884
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"
2017-07-14 05:43:50 +02:00
l10n daemon script
72162bf8c9
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"
2017-06-08 04:52:02 +02:00
l10n daemon script
0d217c58e1
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"
2017-05-27 04:22:53 +02:00
l10n daemon script
eddcaddaea
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"
2017-05-15 04:33:11 +02:00
l10n daemon script
be1d43b42d
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"
2017-04-09 03:59:36 +02:00
Albert Vaca
a5ff478896
Removed -o reconnect
...
As discussed in https://git.reviewboard.kde.org/r/130015/
2017-03-27 20:27:34 +02:00
Yuxuan Shui
9af480163d
Add keep alive options to sshfs.
...
REVIEW: 130015
2017-03-15 19:48:37 +01:00
Yuxuan Shui
0b3f0acde5
Fix files under sshfs being owned by root.
...
This patch sets uid/gid to the user running kdeconnectd.
2017-03-15 17:39:38 +01:00
Yuxuan Shui
353f2053e3
Automatically reconnect sftp
...
BUG: 377040
2017-03-15 11:35:36 +01:00
Yuxuan Shui
f2925b7661
Fix SFTP unmount
...
REVIEW: 129993
2017-03-15 11:34:49 +01:00
Albert Vaca
b75d52fe31
Do not use a location under home as mount point
...
Try to use XDG_RUNTIME_DIR and fall back to /tmp.
https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
2017-02-18 16:14:51 +01:00
l10n daemon script
aa1dff34ae
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"
2017-01-25 05:55:10 +01:00
Aleix Pol
3734d6ce4d
Reduce API exposed through dbus
...
Summary:
Don't use QDBusConnection::ExportAllContents
No need to make connect and receivedPackage public slots (they're are the
parent's already)
Fixes T4975
Test Plan: Rough manual test
Reviewers: #kde_connect, albertvaka
Reviewed By: #kde_connect, albertvaka
Maniphest Tasks: T4975
Differential Revision: https://phabricator.kde.org/D3871
2017-01-10 18:15:01 +01:00
l10n daemon script
e6a7df25aa
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"
2016-12-20 12:45:03 +01:00
l10n daemon script
5279a64e05
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"
2016-12-02 04:30:30 +01:00
l10n daemon script
eabdfc892b
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"
2016-11-30 04:24:23 +01:00
Albert Vaca
6a2a0b1c76
Merge branch '1.x'
...
# Conflicts:
# plugins/mpriscontrol/mpriscontrolplugin.cpp
# plugins/sendnotifications/kdeconnect_sendnotifications.json
2016-11-26 16:40:24 +01:00
Albert Vaca
7c4dbdad3c
Use mulit-argument arg
2016-11-26 16:36:34 +01:00
Albert Vaca
60331ccbf1
Clazy says all this QStringLiteral and QLatin1String were missing/wrong
2016-11-26 16:21:29 +01:00
Albert Vaca
a1340c8042
Fixed old style connects with clazy
2016-11-26 15:14:19 +01:00
Albert Vaca
1a1f94fd94
Fixed old style connects with clazy
2016-11-26 15:12:38 +01:00
l10n daemon script
b4e008847a
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"
2016-11-25 04:58:17 +01:00
l10n daemon script
73c6e1a306
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"
2016-11-24 05:29:38 +01:00
Albert Vaca
6124e5273f
Merge branch 'master' (early part) into 1.x
...
# Conflicts:
# plugins/kdeconnect.notifyrc
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
# plugins/telephony/kdeconnect_telephony.json
2016-11-23 17:29:26 +01:00
l10n daemon script
e0f8c4a6ac
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"
2016-10-19 11:29:39 +00:00
l10n daemon script
f0eb32c350
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"
2016-10-19 09:02:51 +00:00
Albert Vaca
c847c99f5a
Merge branch 'master' into 1.x
...
# Conflicts:
# plugins/findmyphone/kdeconnect_findmyphone.json
# plugins/notifications/kdeconnect_notifications.json
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/runcommand/kdeconnect_runcommand.json
# plugins/runcommand/kdeconnect_runcommand_config.desktop
# plugins/sftp/kdeconnect_sftp.json
2016-10-18 13:14:22 +02:00
l10n daemon script
3be06839a8
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"
2016-10-11 13:08:45 +00:00
l10n daemon script
258a844588
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"
2016-10-11 10:30:54 +00:00
l10n daemon script
7ac6543c61
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"
2016-09-30 09:37:19 +00:00
l10n daemon script
ec0ca3976d
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"
2016-09-29 12:27:06 +00:00
Albert Vaca
0dbaceafa3
Merge branch 'master' into 1.x
...
# Conflicts:
# plugins/battery/kdeconnect_battery.json
# plugins/clipboard/kdeconnect_clipboard.json
# plugins/findmyphone/kdeconnect_findmyphone.json
# plugins/kdeconnect.notifyrc
# plugins/lockdevice/kdeconnect_lockdevice.json
# plugins/mousepad/kdeconnect_mousepad.json
# plugins/mpriscontrol/kdeconnect_mpriscontrol.json
# plugins/mprisremote/kdeconnect_mprisremote.json
# plugins/notifications/kdeconnect_notifications.json
# plugins/pausemusic/kdeconnect_pausemusic.json
# plugins/ping/kdeconnect_ping.json
# plugins/remotecommands/kdeconnect_remotecommands.json
# plugins/remotecontrol/kdeconnect_remotecontrol.json
# plugins/runcommand/kdeconnect_runcommand.json
# plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
# plugins/sendnotifications/kdeconnect_sendnotifications.json
# plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
# plugins/sftp/kdeconnect_sftp.json
# plugins/share/kdeconnect_share.json
# plugins/telephony/kdeconnect_telephony.json
2016-09-29 10:53:29 +02:00
l10n daemon script
167fd6cf59
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"
2016-09-28 11:51:45 +00:00
Albert Vaca
4cd190b86d
Merge branch '1.x'
2016-09-24 20:35:57 +02:00
Albert Vaca
e97107156b
Ignore user config as it might cause our connection to fail
...
BUG: 369098
2016-09-20 11:32:50 +02:00
l10n daemon script
e884c4a9ac
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"
2016-09-18 09:32:51 +00:00
l10n daemon script
2d56c59386
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"
2016-09-14 09:17:50 +00:00
Albert Vaca
5933c6810c
More unused includes cleanup
2016-07-05 14:27:53 +02:00
Aleix Pol
f9406e8afc
Introduce QVariantMap as an argument of NetworkPackage
...
Makes it possible to specify the different properties sent at once,
rather than one by one as we used to do.
Also port whenever possible to the initializer-list syntax.
REVIEW: 128269
2016-06-21 20:07:12 +02:00
Aleix Pol
596e4484f4
Clean up use of virtual and override keywords
...
Only use virtual when actually virtual, to override just use override.
2016-06-20 19:22:29 +02:00
Albert Vaca
c89b032569
Merge branch 'master' into sslrefactor
2016-06-03 00:48:15 +02:00
Albert Vaca
73f5996f14
Consistent naming of _REQUEST package type macros
2016-06-03 00:47:03 +02:00
Aleix Pol
9aa794b0da
Merge branch 'master' into sslrefactor
2016-05-31 17:29:06 +02:00
Aleix Pol
e7578cc129
Refactor capabilities together with Albert
...
He is committing a similar patch to kdeconnect-android
2016-05-31 17:16:01 +02:00
Albert Vaca
2f33fa0fc7
Hack to fix crash
2016-02-17 05:06:37 -08:00
Albert Vaca
a0deb776c1
Use passwords for sftp since Android doesn't have our pubkey anymore.
2016-02-17 04:51:28 -08:00
Albert Vaca
fa1771dd64
Merge branch 'master' into sslrefactor
2016-01-10 09:01:14 -08:00
l10n daemon script
45d5068143
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"
2016-01-05 13:22:15 +00:00
Albert Vaca
1d98bd3cbe
Merge branch 'master' into sslrefactor
2016-01-02 12:58:12 -08:00
Albert Vaca
517c02451b
Merge branch '0.9'
...
# Conflicts:
# kdeconnect.appdata.xml
# plugins/mprisremote/kdeconnect_mprisremote.json
# plugins/ping/kdeconnect_ping.json
# plugins/remotecontrol/kdeconnect_remotecontrol.json
2016-01-02 12:51:30 -08:00
Albert Vaca
36e62891ca
This syntax also works on older OpenSSH versions.
...
Like the one that Ubuntu distributes
BUG: 355015
2016-01-02 12:45:18 -08:00
l10n daemon script
a0c1a57999
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-12-30 09:23:05 +00:00
l10n daemon script
6434909e79
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-12-29 11:22:52 +00:00
Albert Vaca
30d2dd991b
Merge branch 'master' into sslmaster
2015-11-30 03:40:07 -08:00
Michael Palimaka
af26fe245a
Remove unused dependency.
...
REVIEW: 126116
2015-11-20 02:49:08 +11:00
l10n daemon script
1473868bc8
SVN_SILENT made messages (.desktop file)
2015-11-17 15:24:49 +00:00
l10n daemon script
fc2bd97e69
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-11-17 12:54:36 +00:00
l10n daemon script
04d52fb022
SVN_SILENT made messages (.desktop file)
2015-11-11 13:05:11 +00:00
l10n daemon script
0145c837db
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-11-11 10:30:30 +00:00
l10n daemon script
0b4d36546c
SVN_SILENT made messages (.desktop file)
2015-11-04 19:54:08 +00:00
l10n daemon script
e424bcec1a
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-11-04 17:00:05 +00:00
l10n daemon script
7bbd93c024
SVN_SILENT made messages (.desktop file)
2015-10-27 14:38:42 +00:00
Aleix Pol
0bca50af93
Merge branch '0.9'
2015-10-19 17:48:13 +02:00
Albert Vaca
30f00fb3fa
Fix a crash where unmount was called again after m_proc had been destroyed
...
This happened because of scheduling m_proc->kill() from unmount 5 seconds
after the destructor was called (which was who called unmount first).
Simplified unmount logic a bit as well. Known bug: we might end with a fuse
mountpoint still mounted after killing the sshfs process.
BUG: 352861
2015-10-17 17:31:17 -07: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
Aleix Pol
5e0a7a34b9
Merge branch 'master' into ssl
...
# Conflicts:
# cli/kdeconnect-cli.cpp
# core/backends/lan/landevicelink.cpp
# core/backends/lan/landevicelink.h
# core/backends/lan/lanlinkprovider.cpp
# core/backends/lan/lanlinkprovider.h
# core/backends/lan/socketlinereader.h
# core/backends/lan/uploadjob.cpp
# core/backends/lan/uploadjob.h
# core/backends/loopback/loopbackdevicelink.h
# core/daemon.cpp
# core/daemon.h
# core/device.cpp
# core/device.h
2015-09-11 17:25:23 +02:00
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
Aleix Pol
d58f6314fe
run Clang Modernize
...
Minus the auto change
2015-09-08 10:47:37 +02:00
Albert Vaca
bc3fb512d4
Fixed incompatibility with OpenSSH 7.0
...
BUG: 351725
2015-08-24 21:27:24 -07:00
Vineet Garg
78e9c08732
Merge branch 'master' into ssl
...
Conflicts:
core/backends/lan/socketlinereader.h
core/backends/lan/uploadjob.h
core/networkpackage.h
2015-08-25 03:43:41 +05:30
Boris Egorov
1924173df2
Fix various krazy2 warnings
...
Fix following krazy2 warning types:
[explicit], [endswithnewline], [doublequote_chars], [includes], [normalize],
[postfixop], [spelling]
See http://ebn.kde.org/krazy/reports/playground/base/kdeconnect-kde/index.html
for details.
SLOT/SIGNAL normalization done with Qt normalize utility:
https://github.com/qtproject/qtrepotools/tree/master/util/normalize
REVIEW: 124857
2015-08-21 22:38:54 +06:00
Vineet Garg
27515546a0
Now per device per link type pairing handlers are there
2015-07-25 17:15:19 +05:30
Vineet Garg
f36de70dec
Reverted sftp plugin json file
2015-07-13 19:57:11 +05:30
Vineet Garg
7c777e6279
Implemented pairing handler interface
2015-07-10 03:21:08 +05:30
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
Albert Vaca
7bdf26927d
Fixed warning
2015-06-21 19:42:28 -07:00
Albert Vaca
f71f498125
Removed unused code
2015-06-21 12:32:18 -07:00
Aleix Pol
68b206e525
Move the generation of dbus interfaces into interfaces/
...
Simplifies the code altogether by centralizing the generation into 1 call
that does all the steps.
REVIEW: 124120
2015-06-18 19:06:14 +02: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
326fecad6f
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-05-02 11:45:00 +00:00
Albert Vaca
6072b6cdbe
Changed some plugin icons
2015-05-01 23:07:15 -07:00
Aleix Pol
509ab4ce02
Remove unneeded dependency link
2015-04-10 18:03:49 +02:00