Albert Vaca
|
27cbff82e7
|
Do not compile the plasmoid nor the runcommand plugin on Windows
|
2016-11-24 00:21:25 +01:00 |
|
Albert Vaca
|
3a558984b9
|
Fix for qt 5.6
|
2016-11-23 20:27:09 +01:00 |
|
Aleix Pol
|
89d6152b3b
|
Install kdeconnect-indicator
|
2016-11-23 19:45:35 +01:00 |
|
Aleix Pol
|
7960cb2ca7
|
Have a tooltip with the number of connected devices
|
2016-11-23 19:45:35 +01:00 |
|
Aleix Pol
|
7b87af16df
|
Properly iterate over devices
|
2016-11-23 19:45:35 +01:00 |
|
Aleix Pol
|
6aa41a6ab9
|
Display a configure entry on the menu
|
2016-11-23 19:45:35 +01:00 |
|
Aleix Pol
|
afa299266e
|
Only display connected devices
|
2016-11-23 19:45:35 +01:00 |
|
Aleix Pol
|
22e08095ce
|
Let the menu actually do things
|
2016-11-23 19:45:35 +01:00 |
|
Aleix Pol
|
b67b0e6c2c
|
First approach to a tool that sits on the system tray
Hopefully will better integrate in all platforms
|
2016-11-23 19:45:35 +01:00 |
|
Aleix Pol
|
e9c835f477
|
Prefer properties to functions
|
2016-11-23 19:45:35 +01:00 |
|
Albert Vaca
|
3d0f7c3fcb
|
Changed signal reachableStatusChanged() to reachableChanged(bool)
And proxied it on the C++ dbus interface.
|
2016-11-23 17:24:35 +01:00 |
|
Albert Vaca
|
f845b33392
|
Fixed bug on Windows
|
2016-11-20 04:25:11 +01:00 |
|
Albert Vaca
|
f901655ef4
|
Warning
|
2016-11-16 21:37:07 +01:00 |
|
l10n daemon script
|
a43bb1bdbb
|
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-05 09:58:11 +00:00 |
|
l10n daemon script
|
77756ed73e
|
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-28 09:28:09 +00:00 |
|
l10n daemon script
|
95ace68ae9
|
SVN_SILENT made messages (after extraction)
|
2016-10-28 06:56:23 +00:00 |
|
l10n daemon script
|
a3235189bc
|
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-20 09:38:58 +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 |
|
l10n daemon script
|
c2f35e7599
|
SVN_SILENT made messages (after extraction)
|
2016-10-19 06:41:11 +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
|
5ad75b46f8
|
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-18 09:57:30 +00:00 |
|
l10n daemon script
|
f0923134e0
|
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-17 12:05:57 +00:00 |
|
l10n daemon script
|
63182c205c
|
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-17 09:29:24 +00:00 |
|
l10n daemon script
|
1ae1fc79a7
|
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-15 12:44:08 +00:00 |
|
l10n daemon script
|
1ace12ce57
|
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-15 09:58:56 +00: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 |
|
Kai Uwe Broulik
|
6ca3f98748
|
[KCM] Don't hardcode hyperlink color
Let the theme come up with a link color which knows best to ensure contrast and readability.
REVIEW: 129144
|
2016-10-11 11:09:19 +02:00 |
|
l10n daemon script
|
f6b501c2c9
|
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-08 09:56:21 +00:00 |
|
l10n daemon script
|
969c5d1a98
|
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-07 12:01:02 +00:00 |
|
l10n daemon script
|
9dba2c6e9a
|
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-07 09:29:34 +00:00 |
|
Burkhard Lück
|
4c83b45422
|
fix warning in json file, Scripty seems to be very pedantic here
|
2016-10-06 20:46:13 +02:00 |
|
l10n daemon script
|
cee1f7f144
|
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-05 11:58:34 +00:00 |
|
l10n daemon script
|
2285daac50
|
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-05 09:24:30 +00:00 |
|
l10n daemon script
|
c055f7ffd2
|
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-04 12:55:54 +00:00 |
|
l10n daemon script
|
e8be42cf39
|
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-04 10:22:12 +00:00 |
|
Aleix Pol
|
eb31c1e152
|
Make it possible to toggle full notification contents by clicking on it
REVIEW: 129087
|
2016-10-04 01:12:04 +02:00 |
|
l10n daemon script
|
22358ef3eb
|
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-02 12:01:19 +00:00 |
|
l10n daemon script
|
5575caa21b
|
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-01 12:41:22 +00:00 |
|
l10n daemon script
|
76677c65c3
|
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-01 09:59:23 +00:00 |
|
l10n daemon script
|
7734ac25d2
|
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 12:08:02 +00:00 |
|
Thomas Posch
|
91cf466ee2
|
Sort commands by name, as we do on Android
BUG: 369239
REVIEW: 129076
|
2016-09-30 12:56:27 +02: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 |
|
l10n daemon script
|
04165fef38
|
SVN_SILENT made messages (after extraction)
|
2016-09-29 11:00:15 +00:00 |
|
Albert Vaca
|
54aa41d57f
|
Merge branch '1.x'
|
2016-09-29 11:02:12 +02:00 |
|
Albert Vaca
|
68158ed548
|
Removed old file
|
2016-09-29 11:02:03 +02:00 |
|
Albert Vaca
|
d49d8d4784
|
Merge branch '1.x'
# Conflicts:
# plugins/telephony/kdeconnect_telephony.json
|
2016-09-29 11:01:02 +02:00 |
|
Albert Vaca
|
d6355ab0ce
|
Detect left handed mouse configurations and swap faked buttons
BUG: 368953
|
2016-09-29 10:54:33 +02: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 |
|