s3 and webdav no longer conflict
Bump version
Squashed 'core/' changes from 67e458c..340e7ce

340e7ce Merge branch 'release/0.1.8-alpha'
6d5d8ee Merged develop into release; getting ready for the release
5bb51a1 Do not re-download multichunks (relates to #169)
7425961 Merge bugfix for #164
e4d078e Formatting, new lines
4c4cb58 Formatting; nicer error message if in headless mode; fixes #164
04da8b0 Prevent standby implementation in ActionFileHandler, relates to #164
bc5d0dc Move pixel back and forth, relates to #164
26b6c19 Merge pull request #190 from syncany/tests/daemon
2f330d2 Newline style changes and changelog update
ca3f6d0 Merge branch 'develop' into tests/daemon
3351b96 Restore file test
3c3a393 Fix timings and port to ensure consistency
bd2f68a Update CHANGELOG.md
05dd06d Merging to one test due to inconsistent behavior
09625f3 Merge branch 'develop' into tests/daemon
30ae413 Begin operationRequestsTest
a62e8b8 Extending getFileRequests test
22d9367 Add release date (Sunday)
36f95d0 Bump version and adjust changelog
a3b5844 Add new 'type' attribute to database version in SQL DB, and in DatabaseVersionHeader class, relates to #181
187183e Second test and refactoring
c8f6fd5 Merge pull request #186 from syncany/bugfix/cli-daemon-interaction
e877b68 Removing trial function
717b15f Fixing up pausing mechanism WatchOperation
0f3b393 pausing WatchOperation while processing CLIRequest
1a7d3f4 Add test dependencies for syncany-daemon
e6e93af First daemon test
635e8be Better error message in case of database lock
004f6b0 Easy fix to not run CLI commands while sync is running or requested. Closes #182
af44247 Fixes Windows batch script; start/stop PID file issue; fixes #163
80e1a80 Update CHANGELOG.md
f2fe69b Merge branch 'feature/daemon' into develop
5170c81 Merge pull request #183 from syncany/bugfix/daemon-symlink
ac9f037 readlink is not POSIX, but is in coreutils in at least Arch and Ubuntu
fe7e39d Correctly handling reloading of portTO
a4026ee Formatting, new lines
c209a3b Merge branch 'develop' of github.com:syncany/syncany into feature/daemon
9c0456d Reverting symlink friendlyness; 'realpath' is not installed by default, not part of posix shell/bash
1e1967b Last cleanup before merge
70be2d1 Merge branch 'develop' into feature/daemon
0a2f190 Formatting, port stuff
635eb55 Formatting, port stuff
cef9e65 Spelling alphabetic correctly
60845d0 Clarifying non-numeric alphanumeric strings
2b42bc0 Authentication with CLI to daemon
27bd83f Moving UserTO and create PortTO
8aa6ab3 Making alphanumeric alphaNUMERIC
226cb38 Readme update
1e60f3a Merge branch 'develop' of github.com:syncany/syncany into develop
7983c7a Make TOs not strict (allow unknown tags in XMLs)
8491afc Merge pull request #179 from afics/develop
d437ac5 Update README.md
adcb991 updated package description
838d1dd Update README.md
95a5172 Update README.md
9ced11c Update README.md
02ffbce Merge branch 'develop' of github.com:syncany/syncany into develop
f3af327 Reproduces issue #143 (yeyyyy)
457d44c Writing and reading portFile
1c9ba58 Fixing reloading of watchOperations in daemon
6263f20 Update CHANGELOG.md
5d405d4 Merge branch 'develop' into feature/daemon
6f19936 Daemon review, formatting changes and small code adjustments, relates to #171
bab9905 init() does not actually check existence
ee0c195 Updating changelog
f5d24ff Adding some logging
14471c1 Adjusting daemon.xml (users optional and default config)
64d06e4 Enabling user authorization
027a924 User management
07c9f45 Reload all daemon configs
b85bce3 Merging the user-password authentication part from feature/daemonauth
784620a Extracting InternalWebInterfaceHandler
479793e Extracting InteralRestHandler
6404b75 Refactoring InteralWebSocketHandler to seperate class
ed5b40e Reordering and javadoc on DaemonOperation
a6cc4df Update CHANGELOG.md
ae3afda Fix #166 by making last modified date comparison fuzzy
705e014 Merge develop; fix conflicts
b9dfa95 Changelog public key authentication
c777c83 Making syncanyd symlink friendly
2fd8a32 Merge pull request #170 from syncany/test/plugin-install
6d373e4 Reflecting to obtain a test that installs the ftp plugin
9a07897 Removing no longer valid tests
0602921 Allow sensitive optional PluginOptions
36a76cc Bumping PKGBUILD
65df946 Changelog message #165
99df0b9 This should fix issue #166, not unit-testable
5ca21e5 Update build.gradle
3a9db14 Update CHANGELOG.md
e738c8c Merge branch 'release/0.1.7-alpha'
956df53 Merge branch 'develop' into feature/daemon
5f86a7e Fix CLIoverREST (add default constructor)
4a2d264 Merge branch 'feature/daemon' of github.com:syncany/syncany into feature/daemon
a43134f Merge branch 'develop' into feature/daemon
fbd5e52 Merge branch 'develop' into feature/daemon
16a308f Merge develop
f78399e Merge branch 'develop' into feature/daemon
a66d5df Changes to work with plugins
c86dd17 Prevent binary file processing of resources
404099d Removed web interface to own module
bf33c8d Remove old test JS/HTML code, introduce web server config
89fa9a7 Merge branch 'develop' into feature/daemon
09234a7 Merge branch 'feature/anyplugin' into feature/daemon
0c06126 Fix list/set
c247794 Merge branch 'feature/anyplugin' into feature/daemon
210833b Adjust web interface plugin to new plugin layout
b9eaf91 Merge branch 'feature/anyplugin' into feature/daemon
00b2faf Merge branch 'develop' into feature/daemon
6803026 Add working file download of any version
be3bcdd Merge branch 'develop' into feature/daemon
1b38ff3 Merge branch 'develop' into feature/daemon
3f52023 Restore request/response; adjust web interface
6e93231 Let the CLI talk to the daemon via WS if it's handled by the daemon
a85df00 Merge branch 'develop' into feature/daemon
f78f688 Merge branch 'develop' into feature/daemon
63c5af3 Merge branch 'develop' into feature/daemon
be299eb Merge branch 'develop' into feature/daemon
0ca35b3 Minor changes
a4081d2 Merge branch 'develop' into feature/daemon
7c2574d Allow date browsing
7689860 Merge branch 'develop' into feature/daemon
7a28704 Merge branch 'feature/newlog' into feature/daemon
bedb5d4 Fix newlog
8aa3bc9 Merge branch 'feature/newlog' into feature/daemon
cd43180 Merge branch 'develop' into feature/daemon
9656f19 Remove binary response stuff
a6160cd Merge develop
b044feb Make web interface a plugin
72dacc6 Add new events support to web ui
da1e5bb Merge branch 'develop' into feature/daemon
528c25a Cont'd web interface
8cc0e64 Grouping of table by file type, finally
0941704 Cont'd cleaning up JS code
6562e4d Scrolling and stuff
8027cdc Added tree and table with subentries, added slider for date selection
77d90ac Added context menu to table view, removed files from tree view
df56385 Embedded web interface; switched to Undertow web server / web socket server
75c28aa Cont'd work on web interface
3c1945e Nicer menu, status bar
9fe646c Add datatable
0753a57 Simple web interface
a9712b7 Reply only to one client
a1eb5fd Continued JavaScript frontend; working file tree with multiple roots
469ec67 Merge branch 'develop' into feature/daemon
a0538a0 Merge branch 'develop' into feature/daemon
6a38fe1 Merge develop
991fb06 Merge branch 'develop' into feature/daemon
c45156e Merge branch 'develop' into feature/daemon
8541fac Merge branch 'feature/daemon' of github.com:syncany/syncany into feature/daemon
83de56a Merge branch 'develop' into feature/daemon
4ddc37e Merge branch 'develop' into feature/daemon
d0da3ba Merge branch 'develop' into feature/daemon
817e6ac Playing around with websocket/js-based download
9d3598f Add websocket file transfer test to web/js client
a7f445d Playing around with binary data in websocket return
d8b9d49 Add XML root names as type distinguisher
3c8540f Moving things around
2517c95 Working fileTree WS request/response
8984609 Continue WebSocket development; Re-introduce Guava EventBus
39ca7c5 Merge branch 'develop' into feature/daemon
4f102ff Merge branch 'develop' into feature/daemon
0c774fc Merge branch 'feature/daemon' of github.com:syncany/syncany into feature/daemon
a5944b2 Merge branch 'develop' into feature/daemon
d295d1e Re-enable websocket

git-subtree-dir: core
git-subtree-split: 340e7ce3501a8a8eeb03df36ef42153a550f928e
Merge commit 'd2203892488989a9484bdd128f87707d3c027756' into develop
Merge branch 'release/plugin-webdav/v0.1.8-alpha'