mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into assistant-longpolling-rewrite

Browse source
This commit is contained in:
Joey Hess 2012-07-30 18:19:17 -04:00
commit e3c60b8f4c
4 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
doc/bugs/build_failure_with_kqueue_code__44___first_commit_that_breaks_is_3dce75fb23fca94ad86c3f0ee816bb0ad2ecb27c.mdwn Normal file
View file

@ -0,0 +1,25 @@
Here goes...
<pre>
laplace:git-annex jtang$ make
ghc -O2 -threaded -Wall -ignore-package monads-fd -ignore-package monads-tf -outputdir tmp -IUtility -DWITH_ASSISTANT -DWITH_S3 -DWITH_WEBAPP -DWITH_KQUEUE -DOSX --make git-annex Utility/libdiskfree.o Utility/libmounts.o Utility/libkqueue.o
Assistant/Threads/MountWatcher.hs:40:0:
warning: #warning Building without dbus support; will use mtab polling
[165 of 208] Compiling Assistant.Alert ( Assistant/Alert.hs, tmp/Assistant/Alert.o )
[173 of 208] Compiling Assistant.DaemonStatus ( Assistant/DaemonStatus.hs, tmp/Assistant/DaemonStatus.o )
[174 of 208] Compiling Assistant.TransferQueue ( Assistant/TransferQueue.hs, tmp/Assistant/TransferQueue.o )
[175 of 208] Compiling Assistant.Threads.Watcher ( Assistant/Threads/Watcher.hs, tmp/Assistant/Threads/Watcher.o )
Assistant/Threads/Watcher.hs:61:43:
Couldn't match expected type `Utility.Kqueue.Kqueue'
with actual type `()'
Expected type: IO Utility.Kqueue.Kqueue -> IO Utility.Kqueue.Kqueue
Actual type: IO Utility.Kqueue.Kqueue -> IO ()
In the fourth argument of `watchDir', namely `startup'
In the second argument of `($)', namely
`watchDir "." ignored hooks startup'
make: *** [git-annex] Error 1
</pre>
> [[fixed|done]] --[[Joey]]

8
doc/design/assistant/blog/day_48__intro.mdwn Normal file
View file

@ -0,0 +1,8 @@
Lots of WebApp UI improvements, mostly around the behavior when
displaying alert messages. Trying to make the alerts informative
without being intrusively annoying, think I've mostly succeeded now.
Also, added an intro display. Shown is the display with only one repo;
if there are more repos it also lists them all.
[[!img screenshot/intro.png]]

BIN
doc/design/assistant/screenshot/intro.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 50 KiB

2
doc/design/assistant/webapp.mdwn
View file

@ -38,3 +38,5 @@ The webapp is a web server that displays a shiny interface.
* Fix notification handle leakage on pages other than the main page.
The javascript should use AJAX to request handles, that way
they won't be allocated at all in noscript.
* Hook up notificaton close button to a callback that removes the notification
from the list. Otherwise reloading brings them back.