Merge commit 'd3db96eb5586e709b595085fc4357617dff76a96' into develop
Squashed 'core/' changes from ae1b08d..ec4a077

ec4a077 Merge branch 'develop' of github.com:syncany/syncany into develop
b99ab47 Add new readme with screenshots of user guide and add a few authors
5a14f09 Bumping arch PKGBUILD
b8ec626 Update CHANGELOG.md
de5a5b6 Write full daemon-example.xml instead of almost empty one
453feae Add man page / help text for 'sy daemon'
24d98a2 Fix force-stop issue on Linux and Mac(?)
4f3984f Add log level to bash completion
d47e82d Further enhance the bash completion script
e50fbfd Merge branch 'develop' of github.com:syncany/syncany into develop
8fbdf5a Rewrite bash completion; fixes #209
71d27aa Merge pull request #218 from vwiencek/quick-fix
77715dc missing break
bf907af Merge branch 'develop' of https://github.com/syncany/syncany into develop
02ee5b0 Update CHANGELOG.md
5194879 Merge branch 'develop' into feature/initautoadd
ddba59a Merge branch 'feature/scripts' into develop
08569c5 Quick fix to include sy.bat; relates to #210
4adb609 * move .bat to .skel.bat * embedde daemon script into main script with goto/labels
1f92cf6 Automatically add folder to daemon config in sy init/connect
f5aa457 correct call to daemon_get_pid
a215491 Minor things
9cee132 Update CHANGELOG.md
2f176e0 Prettify combined Linux script
18f9f14 Merge branch 'develop' into HEAD
36cdd81 remove circular reference
8d5dc84 Fixes basic daemon test, closes #185
e6cc901 sy script now includes daemon handling
bc9c641 Do not automatically att ~/Syncany to daemon.xml; create daemon-example.xml instead; relates to #210
f80342e merge daemon in lib
b39c48d sy and syd merged
83dfe00 Update readme
a0a1c3f Merge branch 'develop' of github.com:syncany/syncany into develop
9ecd4cc Update README.md
b65b741 Update README.md
fb597e5 Smaller readme with images
8229b36 Smaller readme with images
97ec8d8 Smaller readme with images
54a9cac Smaller readme with images
c5c6b13 Smaller readme with images
f45c2b3 Bump version
656d530 small correction
362f1eb remove function keyword
e52e3bb remove darwin detection
042785d add generic get_realpath function
c1750f6 detect osx
e115634 script working with OS X
42b92c5 revert
e8caf24 update script to work with osx
7d93830 Merge branch 'develop' of https://github.com/syncany/syncany into develop
da6e4f5 Update README.md
6ff3f28 Bump version in readme
3adaf2c Merge branch 'develop' of https://github.com/syncany/syncany into develop
6ab48f9 Merge branch 'develop' of https://github.com/syncany/syncany into develop

git-subtree-dir: core
git-subtree-split: ec4a077a937f59b07d0a969c25ceaa99eeab8ae0
Bump version
Adding move
Being less of a dummy
Squashed 'core/' changes from ec4a077..19fc4ae

19fc4ae Update CHANGELOG.md
9b75f3a Update CHANGELOG.md
320ca98 Fixing test: There are more folders due to transactions
8e63b54 Merge pull request #224 from syncany/feature/atomic-operations
20ab344 Making actionFileHandler tx-unaware
8be7e8c Add flag for 'do not remove temp files, relates to #64'
51e9aa7 Move some comments
b79a96a Update changelog
d04f4b9 Merge branch 'develop' into feature/atomic-operations
236b5dc Delete multichunk from cache if decryption failed. Related to #59
569cccf Merge branch 'develop' into feature/atomic-operations
32cf5c0 Delete multichunk from cache if decryption failed. Related to #59
8bab6a8 Merge branch 'develop' into feature/atomic-operations
2d6cb9f Delete multichunk from cache if decryption failed. Related to #59
7404ca0 Merge branch 'develop' into feature/atomic-operations
daacbad Delete multichunk from cache if decryption failed. Related to #59
dd3f3ae First check for native Java, relates to #221 #222
8d90769 Hopefully fix #221
8782615 Try to fix issue #221
4cc5de2 Moving unreferenced deletions out of transactions and test for it
c3558ba Formatting, grouping, commenting
442a983 Cleaning unreferenced temporary files
da964b2 Split cleanTransactions in another function
35c7f0f Extracting cleanTransactions from TransferManager
eaccbe2 Moving temporary files to seperate directory
24b697b Reordering RemoteTransaction (no code changes, just ordering and grouping); moving Storage* to transfer package
006d98b Merge branch 'develop' into feature/atomic-operations
3ec7846 Testing list() and download()
e1ff548 Second cleanup test
afbbbb9 First cleanup interrupted test
14182e5 Don't retry if a file does not exist
de573fd Updating TransferManager javadoc to reflect new situation
8f788db Updated changelog
7261b48 Re-merge develop
9bcb25a Fix 4_1 assumptions, and assumption issues in 4_3, relates to #64
2904e0f Merging develop into feature/atomic-operations
bff2e70 Moving dummy file download to TxAwareTM.
c53ec5b Attempting to make unreliable tests more consistent
7dcb3f8 Starting with extracting functionality to TransactionAwareTM
f521ce0 Fixing autoformat eclipse
aea7384 Deleting transaction file before final deletions
2ed8b49 Commenting
9851464 Merge develop
f027082 Remove wrong comment
e704f4c Added test for TX that fails twice; test fails; refactoring
e5d293b Adding comment
08a7de1 Add test for atomic transactions; works as expected (more tests required though); relates to #64
1d88c08 Renaming, beginning unit test preparation
db4984e Merged develop
67df3d7 Move syncany-assets to https://github.com/syncany/syncany-assets
d642689 Add new diagrams for documentation
965cd65 Merge develop
6b2d13a Unused code in test
7f8d39d Rolling back local database if cleanup fails (fixes test)
ac91278 Added a test; should this fail?
ad1ac2f Encrypting transaction files and adding config to transfermanager
e43a078 Merge branch 'feature/atomic-operations' of github.com:syncany/syncany into feature/atomic-operations
919da59 Fix switch/case fallthrough in CLI output2
7dc47f2 Fixing cleanupTransactions to undo deletes
9b1a26f Add specification for TM.download()
6530e07 Making plugins almost entirely tx-agnostic
30a9d48 Commenting and removing legacy code
a68b4e6 Formatting
d5f5c71 Merge develop; TX.add -> TX.upload
102b093 Merge branch 'feature/atomic-operations' of https://github.com/syncany/syncany into feature/atomic-operations
f21cf91 Fixing tests after rename
3a9581c Refactoring createRemoteFile; getting rid of warnings
081298e formatting adjustments
d655c7c Formatting stuff
90e8bde Using name patterns to dynamically create remotefiles
8d28191 Merging develop into feature/atomic-operations
23b0d14 Merge branch 'develop' into feature/atomic-operations
bb53537 Merge again?\!
b9996c9 Merged develop into atomic operations; issue with Reflections
fa10785 Two unit tests were failing. You won't believe how I fixed it!
3ed505a Merge commit 'b9a500c23d23632d040ce5d62b716049dd882c25' into feature/atomic-operations
b9a500c Fixing move used in deletion to not fail if original did not exist
7e7fd38 Unignoring deletes in transaction
42f32c5 Transactionifying the transaction cleanup
5ce98fe Small fixes with regards to cleaning
c85ae4b Enabling atomic cleanup
aa856b4 Patching tests
46a2a68 Refactoring and enabling cleanup
206698a Refactoring TransactionTO for better generalization
f796f9a Deleting duplicate files, fixing test and restoring some infrastructure
de47aa8 Merging develop into feature/atomic-operations
4388a1b Atomicity Up, initial attempt
1de7d10 Re-adding move methods to TM's
3f52e32 Merge branch 'develop' into feature/atomic-operations
3e128e0 Naming, rest of review, NICE WORK
699ca5b Merge branch 'develop' into feature/atomic-operations
1921a38 Tiny alterations on the atomic operations; untested
dfcc4f8 Merge branch 'feature/atomic-operations' of github.com:pimotte/syncany into feature/atomic-operations
c837613 Transaction test
7d04455 Ensuring files are listed after cleaning up the repo
fc48e15 Merge remote-tracking branch 'upstream/develop' into feature/atomic-operations
d269651 Revert "Enabling atomic deletes" and the two following commits that enabled atomic cleanup.
b498065 Fixing nullpointers and such
5115152 Atomic cleanup
9a20c17 Enabling atomic deletes
8f57cdd Fixing tests for presence of temp directory
16ce66a Merge remote-tracking branch 'upstream/develop' into feature/atomic-operations
01a2e02 Fix NullPointerException with config
79a2481 Adding config to connection
3cc4797 Remote file creation and unreliable-plugin move implementation
4b49587 Using cache for transaction files
5c3a477 Each machine cleans up their own mess
047be4c Don't ignore transaction files to prevent stackoverflow
b58893c Ignore files in list if they are in transaction
b909598 Merge remote-tracking branch 'upstream/develop' into feature/atomic-operations
97af2d3 Writing the transaction to a file
516684b Merge remote-tracking branch 'upstream/develop' into feature/atomic-operations
1d18160 Switching UpOperation to atomic transfer
d912092 Creating a transaction file in the remote repo
15f437c Adding move to interface
c9a5c8d First version TempRemoteFile
63d1d6c First draft RemoteTransaction

git-subtree-dir: core
git-subtree-split: 19fc4aebe03341cc882d98b5d9042a9aad528b07
Merge commit '649fc5242615c504c1a733e004faf215285b27a5' into develop
Adding transaction and temp paths
Merge branch 'feature/atomic-operations' into develop
Squashed 'core/' changes from 19fc4ae..ed18574

ed18574 Merge branch 'release/0.1.10-alpha'
59ce06d Update changelog
f15a865 Adding bash completion to PKGBUILD
54781d5 Patching CLI tests to prevent littering daemon.xml
e7c41bb Merge branch 'develop' of github.com:syncany/syncany into develop
3b3c3ce Add a few tests, update changelog
7908dc1 Flushing to prevent corruption
78c86c2 use of bitcoinj file
f072785 * remove trailing "/" from base58 alphabet (initially added beacause I thought I had to decrypt master/config ...... my mistake) * modify link regex to parse correctly syncany links
dbaf672 clean up
9b1153e found it
5c4bf2f problem with GenlinkCommandTest, sometimes failing, sometimes succeeding
dbf4cfe test

git-subtree-dir: core
git-subtree-split: ed1857427fa170a9db98ed7749148069482ac4ed
Merge commit '1659a7d8edf3f745aa6ab7a38994f183706a2edb' into develop
Merge branch 'develop' of github.com:syncany/syncany-plugin-ftp into develop
Merge branch 'release/plugin-ftp/v0.1.10-alpha'