Merge remote-tracking branch 'origin/master' into assistant

Conflicts:
	Init.hs

2 files changed, 32 insertions, 13 deletions

diff --git a/doc/design/assistant/blog/day_52__file_browser.mdwn b/doc/design/assistant/blog/day_52__file_browser.mdwn
new file mode 100644
index 000000000..a9762cc09
--- /dev/null
+++ b/doc/design/assistant/blog/day_52__file_browser.mdwn
@@ -0,0 +1,21 @@
+Today I added a "Files" link in the navbar of the WebApp. It looks like a
+regular hyperlink, but clicking on it opens up your desktop's native file
+manager, to manage the files in the repository!
+
+Quite fun to be able to do this kind of thing from a web page. :)
+
+---
+
+Made `git annex init` (and the WebApp) automatically generate a description
+of the repo when none is provided.
+
+---
+
+Also worked on the configuration pages some. I don't want to get ahead
+of myself by diving into the full configuration stage yet, but I am at
+least going to add a configuration screen to clone the repo to a removable
+drive.
+
+After that, the list of transfers on the dashboard needs some love.
+I'll probably start by adding UI to cancel running transfers, and then
+try to get drag and drop reordering of transfers working.
diff --git a/doc/design/assistant/webapp.mdwn b/doc/design/assistant/webapp.mdwn
index 7df93cf40..ddcc66153 100644
--- a/doc/design/assistant/webapp.mdwn
+++ b/doc/design/assistant/webapp.mdwn
@@ -17,10 +17,10 @@ The webapp is a web server that displays a shiny interface.
 ## interface
 
 * list of files uploading and downloading **done**
-* progress bars for each file
+* button to open file browser on repo (`xdg-open $DIR`) **done**
+* progress bars for each file (see [[progressbars]])
 * drag and drop to reorder
 * cancel and pause
-* button to open file browser on repo (`xdg-open $DIR`)
 * keep it usable w/o javascript, and accessible to blind, etc
 
 ## other features
@@ -29,18 +29,16 @@ The webapp is a web server that displays a shiny interface.
   over http by the web app
 * Display any relevant warning messages. One is the `inotify max_user_watches`
   exceeded message.
+* possibly add a desktop file to the top of the repository that can be used
+  to open the webapp (rather than using the menus). Would be complicated
+  some by the path to git-annex sometimes needing to be hardcoded and varying
+  across systems, so it would need to be a symlink to `.git/annex/desktop`
+  which would be per-system.
 
-## first start
+## first start **done**
 
 * make git repo **done**
-* generate a nice description like "joey@hostname Desktop/annex"
-* record repository that was made, and use it next time run
+* generate a nice description like "joey@hostname Desktop/annex" **done**
+* record repository that was made, and use it next time run **done**
 * write a pid file, to prevent more than one first-start process running
-  at once
-
-## implementation
-
-* possibly lose the ugly auth= token past the first page,
-  and use a client-side session. It could be encrypted using the token
-  as the `encryptKey`. Note: Would need to set the session duration
-  to infinite (how?)
+  at once **done**