Merge branch 'release/0.4.5-alpha'

.gitignore

@@ -9,3 +9,4 @@ build
 gradle/arch/syncany/pkg
 gradle/arch/syncany/src
 gradle/arch/syncany/syncany*.tar*
+*.orig

.travis.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+# Run JUnit tests and generate reports
+./gradlew testGlobal coberturaReport performCoverageCheck coveralls javadocAll
+
+# SonarQube disabled for now. Took >43min on Travis!
+
+# sonarRunnerTask=$([ -n "$TRAVIS_PULL_REQUEST" -a "$TRAVIS_PULL_REQUEST" != "false" ] && echo "" || echo "sonarRunner")
+# ./gradlew testGlobal coberturaReport performCoverageCheck javadocAll $sonarRunnerTask
+
+# Line of code stats
+cloc --quiet --xml --out=build/reports/cloc.xml $(find -type d -name main | grep src/main)
+
+# Generate manpages
+./gradlew manpages
+
+# Create distributables
+./gradlew distTar
+./gradlew distZip
+./gradlew debian
+./gradlew exe
+
+# Upload distributables and JavaDoc
+./gradle/upload/upload-application.sh

.travis.yml

@@ -6,15 +6,17 @@ env:
     # Terminal does not support colors (Gradle display issue)
     - TERM=dumb
 
-    # Syncany FTP credentials (SYNCANY_FTP_* environment variables)
-    - secure: "OWv7tJZiDQYxZpxw25Qs4B086veBPzjGvrVApfd8tAAOI7xG8Ifp9+TFsRO27xw99ZDFDLzjSZyffR45sgGCTuRapdSWNwIEmma4dAn299bFl1ayU5IXQYtIRsaXjyAm8QPmLbdl5YHFE77ArzFIsaysb7ZXB3cKnYfJGkiNLFs="
-    - secure: "I0+Aw5CgV5wGfsW8hO/HB9FgCUQI/UDg1ppUV7ATq6UpaxmftSpycxR5TOx3D1ISewoD079BqLxSB1i4grns5vKccGxgjeGt4vFr3X1c1NHth0jOPVMJDEVcKZ4odxM8BbSa4MOk+ZpqsgjfDqGZzxt8eRBai1chlKx8WEKao+4="
-    - secure: "JPLqhdDfP3y12dlCtyNfNg32vEQzJAKAp9CFrvz1uogZr61bp0NEi3cDS2TGSqWep7X/uPgJ84LFI22Fy5zH/1pJxY9Y9NpmVnRtFy9Cp3Qb0A9fUZ2ePO2TtyHBwLHCDO9FolrhPpqX6WuCSW26igIEzyAwaslFAJUhF09qadw="
+    # Syncany API credentials (SYNCANY_API_KEY environment variable)
+    - secure: "LtfXTZ6czCL0GhGubTtb5NI/JCUTz5zrU7BkV1QO0PE1wmYB8KxH9kC0hVLzuaLAiSvOWoJVq2qtSh7NXk+ABRw4EKcKPwp+mcjIGmxrncjgdSbWB8zPC3QWrV3rLiaN2w9vJoB5iDU3RcSogSXfV68VeDxUdWgxamPXSrKTzp4="
+
+    # Syncany SonarQube credentials (SYNCANY_SONARQUBE_* environment variables)    
+    - secure: "BDo4IO82sX64vRCxZx3voQ4HcbuTAfTiuNR3MsXlTrBhULAjLU8+EtD+RuXLqYSTEvpzIskiV2EWS4IRHsjYt5lAXl1/YrZsAU6v8UDNh9jkm6TVkxVlACTcEyBHU1SIxn14gXW405sxIAxPZ4YqVwVGNL41rauKXIj0jNp/5Q0="
+    - secure: "QOwOtpvsVqmzrtPslyc7AOE6adq8sFFmGp37KPb3dsHHkb4yESOslQLBPVE745dqcL5K/UX8JQCvv5qpXHBzXS06UMNjwxSM1zxiYEkHFF6BV56RyJBnVx09Wyco8jKUSUaZ6ErOROyhyq75cP6SBEVSUKFvtgR1xYYm4YJy+DY="
+    - secure: "LOwK8mGTVfOz9diX0eB1mhZgEV5yADnNuh2iK4clhjt6O3LxjDJ2KBaO3RTkfTqa4f9VMqVZxoL2af/JvTJnQfOOHiypZqKopS2v0cqlRh4xd8bPRygwOh4b0QkTWozt9WLJsavozxa/Fuj4XpQkL/iA346yrHjV+q2BDMzgprQ="    
+    - secure: "KPZ/bsv+Wdbz61YJeZnO1wQ0yZ4No7VUZ9U61I7P908aAcblRgkpdmPopf59rhFWoRjc74rDb9b2mkPwoNzUvLA0S7GynyTCGh339jWoqVu3YM3jM3HPN4zarcbCTu5Ge4+xDDf8I/ghzsZHSJduqUMp3N0yytoG79tV4tSfhBA="
+    - secure: "d7/TQzfKg94GlYsuRvcf1tdI6F3JKKKf/QS7spDy4OWTFeUyj+K+stPWXw1BeZLK5YnYbe7tsdQdBpxl0Az+YZgZZMJ3B9hVMr1yo5N+QXo3/wvbrm+CWEjDPNCK3iVP63w9KAxOkcZ6+7eHl0zSpEoPZEX+6wMJH57cQk33kO0="
+    - secure: "Wu1VTR/AOjAZhcKJ4xkauhZWMzbu/lIW3j/sQScv1p4vPWK9Eu930c714+M2JUymPQQuJY0q2Lb8+sBOyJumM34SCyEvEq7Pq7Bu2evtobekRo7ICiDSqy98+hCMbI0rU7qaYOckhCVC/Oqe3OjO4tB33gauVF0L4bwpKPvVeks="
 
-    # Syncany GPG signing stuff (SYNCANY_GPG_* environment variables)
-    - secure: "JV+cvV8BgYC9i1EUthycCDfX5rVqlptSaewW03JniEfA5fJnaiQylnDRd72Cev+vcUpgphPXMAXZDP0++hxeOaMsntJBQGgUMv3+DHJ2+JFn9rO5XjrqsIpbBMqwF7Ph89ImFzx4blk3uch3cF7O4DWU00E77AN8xoh7VkkMuDM="
-    - secure: "lhltKRuNNed9y7wNTbh5Qr1Ubs51Fp6nbNFJkYqjYyi4WOIR8/SfeAcrON6pdVVHRwQa/1/HSwXhsB7EXSdgrTnYdlxn+6t8GdHyYiQazrXmqrIJGmFEESyo0iMoXuF4jnw4kWPayH7tDC/+J6kPaLSkyND0s5/loBiHtlGXWwc="
-
 branches:
   only:
     - master
@@ -28,21 +30,20 @@ before_install:
   # Update APT (necessary!)
   - sudo apt-get update
 
-  # Debian and PPA 
-  - sudo apt-get install -y -q gnupg dh-make devscripts dput devscripts debhelper 
-  - gpg --version
-  - dput -v
+  # Debian Build Tools 
+  - sudo apt-get install -y -q dh-make devscripts debhelper bash-completion
   - debuild --version
   - perl -v
 
-  # LFTP (to upload the distributables and JavaDoc)
-  - sudo apt-get install -y -q lftp 
-  - lftp -v 
+  # curl (to upload the distributables and JavaDoc)
+  - sudo apt-get install -y -q curl
+  - curl --version
 
   # Graphviz (for JavaDoc images; see Gradle tasks)
   - sudo apt-get install -y -q graphviz 
 
   # Inno Setup (for Windows executable/installer)
+  # Note: If this code is changed, also update syncany-plugin-gui/.travis.yml
   - sudo add-apt-repository --yes ppa:arx/release
   - sudo apt-get update -d
   - sudo apt-get install -y -q innoextract wine python-software-properties
@@ -55,27 +56,14 @@ before_install:
   # Line of code tool (cloc)
   - sudo apt-get install -y -q cloc
   - cloc --version
+
+  # Speed up Gradle (enable daemon)
+  - mkdir ~/.gradle 2> /dev/null || true
+  - echo "org.gradle.daemon=true" > ~/.gradle/gradle.properties
 
 install:
   # Disable default travis behavior 'gradle assemble'
   - ./gradlew -v
 
 script: 
-  # Run JUnit tests and generate reports
-  - ./gradlew testGlobal coberturaReport performCoverageCheck javadocAll
-
-after_success:
-  # Line of code stats
-  - cloc --quiet --xml --out=build/reports/cloc.xml $(find -type d -name main | grep src/main)
-
-  # Upload to PPA
-  - ./gradlew debianPreparePrecise ppa
-  - ./gradlew debianPrepareTrusty ppa
-  - ./gradlew debianPrepareUtopic ppa
-
-  # Create distributables and JavaDoc
-  - ./gradlew installApp distTar distZip debianPrepareUnstable debian exe 
-
-  # Upload distributables and JavaDoc
-  - ./gradle/lftp/lftpupload.sh
-
+  - ./.travis.sh

AUTHORS.md

@@ -1,11 +1,38 @@
 Authors
 =======
+Many people have contributed to Syncany. This is an attempt to list them all.
 
-Point of Contact and Lead Development:
-- Philipp C. Heckel (philipp.heckel@gmail.com) 
+Core Team Members (contact via team@syncany.org):
+- Christian Roth (cr0)
+- Philipp C. Heckel (binwiederhier)
+- Pim Otte (pimotte)
 
-Team / Contributors:
-- Fabrice Rossi (fabrice.rossi@apiacoa.org)
-- Steffen Dangmann (steffen.dangmann@googlemail.com)
-- Pim Otte (otte.pim@gmail.com)
-- Vincent Wiencek (vwiencek@gmail.com)
+Contributors / Former Team Members:
+- Alexandre Viau (ReAzem)
+- Andreas Fenske
+- Anthony Miyaguchi (acmiyaguchi)
+- Armin Fisslthaler (afics)
+- Christof Schulze (christf)
+- Darryl Tam (Lyrrad)
+- Fabrice Rossi (fabrice-rossi)
+- Florian Spiegel
+- Gaétan Collaud
+- Gregor Trefs (gtrefs)
+- Jesse Donkervliet (jdonkervliet)
+- Joel Pettersson (joelpet)
+- Julien Nicoulaud
+- kt3k
+- Marius Voilă
+- MatMaul
+- Niels Spruit (nspruit)
+- Neal Gompa (Conan-Kudo)
+- Nikolai Hellwig
+- Olivier Tisun
+- Stefan Mai (iamnafets)
+- Stefan Hugtenburg (MrHug)
+- Steffen Dangmann (guitarlum)
+- spikeh
+- Tim Hegeman (thegeman)
+- Paul Steinhilber
+- Vadim Panin (vadimpanin)
+- Vincent Wiencek (vwiencek)

CHANGELOG.md

@@ -1,6 +1,214 @@
 Change Log
 ==========
 
+### Syncany 0.4.5-alpha (Date: 8 May 2015)
+- Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**)
+- Features and significant changes:
+  + Add default .syignore file with typically unwanted files (.DS_Store, ...) #393
+  + Add 'prevent standby' toggle in GUI #387
+  + Add theme and tray icon selector in GUI
+  + Add update check to GUI in general settings panel, and daily update check #415
+  + Add support for enums as transfer setting values #280
+  + Add automatic OAuth token handling #426
+  + Add support for feature aware transfer managers #452
+- Bugfixes and other things:
+  + Make sure that plugin update on Windows is able to install snapshots #418
+  + Working single repos for dropbox plugin #417
+  + Fix Unity detection for tray icon selection #413
+  + Fix Unity tray disappear after Python process crash by restarting #370
+  + Several stability bugfixes #433
+  + Don't use web sockets for IPC between daemon and GUI if in same JVM #373
+  + Fix daemon PID empty error #439
+  + Handle big repositories on dropbox backend better #353
+  + Fix homebrew formula to use java >= 1.7 #449
+  + Fix GUI not working with OAuth plugins #441
+
+### Syncany 0.4.4-alpha (Date: 22 Mar 2015)
+- Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**)
+- Features and significant changes:
+  + Unit tests for daemon #384/#397
+  + Completely re-written Syncany API and website, and open-sourced it
+    in the [syncany-website](https://github.com/syncany/syncany-website) repository #167
+  + Added 3rd-party plugins, and a 3rd party flag in `sy plugin list` responses
+  + Added `sy update check` to manually check for application updates #412
+  + Added `--no-delete` option for `up` #263/#399
+- Bugfixes and other things:
+  + Splitting test suite between unit and integration #384/#391
+  + Allowing SFTP public key auth without private key password #390
+  + Setting default maxMemory to 512M to enable booting in VMs/low memory devices.
+
+### Syncany 0.4.3-alpha (Date: 25 Feb 2015)
+- Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**)
+- Features and significant changes:
+  + First Mac OSX release (.app.zip) #34
+  + Native Mac OSX notifications #335
+  + Added support for WS/REST in JSON format #285
+  + Make plugins updatable via `sy plugin update` command #300
+  + History browser in the GUI (excl. Mac OSX) #333
+  + Better defaults for cleanup #345
+- Bugfixes and other things:
+  + Add man pages and bash completion to tar.gz/.zip distribution, 
+    to allow using them in Arch and potentially other releases #148/#388
+  + Fix black notification bubble on Linux #339
+  + Fix file version table in browse history detail view has too
+    much left cell spacing #346
+  + Fix flickering and newline-problem on Windows tray icon #337
+  + Fix ampersands (&) in menus #367
+  + Fix last modified pre-1970 issue #374
+  + Fix autostart not working on OSX #371
+  + Fix tests to make them clean up after themselves #377/#386
+
+### Syncany 0.4.2-alpha (Date: 10 Jan 2015)
+- Patch release to fix serialization issue in 'sy ls'
+  when daemon/GUI is running.
+
+### Syncany 0.4.1-alpha (Date: 10 Jan 2015)
+- Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**)
+- Features and significant changes:
+  + New 'Preferences' dialog with ability to remove/add plugins, 
+    enable/disable notifications, and change the proxy settings #334/#321
+  + New 'Remove folder' feature in tray menu #330
+  + New 'Copy link' feature in tray menu #336
+  + Added recent changes command 'sy log' #298
+- Bugfixes and other things:
+  + Fix Dropbox plugin bug when deleting non-existing files #325
+  + Cleanup status information / status texts in tray #317/#329
+  + Code refactoring based on SonarQube output #302/#326
+  + Fix invalid "uploading" status message #314
+  + Fix confusing error message when plugin not installed #328
+  + Fix sync-forever issue with Windows watcher #338
+  + Removed `<hooks>` and `<runAfterDown>` because largly unused #311
+  + Fix `sy ls` doesn't display deleted file versions; add `--deleted` #282
+  + Fix Syncany trying to read all files in home dir on Arch Linux #342
+
+### Syncany 0.4.0-alpha (Date: 28 Dec 2014)
+- Developer/alpha release (**We are now nearing the beta phase. Stay tuned!**)
+- Features and significant changes:
+  + Implement resume functionality for up (**big!**) #141
+  + Implement proper init/connect GUI wizards in GUI plugin, and supporting 
+    backend REST/WS-requests in core, including OAuth support for plugins (**big!**) #297
+  + Support S3-compatible backends in [Amazon S3 plugin](https://github.com/syncany/syncany-plugin-s3) #301
+  + New [Flickr plugin](https://github.com/syncany/syncany-plugin-flickr) (store data in images) #304
+  + Implement folder management commands: `sy daemon (list|add|remove)` #286
+  + Make `sy daemon (add|remove) ..` work with multiple paths/IDs #313
+- Bugfixes and other things:
+  + `sy genlink -s` now works behind a proxy #291
+  + `sy genlink -s` now works when folder is daemon-managed #293
+  + GUI: Correctly working icon rotation #296
+  + Fix left-over file issue in delete action #303
+  + Fix `FileSystemActionReconciliator` issue with unexpected 'delete file' case #316
+
+### Syncany 0.3.0-alpha (Date: 9 Dec 2014)
+- **Breaks compatiblity to 0.2.0-alpha local folders!**
+- Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)
+- Features and significant changes:
+  + Implement [OpenStack Swift plugin](https://github.com/syncany/syncany-plugin-swift) #251
+  + Allow setting repo password in `sy connect` and `sy init` via 
+    `--password` option #256
+  + Rework of cleanup operation. Merge database files every cleanup. #266/#284
+  + Added Mac OSX / Homebrew recipe #267/#281 
+- Bugfixes and other things:
+  + Fix Windows/CMD incompatibility with batch file #270
+  + Remove empty database versions during cleanup #208 (part of #266/284)
+  + Drops PURGE concept #265 (part of #266/284)
+  + Fixing incorrect cleanup rollback #268 (part of #266/284)
+  + Fixing 'Checksums do not match' exception; duplicate chunk issue #288
+
+### Syncany 0.2.0-alpha (Date: 8 Nov 2014)
+- Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)
+- **Breaks compatiblity to 0.1.12-alpha local folders!**   
+  From now on, breaking releases will always increase the minor version number.
+- Features and significant changes:
+  + Allow plugin nesting and interaction via SimpleXML-ification (major!) #192/#240
+  + Implement [Dropbox plugin](https://github.com/syncany/syncany-plugin-dropbox) (use Dropbox-provided storage) #226
+  + Implement [RAID0 plugin](https://github.com/syncany/syncany-plugin-raid0) (use two other plugins to extend storage) #191
+  + Encrypt plugin credentials in config.xml #168
+  + New syncany://-link format, support for short syncany://-links (with 
+    Syncany link shortener service), support for arbitrary link shorteners.
+- Bugfixes and other things:
+  + Fix PURGE database file history entries disappear after merging (major!) #252
+  + Fix database corruption issue (caused by #252) in #247
+  + Fix cannot delete/rename folders on Windows #248
+  + Set default log file if no log file given #258
+  + Allow user and global plugins (Linux only) #259
+  + Fix FTP plugin `testRepoFileExists()` with some FTP servers #262
+  + Fix inconsistent DB after cleanup rollback (no issue ID)
+  + Harmonize Plugin API OS description calls #264/#253
+
+### Syncany 0.1.12-alpha (Date: 19 Oct 2014)
+- Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)
+- Features and significant changes:
+  + Working GUI plugin with Windows installer, DEB-file and 
+    as plugin installation
+  + Allow OS/arch-dependent plugins (e.g. GUI) #245
+  + Offer Debian packages for all plugins, and an APT archive
+    for plugins and main application 
+- Bugfixes and other things:
+  + Fix integrity issue with DIRTY databases (major!) #227
+  + Make 'sy daemon stop' more reliable on Windows #230
+  + Fix permission issue with folders created on Windows #243
+
+### Syncany 0.1.11-alpha (Date: 29 Sep 2014)
+- Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)
+- Features and significant changes:
+  + Updated, more flexible WebSocket/REST-like API (basis for GUI/web) #205
+  + Interactive CLI progress status while uploading/downloading #223/#237
+  + Implemented basic daemon hooks for post-sync-down event #155/#237
+- Bugfixes and other things:
+  + Amazon S3 plugin now uses proxy setitngs #228
+  + Windows/Limit: Detect 32-bit Java on 64-bit systems in installer; 
+    limit JVM memory with `<maxMemory>` tag in userconfig.xml #222
+  + Fixed usage of batch/shell scripts #238
+
+### Syncany 0.1.10-alpha (Date: 16 Sep 2014)
+- Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)
+- **Breaks compatiblity to 0.1.9-alpha repositories!**
+- Features and significant changes:
+  + Atomicity for changing operations (up/cleanup, major!) #64
+  + Combined `sy` and `syd` script into one #210
+  + Add folder to daemon config in `sy init` #215/#153
+  + Bash completion for Arch Linux users #220
+- Bugfixes and other things:
+  + Fix daemon tests #185
+  + Rewrite bash completion, fixes --localdir issue #209
+  + Fix issue with `sy daemon force-stop` #212
+  + Fix multichunk decryption failure cache issue (part of #59)
+  + Make syncany://-links Windows CMD compatible #219/#225
+
+### Syncany 0.1.9-alpha (Date: 28 Aug 2014)
+- Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)
+- Features and significant changes:
+  + HTTPS-only for WebSocket/REST-like API and web interface #185/#196
+  + Add bash-completion functionality (Debian/Ubuntu) #201
+  + New and awesome end user guide at https://syncany.org/r/userguide
+- Bugfixes and other things:
+  + Implement full cleanup to fix (big!) #187/#193 
+  + Fixed database integrity issue (solved by #187)
+  + Fixed winning branch race condition #178 (solved by #187)
+  + Fixed file not recreated from winning branch #200/#203
+  + Add LRU cache for local files; no re-download of exist. multichunks #169
+
+### Syncany 0.1.8-alpha (Date: 9 Aug 2014)
+- Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)
+- Breaks compatiblity to 0.1.7-alpha repositories!
+- Features and significant changes:
+  + New Samba / Windows share plugin #172
+  + Public key authentication for the SFTP plugin #134
+  + WebSocket/REST-like daemon with user-password authentication. #171
+- Bugfixes and other things:
+  + Fixed cross dependency issue with plugins #162
+  + Fixed signed plugin JAR dependency error #161
+  + Fixed Windows/Linux attribute bingo #166
+  + Fixed Windows batch script; start/stop PID file issue #163
+  + Fixed Linux daemon script such that it can be symlinked #183
+  + Fixed running CLI commands while sync is running #182
+  + Tests: Added watch server tests for daemon #185
+  + Tests: Implement plugin install test #170
+  + Added 'type' attribute to database header (DEFAULT/PURGE) #181
+  + Prevent standby/hibernate if uploading/downloading #164
+  + Altered API backend to include 'conflicts-with' metadata #165
+  + Update Arch Linux AUR package #179
+
 ### Syncany 0.1.7-alpha (Date: 28 Jul 2014)
 
 - Developer/alpha release (**STILL NOT FOR PRODUCTION USE!**)