Commit graph

4529 commits

Author SHA1 Message Date
Joey Hess
cccdb44874 git annex webapp --force forces a restart of the daemon
Useful for testing..
2012-07-26 11:52:49 -04:00
Joey Hess
c4830aaa6c Merge branch 'master' into assistant
Conflicts:
	doc/design/assistant/webapp.mdwn
2012-07-26 05:22:44 -04:00
Joey Hess
c3131aafc4 updae 2012-07-26 05:22:17 -04:00
Joey Hess
1290534ba1 updae 2012-07-26 05:21:05 -04:00
Joey Hess
b89b801567 update 2012-07-26 05:20:52 -04:00
Joey Hess
6cecc26206 update build deps 2012-07-26 05:13:27 -04:00
Joey Hess
9d6b59d0e2 use the secret token for authentication, and add to all dynamic urls 2012-07-26 04:50:09 -04:00
Joey Hess
b36804d648 generate random token and launch webapp using it 2012-07-26 03:38:20 -04:00
Joey Hess
3ac2cf09e5 added a custom defaultLayout, static site, and favicon
Broke hamlet out into standalone files.

I don't like the favicon display; it should be served from /favicon.ico,
but I could only get the static site to serve /static/favicon.ico, so
I had to use a <link rel=icon> to pull it in. I looked at
Yesod.Default.Handlers.getFaviconR, but it doesn't seem to embed
the favicon into the binary?
2012-07-26 02:45:01 -04:00
Joey Hess
6a8540c1a2 tweak 2012-07-26 00:39:25 -04:00
Joey Hess
805d50c69d use hamlet at least for the static html 2012-07-25 23:50:29 -04:00
Joey Hess
81b40cf882 fix editor damage 2012-07-25 23:50:14 -04:00
Joey Hess
abe5a73d3f Merge branch 'master' into assistant 2012-07-25 23:18:39 -04:00
Joey Hess
1ffef3ad75 git annex webapp now opens a browser to the webapp
Also, starts the assistant if it wasn't already running.
2012-07-25 23:13:01 -04:00
Joey Hess
e6ce54de82 build fixes 2012-07-25 22:04:10 -04:00
Joey Hess
32d3cffc4c run yesod, and launch webapp on startup 2012-07-25 21:26:13 -04:00
jtang
3a02c7b635 fix example to match current command in git-annex semitrust 2012-07-25 20:12:16 +00:00
Joey Hess
df017eac28 Merge branch 'master' of ssh://git-annex.branchable.com 2012-07-25 15:33:27 -04:00
Joey Hess
2e085c6383 blog for the day 2012-07-25 15:31:26 -04:00
Joey Hess
bd2b388fd8 update 2012-07-25 15:07:41 -04:00
Joey Hess
03979d4d54 Merge branch 'master' into assistant
Conflicts:
	Makefile
2012-07-25 14:55:53 -04:00
Joey Hess
95c80b6440 laziness fix
Now scanning runs fully interleaved with transferring.
2012-07-25 14:54:09 -04:00
Joey Hess
b665ffe36f implement simple working copy based scan
Works.. could be more efficient.
2012-07-25 14:16:53 -04:00
Joey Hess
2b7f9c8442 fix including of remote in TransferInfo when queueing new transfers 2012-07-25 14:02:50 -04:00
Joey Hess
a9dbfdf28d better transfer queue management
Allow transfers to be added with blocking until the queue is sufficiently
small.

Better control over which end of the queue to add a transfer to.
2012-07-25 13:12:34 -04:00
Joey Hess
6107328a6b avoid spawning new transfer thread until a slot becomes available 2012-07-25 12:07:30 -04:00
http://joeyh.name/
b5b0ae6f3e Added a comment 2012-07-24 22:00:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
47ad76d110 2012-07-24 19:08:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk4YX0PWICfWGRLuncCPufMPDctT7KAYJA
1abc228008 Added a comment: selective data syncing 2012-07-24 15:27:08 +00:00
Joey Hess
928be45bac reorg 2012-07-24 11:15:39 -04:00
Joey Hess
a5fcb8d971 Merge branch 'master' of ssh://git-annex.branchable.com 2012-07-24 11:15:38 -04:00
Joey Hess
2cdc602eb9 cleanup 2012-07-24 11:14:36 -04:00
http://joeyh.name/
395d4d1026 Added a comment 2012-07-24 15:09:29 +00:00
Joey Hess
078bad2d0a move old OSX comments off the OSX page 2012-07-24 11:08:36 -04:00
http://joeyh.name/
9671527ee3 Added a comment 2012-07-24 15:03:49 +00:00
Joey Hess
9f165d35ca close 2012-07-24 11:03:02 -04:00
Joey Hess
50b9c6c6f7 Merge branch 'master' of ssh://git-annex.branchable.com 2012-07-24 11:01:43 -04:00
Joey Hess
927b53088f force C compiler to build 32 bit on OSX when 32 bit ghc is being used 2012-07-24 11:01:15 -04:00
http://joeyh.name/
7929ff044d Added a comment 2012-07-24 14:51:50 +00:00
https://a-or-b.myopenid.com/
9e0eb501c6 Added a comment: Compiling git-annex on OSX (with 32 bit Haskell) 2012-07-24 03:26:47 +00:00
Joey Hess
25581b01c8 works on Gnome 3 2012-07-23 19:55:26 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkZRoTRyW3tox-FD2DQWxskgI6_tkEtHL4
5e6e48c7f2 Added a comment 2012-07-23 16:12:01 +00:00
Joey Hess
d7dc457cc0 blog for the day 2012-07-22 23:50:00 -04:00
Joey Hess
892f1e6abe TransferScanner design thoughts 2012-07-22 23:49:52 -04:00
Joey Hess
522f568450 add TransferScanner thread
Efficiently finding transfers that need to be done to get two repos back
in sync seems like an interesting problem.
2012-07-22 23:16:56 -04:00
Joey Hess
26e4e65307 filter out special remotes when pulling 2012-07-22 15:09:40 -04:00
Joey Hess
e4f714d1be pull from newly mounted git remotes 2012-07-22 15:06:18 -04:00
Joey Hess
4ec9244f1a add a path field to remotes
Also broke out some helper functions around constructing remotes,
to be used later.
2012-07-22 14:30:43 -04:00
Joey Hess
e4592649d6 Merge branch 'master' into assistant
Conflicts:
	git-annex.cabal
2012-07-22 12:50:54 -04:00
http://joeyh.name/
345806b2dd Added a comment 2012-07-22 16:03:52 +00:00