diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-03 15:16:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-03 15:24:21 -0400 |
| commit | 3bb7ad5f1f3acc0c02f26d374d60337d814c5d54 (patch) | |
| tree | d6a30a873e794e8eca4e6befb87ecc419bcb38c4 | |
| parent | a7b866fe84d55627ed70db0a8266a0b3e708290b (diff) | |
webapp: Add UI to stop assistant.
Would like to also have restart UI, but that's rather harder to do,
seems it'd need to start another copy of the webapp, and redirect the
browser to its new url, but running two assistants in the same repo at
the same time isn't good.
| -rw-r--r-- | Assistant/Threads/WebApp.hs | 1 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/assistant/controlmenu.png | bin | 0 -> 7646 bytes |
3 files changed, 7 insertions, 0 deletions
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index a91a198e9..58e7de1f6 100644 --- a/Assistant/Threads/WebApp.hs +++ b/Assistant/Threads/WebApp.hs @@ -25,6 +25,7 @@ import Assistant.WebApp.Configurators.AWS import Assistant.WebApp.Configurators.WebDAV import Assistant.WebApp.Configurators.XMPP import Assistant.WebApp.Documentation +import Assistant.WebApp.Control import Assistant.WebApp.OtherRepos import Assistant.Types.ThreadedMonad import Utility.WebApp diff --git a/debian/changelog b/debian/changelog index 469760021..39707c6c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (3.20130103) UNRELEASED; urgency=low + + * webapp: Add UI to stop assistant. + + -- Joey Hess <joeyh@debian.org> Thu, 03 Jan 2013 14:58:45 -0400 + git-annex (3.20130102) unstable; urgency=low * direct, indirect: New commands, that switch a repository to and from diff --git a/doc/assistant/controlmenu.png b/doc/assistant/controlmenu.png Binary files differnew file mode 100644 index 000000000..397dbe93b --- /dev/null +++ b/doc/assistant/controlmenu.png |
