1. 29 Sep, 2016 5 commits
    • Script Kiddy's avatar
      SVN_SILENT made messages (.desktop file) - always resolve ours · ec0ca397
      Script Kiddy authored
      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"
      ec0ca397
    • Script Kiddy's avatar
      SVN_SILENT made messages (after extraction) · 04165fef
      Script Kiddy authored
      04165fef
    • Albert Vaca Cintora's avatar
      Removed old file · 68158ed5
      Albert Vaca Cintora authored
      68158ed5
    • Albert Vaca Cintora's avatar
      d6355ab0
    • Albert Vaca Cintora's avatar
      Merge branch 'master' into 1.x · 0dbaceaf
      Albert Vaca Cintora authored
      # 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
      0dbaceaf
  2. 28 Sep, 2016 2 commits
  3. 25 Sep, 2016 1 commit
  4. 24 Sep, 2016 1 commit
  5. 23 Sep, 2016 1 commit
  6. 21 Sep, 2016 1 commit
  7. 20 Sep, 2016 1 commit
  8. 19 Sep, 2016 3 commits
  9. 18 Sep, 2016 1 commit
  10. 16 Sep, 2016 3 commits
  11. 14 Sep, 2016 2 commits
  12. 10 Sep, 2016 2 commits
    • Kai Uwe Broulik's avatar
      Merge branch '1.x' · 6f7c419b
      Kai Uwe Broulik authored
      6f7c419b
    • Kai Uwe Broulik's avatar
      [FileTransferJob] Fix division by null and use elapsed timer · 77ad9336
      Kai Uwe Broulik authored
      When sending multiple files from my phone to my PC, kdeconnectd usually received a SIGFPE.
      To get the transfer speed it divides the number of bytes received by the elapsed time which can be zero.
      
      Also, since we're only interested in the time that has elapsed, use QElapsedTimer,
      which is exactly for this. QTime::elapsed() also needs to take into account potentially
      ocurred timezone or DST changes.
      
      REVIEW: 128861
      77ad9336
  13. 09 Sep, 2016 2 commits
  14. 06 Sep, 2016 4 commits
  15. 03 Sep, 2016 1 commit
  16. 30 Aug, 2016 2 commits
  17. 29 Aug, 2016 6 commits
  18. 28 Aug, 2016 2 commits