Merge branch 'master' into assistant

Conflicts:
	doc/design/assistant/webapp.mdwn
This commit is contained in:
Joey Hess 2012-07-26 05:22:44 -04:00
commit c4830aaa6c

View file

@ -5,8 +5,8 @@ The webapp is a web server that displays a shiny interface.
* Listen only to localhost. **done**
* Instruct the user's web browser to open an url that contains a secret
token. This guards against other users on the same system. **done**
* I would like to avoid passwords or other authentication methods,
it's your local system.
(I would like to avoid passwords or other authentication methods,
it's your local system.)
* Alternative for Linux at least would be to write a small program using
GTK+ Webkit, that runs the webapp, and can know what user ran it, avoiding
needing authentication.