aboutsummaryrefslogtreecommitdiff
path: root/Assistant
Commit message (Expand)AuthorAge
* assistant: Merge changes from refs/remotes/foo/master into master.Gravatar Joey Hess2017-06-07
* analysisGravatar Joey Hess2017-06-07
* configuration to disable automatic merge conflict resolutionGravatar Joey Hess2017-06-01
* adeiu, MissingHGravatar Joey Hess2017-05-16
* rename prompt since Messages added a function by that nameGravatar Joey Hess2017-05-15
* Added remote.<name>.annex-push and remote.<name>.annex-pullGravatar Joey Hess2017-04-05
* AssociatedFile newtypeGravatar Joey Hess2017-03-10
* remove unused importGravatar Joey Hess2017-03-08
* assistant: Add 1/200th second delay between checking each file in the full tr...Gravatar Joey Hess2017-03-06
* fix up Read instance incompatability caused by recent commitGravatar Joey Hess2017-02-24
* add KeyVariety typeGravatar Joey Hess2017-02-24
* include problem PairData in error messageGravatar Joey Hess2017-02-13
* Make import --deduplicate and --skip-duplicates only hash once, not twiceGravatar Joey Hess2017-02-09
* add SetupStage parameter to RemoteType.setupGravatar Joey Hess2017-02-07
* annex.autocommit can be configured via git-annex configGravatar Joey Hess2017-02-03
* Some optimisations to string splitting code.Gravatar Joey Hess2017-01-31
* webapp: full wormhole pairing UI (untested)Gravatar Joey Hess2016-12-27
* clean up some importsGravatar Joey Hess2016-12-27
* mocked up wormhole pairing interface in webappGravatar Joey Hess2016-12-24
* Merge branch 'master' into no-xmppGravatar Joey Hess2016-12-24
|\
| * Always use filesystem encoding for all file and handle reads and writes.Gravatar Joey Hess2016-12-24
| * max authtoken length is 128Gravatar Joey Hess2016-11-30
| * Merge branch 'master' into torGravatar Joey Hess2016-11-29
| |\
| * | unified AuthToken type between webapp and torGravatar Joey Hess2016-11-22
| | * Relicense 5 source files that are not part of the webapp from AGPL to GPL.Gravatar Joey Hess2016-11-21
| * | remotedaemon: Fork to background by default. Added --foreground switch to ena...Gravatar Joey Hess2016-11-20
| |/
| * Avoid backtraces on expected failures when built with ghc 8; only use backtra...Gravatar Joey Hess2016-11-15
| * fix tricky warning with ghc 8Gravatar Joey Hess2016-11-15
| * sync: Pass --allow-unrelated-histories to git merge when used with git git 2....Gravatar Joey Hess2016-11-15
* | remove xmpp supportGravatar Joey Hess2016-11-14
|/
* convert TMVars that are never left empty into TVarsGravatar Joey Hess2016-09-30
* switch away from deprecated interfaceGravatar Joey Hess2016-09-05
* switch away from deprecated recvFromGravatar Joey Hess2016-09-05
* get, move, copy, mirror: Added --failed switch which retries failed copies/movesGravatar Joey Hess2016-08-03
* webapp: Escape unusual characters in ssh hostnames when generating mangled ho...Gravatar Joey Hess2016-07-19
* filter out NoUUID remotes from syncDataRemotesGravatar Joey Hess2016-06-09
* only warn about missing dbus support on linuxGravatar Joey Hess2016-05-24
* Pass the various gnupg-options configs to gpg in several cases where they wer...Gravatar Joey Hess2016-05-23
* move keys db closure to AutoMergeGravatar Joey Hess2016-05-16
* assistant: Fix race in v6 mode that caused downloaded file content to sometim...Gravatar Joey Hess2016-05-16
* assistant: Fix bug that caused v6 pointer files to be annexed by the assistant.Gravatar Joey Hess2016-05-16
* stage pointer file not annex linkGravatar Joey Hess2016-05-16
* avoid warnings about not exported System.Directory.isSymbolicLinkGravatar Joey Hess2016-04-28
* Fix build with directory-1.2.6.2.Gravatar Joey Hess2016-04-28
* make assistant not write wrappers when GIT_ANNEX_PACKAGE_INSTALL is setGravatar Joey Hess2016-04-27
* assistant: Deal with upcoming git's refusal to merge unrelated histories by d...Gravatar Joey Hess2016-04-22
* use more general moduleGravatar Joey Hess2016-04-21
* Preserve execute bits of unlocked files in v6 mode.Gravatar Joey Hess2016-04-14
* update sync branch to the orig branch when in adjusted branchGravatar Joey Hess2016-02-29
* make assistant aware of adjusted branches when mergingGravatar Joey Hess2016-02-29