Squashed 'core/' changes from ca1916c..b08bd4a

b08bd4a Merge branch 'release/0.1.4-alpha'
4f5b960 Update changelog and readme
1da96b6 Fix SQL database tests
94fdb92 Refactoring SQL stuff, removing old/unused code
f39cf2b Merge branch 'develop' of github.com:syncany/syncany into develop
2e08390 Split off ApplyChangesOperation from DownOperation; trying to make it easier to understand
364da52 DownOperation JavaDoc and a bit or re-org
4f58457 Update README.md
6ca338d Update README.md
b8f6940 Add --no-apply to 'down'; add JavaDoc to DownOperation; reorder DownOperation
f58c3fc Update changelog
2913a6d Merge branch 'feature/issue132fix' into develop
004f3d0 Fixes #135
b57a742 Make vector clock serialization pattern unambigious (only allow A-Z/a-z); fixes #123
0d1a5cc Merge branch 'develop' into feature/issue132fix
886937f Update CHANGELOG
c73c135 Merge branch 'develop' of github.com:syncany/syncany into develop
d69e239 Add meaningful output to down; Fix #129
8f59273 Adds a fix for #132 by introducing 'muddy' multichunks (= dirty by other client); very verbose; refactoring required
95936ed Extract StatusOperationResult/Options
6d79095 Update CHANGELOG.md
96047a8 Merge branch 'feature/issue58fix' into develop
5a5bade Write deleted versions to purge file; Fixes #58
8b5f0fd Write deleted versions to purge file; Fixes #58
0340aa0 Try to pre-read file history purges to handle #58; not successful; probably dead code
58a9f5d Reproduce #58 again, yeyy
66fb76a Remove filecontent_full and multichunk_full database view; not needed anymore (and faulty)
bc167b8 Add databaseversion_id to chunk and filecontent table to fix test for #58 (testIssue58_4); breaks all previous repositories !!
8e38df2 Reproduce #58 again; after reordering quick fix (purge-then-murge instead of merge-then-purge)
daba004 A bit of JavaDoc; create default daemon.xml
16d2a27 A bit of JavaDoc; create default daemon.xml
8be171b JavaDoc for daemon classes
227b769 Update Dockerfiles
f913a45 Add docker files
3d53709 Update dependencies in debian
285b147 Add application.properties to upload (fix)
99bac42 Add application.properties to upload
0f6bd0b Fix Eclipse Gradle stuff
fc0f66c Fix eclipse for daemon
20747c5 Update CHANGELOG.md
a40fd5e Make gradle scripts really nice
8799769 Externalize tests
122ea79 Externalize reports and FPM packaging
a5eef15 Externalize reports/tests/cobertura
d2686c1 Gradle simplification
82e6b5c Speed up travis by disabling default gradle assemble
11eaac3 Add gradle plugin settings
0bab8bc Add plugin helper gradle file
98bb82c Fix debian package; syd link
f027ca7 Fix lftp mirror (upload to syncany server)
3fe8c42 Fix dist and packaging
c04d1a0 Add daemon to changelog
414ab0c Remove unnecessary dependency
9f94fd0 Comment websocket stuff
29e1105 Merge new build.gradle from develop branch
5446166 Remove more GUI and unused stuff
0158df3 Remove more GUI stuff
ef34678 Remove stuff not necessary for daemon
e5dd831 Polishing web socket stuff
9879fc0 Remove stuff
d57c5c7 Remove more superfluous stuff
2c039e4 Merge branch 'feature/daemon' of github.com:syncany/syncany into feature/daemon
161b2d1 Merge develop to daemon
301861f Merge branch 'feature/conservativecleanup' into develop
dec825c Add counter and timer for cleanup in WatchOperation
a7602e9 Remove automatic cleanup in 'up', add interval-based cleanup to 'watch'
5a1404f Fix dirty database scenario test (manual cleanups)
b0d59d3 Remove automatic cleanup in UpOperation; manual cleanup in tests
85c2cab Thoughts and preparations for #132 (also relates to: #58 and #64)
cbd3d7a Merge branch 'develop' into feature/conservativecleanup
99dee71 Allow overriding /tmp directory via userconfig.xml (org.syncany.test.tmpdir); better for SSDs
1053bf0 Implement nicer checkPreconditions() in DownOperation
9e839ba Implement UpOperation.checkPreconditions() to simplify up
8976755 Merge branch 'develop' into feature/conservativecleanup
912e7ae Reactivate removeLostMultiChunks
1688f24 Update PKGBUILD to 0.1.3
ef334de Update README.md
6f8d0b5 Update CHANGELOG.md
de0f9a6 Bump version
351547d Merge branch 'release/0.1.3-alpha' into develop
b81eb22 Merge branch 'develop' into feature/daemon
c243f60 Merge branch 'develop' into feature/conservativecleanup
2c951a3 Merge cleanup workaround
5094d6e println()
6f2d282 Reproduces issue #58 (CleanupMergeDatabaseFilesScenarioTest.testIssue58_3)
3334d9c Fix cleanActionFiles()
5a7bd35 Implement conservative cleanup; relates to #64
1087515 Merge branch 'develop' into feature/daemon
c181b12 Fix log echo
177a7c5 Daemon log file
ad4c2ea Windows daemon adjustments; Shutdown database on daemon unload
88128a3 Major daemon work; syd start|stop|reload|status works; loading from daemon.xml works
4014139 Daemon refactoring; throwing out stuff
833a59b Merge develop (syntax fixes)
5ff0b6f Merge branch 'feature/daemon' of github.com:binwiederhier/syncany into feature/daemon
44dee8f Merge develop
9acf6ee Merge develop
4b665e7 Merge branch 'feature/daemon' of github.com:binwiederhier/syncany into feature/daemon
88f53c7 Merge develop
dd7c2e2 Skeleton, but working windows daemon starter
1668ccb Cont'd daemon WIP; playing around, moving things around
2c519e9 Merge branch 'develop' into feature/daemon
ae736f6 Merge branch 'feature/daemonplay' into feature/daemon
ad7456b Remove stuff from daemon; trying to simplify things
7f13b32 Added control file
5b81da1 Syncany daemon shell script for Linux; syncanyd and syd works on Linux
dcfa9b1 Merge branch 'develop' into feature/daemon
3bae885 Merge branch 'develop' into feature/daemon
45a76ae Merge branch 'develop' into feature/daemon
cea50b3 Merge develop, resolve conflicts
1c63bf5 Remove more GUI stuff
b47583d Merge develop
c2124ef Merge branch 'feature/daemon' of https://github.com/vwiencek/syncany into feature/daemon
19bb9d5 implementation of ServiceManager to handle start/stop/pause of services
8b7e9a9 refactoring daemon / In progress
620f1fd syncany daemon initial branch split
ce0ee15 import correction
677881e merge from master
590ecc5 Merge branch 'master' of https://github.com/vwiencek/syncany
501521e Merge branch 'master' of https://github.com/binwiederhier/syncany
0bc7769 Merge branch 'master' into gui
b04ddf0 Merge branch 'master' of https://github.com/binwiederhier/syncany
9643475 update project sructure + build file to match master developments
958fd29 Merge branch 'master' of https://github.com/binwiederhier/syncany
24dc9b5 Merge branch 'master' into gui
cb88a07 Merge branch 'master' into gui
c0bfa76 oops
0f2e107 update build files
26af2f9 Merge branch 'master' into gui
15ec917 Merge branch 'gui' of https://github.com/vwiencek/syncany into gui
46569f4 Merge branch 'fix-watch-notif' into gui
b44e766 Merge branch 'fix-watch-notif' into gui
cd25ea6 add "create if required" button
f394d2c name cleaning
e84d8e4 Merge branch 'master' into gui
6bde92c Merge branch 'master' into gui
45cb95b large update / cleanage on Map<String, String> commandObjects
0932c1f Merge branch 'fix-watch-notif' into gui
a889c1e Merge branch 'fix-tm' into gui
9433d46 clean submodules ....
aad704e Merge branch 'master' into gui
10d77c6 best practice : load credential from user.home/syncany.test.credential file
c3e20cb update messages refactor handleTest into RepositorySelectionPanel instead of each plugin panel clean gui/FileUtil class to decouple from Swt ==> should be integrated into util/FileUtil
5dae740 Merge branch 'fix-tm' into gui
424b8bd Merge branch 'master' into gui
ddd1b4d Merge branch 'master' into gui
b472abe Merge branch 'master' into gui
1f5c653 update button
565528c update hazelcast plugin
86ef07c add hazelcast plugin
a7bf645 update hazelcast plugin reference
b13306f Merge branch 'gui' of https://github.com/vwiencek/syncany into gui
adab776 add swt library determination in plugin
f3b10cf update hazelcast plugin
74da249 add hazelcast plugin as submodule
e498419 add java plugin so that submodule system works
8f340e6 fix break
1251ffc update TODO.md / README.md
b726f5c use "watcher" option for watchcommand
ac63d40 add watcher option
806a476 cleaning application gui syncany folder
f3a8b49 CommandStatus update / cleanage
9dc4892 set syncany folder as eclipse project (without java capabilities)
983f689 Merge branch 'master' into gui
6460a37 update userinput to implement getParameterAsBoolean
5626aec rename windows gui installer task
1919b09 up refactoring (ApplicationResourceMaganer + SWTUtil ==> WidgetDecorator) integrate StorageTestResult into UI
61a1d50 Merge branch 'fix-tm' into gui
dea4a66 Merge branch 'master' into gui
c247e8e update summary panel
7c4e0e7 refactoring / cleaning
0f21a34 add sftp to syncany-gui gradle build file
42df47a variable names correction
7b59d00 Merge branch 'master' into gui
6a83657 update ciphering Need to shorten name in combobox
0958132 update keylength
f2ed947 Dedicated inno setup file for GUI
5eba5bb update gradle build
af438cb add windows installer + create syncany-client.exe file for windows with Launch4j
5923f49 add innosetup for gui
b5a919d sftp plugin panel
3001f84 bug when parsing chunckSize
16b7aa9 switch python script parameters so its working
8990f26 ui update + refactoring
48e225d add beanutil dependency to copy object properties
8724dd5 tray messages management (since python script won't have access to i18n)
4d53f9c update messages + general settings panel
b8240ef update
521aee2 event manager isolation
80310e7 update gui plugin management
e8c0d13 update profiles after watch/init/connect
b41cdbc drag and drop syncany folders
b6a58f3 building of general settings panel
d1d29dd update account settings panel
2a5e5e4 settings panel update
8b74142 replace String watchedFolder with Profile
cc9bb17 add url connect parameter
0d56382 remove mac specific java property should be used to remove icon from dock but does not work
dbf611b clean methods RestoreWatchingFolder is the responsibility of gui client, not daemon
28ea9f5 add image resources pause / resume png transparent icons
e538a9d remove OPAL Swt library
36b754d add readme details for gui launching
3efaeaa merge
204a13c pause / resume
0b5464c implement pause watching folder
0ba7bfc use of plugin optionSpec
1238f24 clean deamon starting process
ad7af14 GUI refactoring (esp. Unity/Python scripts)
10d5814 widget decorator update
2bb5fc2 fix master merge
a5258bf Merge branch 'master' into gui
157b0f3 fixing compile break
d2d4d12 add ConnectCommant
4bfd55e ui panel cleaning add syncany url for connection
f181b09 improve watch init commands simplify  localfolder panels
0b6132e a
1292da0 add init operation result / genlink url to reply
7d4c7c2 large ui update add local folder selection
6f5e097 change socket lock port
33390e8 add error handling when daemon does not start
61fbd12 widget update
f703cd6 widgetDecorator
34bea21 update ftp plugin
7621f0f settings panel modifications
876064c doc / refactoring
d1057b1 save watched folder
d56310f Large ui update
d1cbd99 python script working from command line (gradlew)
5478043 strenghten user input
9d19149 update tray
0b03492 update trayicon
efc99d0 update unitytray script add BrowserHelper to launch url on any platform
e948704 settings
5da8d06 add listener to detect webserver launch
0f5b2cc load image from web server
f5834f0 Merge branch 'master' into gui
72eef2c update tray
3ab40e0 forgotten file
6474ab4 clean ui messages Imrove wizard management
67be3b0 gui unitytray
7b86d31 update ui
3a0c213 gui + plugin gui refactoring
332c788 Merge branch 'master' into gui
2cf1f11 better integration of python script into sync any gui …. external script seems to be the only clean way of doing
0ce268e Merge branch 'gui' of https://github.com/vwiencek/syncany into gui
01c5902 update unity tray
b89cbe1 Merge branch 'master' of github.com:binwiederhier/syncany into gui
d6444be Working status text in DefaultTrayIcon
27611cd Merge branch 'master' of https://github.com/binwiederhier/syncany into gui
f86adfb merge gui in unity
93a997e Merge branch 'gui' into unity
e7c1bd0 Merge https://github.com/binwiederhier/syncany into gui
d772bda Unity tray (appindicator) with Python script via WebSocket connection
497f793 correct daemon configuration file handling
b2d4c10 update to gradle 1.10
282ee86 Isolate System Tray Manager in dedicated class Add system tray icon animation (daemon send syncing/synced command to client every 5 seconds)
6ad7f9c Unity tray playground with Python
3d4c33b Local plugin panel basics
b073ab0 Wizard, tray and plugin panel adjustments
c116344 gradle runGu now works on linux still need to figure out how to make system tray appear in ubuntu 13
91f3c81 Merge branch 'master' into gui
f0400ad update ui
5defe0c Merge branch 'master' into gui
31de759 UI Refactoring Improvments Use of XML property file Add settings panel
3208341 font size correction
d1e84c2 Merge branch 'quick-fix' into gui
20ebc39 Merge branch 'master' into gui
8762435 Merge branch 'master' into quick-fix
6ab4c4c bulk update
96ff177 large ui refactoring
7f3396c Add mac osx support into EnvironmentUtil
dcc8889 Merge branch 'gui' of https://github.com/binwiederhier/syncany into gui
3bcd69c A few changes, moving things around
a5adbfe Merge branch 'quick-fix' into gui
6b46f61 add internationalisation support in util class
63761e5 add clean plugin panel management
fb09e4d Merge branch 'quick-fix' into gui
54e3713 Adding EmailValidator + test class
18a764b update
802507f move jsonhelper to util project
db347c9 Merge branch 'quick-fix' into gui
973d781 add json handling to syncany-util gradle update / helper class / test class
37902de Revert "Add Json handling to syncany-util (helper + test class + gradle update)"
1895345 Add Json handling to syncany-util (helper + test class + gradle update)
0d9fdaf plugin project moved to syncany-plugins update gradle scripts to match new folder architecture
ffadb69 Merge https://github.com/binwiederhier/syncany into gui
92010d6 add google bus event
1ed20c0 Merge branch 'master' into gui
9220c98 Merge https://github.com/binwiederhier/syncany into gui
780308f gui updates
ca3eb3b update
0f3581b Reorder steps in main function so that websocket client can be launched
2466045 add focus listener to Text widgets
407a4e3 new messages
4e2424f gradle dependency
9e4806b use of regex to validate url url pattern matching methods could be moved to dedicated class URLValidator
5f814eb use of Plugins.list() to get list of plugins
a1de08a javadoc
abc3606 correction of gradle dependencies
b5af7eb fix gradle dependencies
aa8b902 Merge branch 'gradle' into gui
8ad640a add systemTray mockup gui
5202ac0 Switch to SWT
a4db5a1 Merge branch 'gradle' into gui
46c41a6 update websocket for 2 way communication
e9a2e16 websocket server improvements
b85fdb3 first gui drawing with pencil
ca05be1 gui first (again) commit

git-subtree-dir: core
git-subtree-split: b08bd4a8d6f65c3d881b510a3b7ecf28e063b795
Merge commit 'e70c7fd78a2a5013cf23606ad33f64f54d64041e' into develop
Plugin gradle stuff
Merge branch 'release/plugin-ftp/v0.1.4-alpha'