Joey Hess
5ae1f75a39
handle case of adding populated drive to just created repo
...
The just created repo has no master branch commits yet. This is now
handled, merging in the master branch from the populated drive.
2012-08-05 16:35:30 -04:00
Joey Hess
34fc0d358e
fix crashes when run in a git repo that has been initted but has no master branch yet
2012-08-05 15:53:47 -04:00
Joey Hess
ac71ab7bd7
avoid head
2012-08-05 15:10:26 -04:00
Joey Hess
cb0f435d94
adding removable drive repos now basically works
2012-08-05 14:49:47 -04:00
Joey Hess
3add2cd3ba
wire up scan and transfer to newly added removable drive
...
remote setup still todo
2012-08-04 21:18:57 -04:00
Joey Hess
74fc9fcbe6
add alert when committing
2012-08-02 14:02:35 -04:00
Joey Hess
e21a32627f
avoid bogus alert errors
2012-08-02 13:57:34 -04:00
Joey Hess
191ee3b697
awesome alert combining
...
Now an alert tracks files that have recently been added. As a large file
is added, it will have its own alert, that then combines with the tracker
when dones.
Also used for combining sanity checker alerts, as it could possibly want to
display a lot.
2012-08-02 09:03:04 -04:00
Joey Hess
3695cab949
avoid showing alert when there are no remotes to push to
2012-08-02 09:00:13 -04:00
Joey Hess
9a038b4a9b
better ~/ handling
2012-08-02 07:50:13 -04:00
Joey Hess
ffeb060002
don't use hamlet for htmlshim
...
This allows me to not build-depend on blaze-markup, which was causing
me some trouble when tring to build with cabal on debian. Seems debian
ships Text.Blaze.Renderer.String in two packages.
2012-08-01 21:28:37 -04:00
Joey Hess
ecc168aba3
implemented firstrun repository creation and redirection to full webapp
...
Some of the trickiest code I've possibly ever written.
2012-08-01 16:10:26 -04:00
Joey Hess
04794eafc0
webapp now starts up when run not in a git repo
2012-07-31 12:17:31 -04:00
Joey Hess
b9b0097876
tweak types so the webapp can run without a threadstate when outside an annex
2012-07-31 11:19:40 -04:00
Joey Hess
2c8bbdf307
made navbar work
...
also added an About page and a stub Config page.
2012-07-31 02:30:26 -04:00
Joey Hess
58dfa3fa5b
split up webapp files
2012-07-31 01:11:32 -04:00
Joey Hess
6e40aed948
fix noscript mode to not allocate notification ids on each refresh
...
Now the javascript does an ajax call at the start to request the url
to use to poll, and the notification id is generated then, once we know
javascript is working.
2012-07-30 22:24:19 -04:00
Joey Hess
9b1ed7a720
Merge branch 'assistant' into assistant-longpolling-rewrite
2012-07-30 19:40:16 -04:00
Joey Hess
5de897e8d7
remove the "running" alert
2012-07-30 18:26:36 -04:00
Joey Hess
2e54a611c7
Merge branch 'assistant' into assistant-longpolling-rewrite
2012-07-30 18:19:24 -04:00
Joey Hess
254c174bba
fix transfers display logic
2012-07-30 18:18:53 -04:00
Joey Hess
502bc5d5f8
rewrote longpolling, trying to avoid duplication
...
does not work though. stupid JS
2012-07-30 18:01:41 -04:00
Joey Hess
b2e359a15d
fix kqueue build
2012-07-30 16:32:32 -04:00
Joey Hess
78b3dada5b
better connection close handling
...
Depending on how the webapp was started up and whether the user clicked on
any links in it, window.close() may be disallowed by browser security
policy. Also if that fails, display a modal dialog that nicely blackens out
the webapp.
TODO: avoid Escape closing it. Bootstrap's docs are unclear about how to do
that.
2012-07-30 14:50:32 -04:00
Joey Hess
a994130843
implement server-side alert closing
...
Rather than using bootstrap's client-side closing.
Now closed alerts stay closed.
2012-07-30 14:08:22 -04:00
Joey Hess
1f671ee40c
spruce up display of the repo list
2012-07-30 13:31:19 -04:00
Joey Hess
8d2667715b
prune old filler alerts
2012-07-30 12:21:53 -04:00
Joey Hess
40c9973675
fix push status, broken when inParallel was adapted for -threaded
...
Before pushing ran in its own process, so exitSuccess was the right thing
to do, but with the threaded code, that's caught as an exception.
2012-07-30 11:52:44 -04:00
Joey Hess
3dce75fb23
make old activiy alerts stay visible
...
They're updated to show whether the activity succeeded or failed.
This adds several TODOs to the code to fix later.
2012-07-30 02:39:24 -04:00
Joey Hess
ec0493fa4d
filter out dead repos from the intro
2012-07-30 00:31:33 -04:00
Joey Hess
895b068e35
tweak intro
2012-07-29 22:11:01 -04:00
Joey Hess
326617ad2f
add intro
2012-07-29 21:54:23 -04:00
Joey Hess
0186f06744
tweak Alert closability and construction
2012-07-29 19:41:17 -04:00
Joey Hess
d62b157194
better ordering of alerts
2012-07-29 19:05:51 -04:00
Joey Hess
d52c932424
moved all alert messages into one file
...
Makes it easier to edit for consistent voice etc.
2012-07-29 18:09:24 -04:00
Joey Hess
b2dc8fdb06
add more alerts
...
Nearly all long-running actions now display an alert.
2012-07-29 17:53:18 -04:00
Joey Hess
ce7889ba86
debuggery
2012-07-29 14:10:17 -04:00
Joey Hess
c4023f7858
probably fixes http://git-annex.branchable.com/bugs/lsof__47__committer_thread_loops_occassionally/
2012-07-29 13:55:07 -04:00
Joey Hess
ebd8362d58
fix bug in transfer initiation checking
...
Putting the transfer on the currentTransfers atomically introduced a bug:
It checks to see if the transfer is in progress, and cancels it.
Fixed by moving that check inside the STM transaction.
2012-07-29 13:37:26 -04:00
Joey Hess
09e77a0cf0
add some alerts
2012-07-29 13:22:08 -04:00
Joey Hess
e1d4bfe671
typo; was waiting on the wrong notifier for the sidebar!
2012-07-29 12:37:45 -04:00
Joey Hess
c2f3e66d8c
show alerts in the sidebar
...
This has a bug -- it seems long polling can only wait on one page at a
time. Need to re-unify the notifiers.
2012-07-29 11:31:06 -04:00
Joey Hess
57203e3981
refactor
2012-07-29 08:52:57 -04:00
Joey Hess
62dac85880
update the sidebar by long polling
...
Needs to use a different NotificationBroadcaster, and not replace the
whole sidebar div, but instead add in new content. However, it's 3:30 am.
2012-07-29 03:23:17 -04:00
Joey Hess
38ade1af70
better noscript UI
2012-07-29 00:55:22 -04:00
Joey Hess
376f8443c1
add a separate page for noscript browsers
...
This may be customised differently than the main page later on, but
for now the important thing is that this constantly refreshed page does not
allocate a new NotificationHandle each time it's loaded.
2012-07-29 00:08:14 -04:00
Joey Hess
a498be7f98
renamed /status to /transfers
...
Also fixed a bug; the ident for the div was regnerated each time
/status was called. This only was the same as the original ident due to
luck.
2012-07-28 23:55:41 -04:00
Joey Hess
9b18dc2a39
tune javascript refresh delays
...
WebApp now shows changes with no delay. Comparing a running git-annex get
and the webapp side-by-side, they both show each new transfer at the same
time.
2012-07-28 21:25:56 -04:00
Joey Hess
6a9abf6526
add NotificationID to StatusR, and use it to block
2012-07-28 21:21:22 -04:00
Joey Hess
e31277d38a
send notifications when the TransferQueue is changed
...
The fun part was making it move things from TransferQueue to currentTransfers
entirely atomically. Which will avoid inconsistent display if the WebApp
renders the current status at just the wrong time. STM to the rescue!
2012-07-28 18:47:24 -04:00
