| Commit message (Expand) | Author | Age |
* | fix crashes when run in a git repo that has been initted but has no master br... | Joey Hess | 2012-08-05 |
* | Merge remote-tracking branch 'origin/master' into assistant | Joey Hess | 2012-08-05 |
|\ |
|
| * | unused, status: Avoid crashing when ran in bare repo. | Joey Hess | 2012-08-05 |
* | | wire up scan and transfer to newly added removable drive | Joey Hess | 2012-08-04 |
* | | full autostart support | Joey Hess | 2012-08-02 |
* | | webapp is no longer a daemon | Joey Hess | 2012-08-01 |
* | | always run webapp in foreground | Joey Hess | 2012-08-01 |
* | | write pid file even when running in foreground | Joey Hess | 2012-08-01 |
* | | implemented firstrun repository creation and redirection to full webapp | Joey Hess | 2012-08-01 |
* | | when run in uninitialized git repo, do firstrun | Joey Hess | 2012-07-31 |
* | | don't start webapp when in a git repo that has not been git-annex initted | Joey Hess | 2012-07-31 |
* | | webapp now starts up when run not in a git repo | Joey Hess | 2012-07-31 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-07-27 |
|\| |
|
| * | initremote: Avoid recording remote's description before checking that its con... | Joey Hess | 2012-07-27 |
* | | now the webapp has the same options as the assistant | Joey Hess | 2012-07-27 |
* | | much better webapp startup of the assistant | Joey Hess | 2012-07-27 |
* | | increase timeout from 10 to 100 seconds | Joey Hess | 2012-07-26 |
* | | when starting the assistant, wait for it to create the shim file, as well as ... | Joey Hess | 2012-07-26 |
* | | webapp: check that the shim exists, and restart the assistant if not | Joey Hess | 2012-07-26 |
* | | on second thought, let's use --restart rather than --force | Joey Hess | 2012-07-26 |
* | | git annex webapp --force forces a restart of the daemon | Joey Hess | 2012-07-26 |
* | | fix editor damage | Joey Hess | 2012-07-25 |
* | | git annex webapp now opens a browser to the webapp | Joey Hess | 2012-07-25 |
* | | add back debug logging | Joey Hess | 2012-07-19 |
| * | pull in transfer log code from assistant branch | Joey Hess | 2012-07-18 |
* | | Merge branch 'threaded' into assistant | Joey Hess | 2012-07-18 |
|\ \ |
|
| * | | switch from System.Cmd.Utils to System.Process | Joey Hess | 2012-07-18 |
| |/ |
|
* | | Merge branch 'master' into assistant | Joey Hess | 2012-07-17 |
|\| |
|
| * | map: Write map.dot to .git/annex, which avoids watch trying to annex it. | Joey Hess | 2012-07-17 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-07-16 |
|\| |
|
| * | copy, drop: Avoid checking numcopies attribute unnecessarily | Joey Hess | 2012-07-10 |
* | | wrote transfer thread | Joey Hess | 2012-07-05 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-07-02 |
|\| |
|
| * | pass associatedfile and remoteuuid to git-annex-shell | Joey Hess | 2012-07-02 |
| * | record transfers for git-annex-shell | Joey Hess | 2012-07-02 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-07-01 |
|\| |
|
| * | record transfer information on local git remotes | Joey Hess | 2012-07-01 |
| * | get, move, copy: Now refuse to do anything when the requested file transfer i... | Joey Hess | 2012-07-01 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-06-27 |
|\| |
|
| * | typo | Joey Hess | 2012-06-27 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-06-27 |
|\| |
|
| * | use "variant" rather than "version" | Joey Hess | 2012-06-27 |
| * | better filenames for conflict resolution files | Joey Hess | 2012-06-27 |
| * | commit merge resolution | Joey Hess | 2012-06-27 |
| * | fix file name | Joey Hess | 2012-06-27 |
| * | don't automerge when the symlinks cannot be parsed as keys | Joey Hess | 2012-06-27 |
| * | sync: Automatically resolves merge conflicts. | Joey Hess | 2012-06-27 |
| * | properly handle deleted files when processing ls-files --unmerged | Joey Hess | 2012-06-27 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-06-23 |
|\| |
|
| * | sync: Avoid recent git's interactive merge. | Joey Hess | 2012-06-23 |