Commit graph

68 commits

Author SHA1 Message Date
Joey Hess
c1adde5294 finally merge the assistant into master
Progress bars still need to be done, otherwise it's fully working.
Although much work remains to hit all the use cases.
2012-08-27 14:49:09 -04:00
Joey Hess
b12db9ef92 Merge branch 'master' into assistant
Conflicts:
	debian/changelog

Updated changelog for assistant and webapp
2012-08-27 13:31:54 -04:00
Joey Hess
bb68f1c525 update 2012-08-26 15:44:32 -04:00
Joey Hess
c70f565529 update 2012-08-26 14:15:03 -04:00
Joey Hess
dda61b1b80 blog for the day 2012-08-24 17:40:38 -04:00
Joey Hess
47875e9b94 update 2012-08-24 13:13:41 -04:00
Joey Hess
d5d4b8db34 update 2012-08-23 16:24:22 -04:00
Joey Hess
e43feeb5b4 update 2012-08-22 15:45:20 -04:00
Joey Hess
6873ca0c1b blog for the day 2012-08-21 20:25:20 -04:00
Joey Hess
abe5a73d3f Merge branch 'master' into assistant 2012-07-25 23:18:39 -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
25581b01c8 works on Gnome 3 2012-07-23 19:55:26 -04:00
Joey Hess
892f1e6abe TransferScanner design thoughts 2012-07-22 23:49:52 -04:00
Joey Hess
e4592649d6 Merge branch 'master' into assistant
Conflicts:
	git-annex.cabal
2012-07-22 12:50:54 -04:00
Joey Hess
9c7475eb46 update 2012-07-20 18:17:44 -04:00
Joey Hess
133b4581d1 Merge branch 'master' into assistant 2012-07-20 15:08:15 -04:00
Joey Hess
e8ccf0bd11 update 2012-07-19 23:46:24 -04:00
Joey Hess
2fdca82a64 Merge branch 'master' into assistant 2012-07-19 00:58:53 -04:00
Joey Hess
61695f9f41 blog for the day 2012-07-18 19:42:29 -04:00
Joey Hess
f2ed3d6c8e Merge branch 'threaded' into assistant 2012-07-18 18:17:33 -04:00
Joey Hess
cfdd4d6602 blog for the day and updates 2012-07-17 18:51:46 -04:00
Joey Hess
30f7b1599c Merge branch 'master' into assistant 2012-07-17 12:27:12 -04:00
Joey Hess
dc2e0d0d9b updates 2012-07-17 11:55:36 -04:00
Joey Hess
fa3aef96e2 Merge branch 'master' into assistant 2012-07-16 15:06:08 -04:00
Joey Hess
bd037c4ca3 update 2012-07-13 12:07:54 -04:00
Joey Hess
92ce8c6164 update 2012-07-08 12:24:51 -06:00
Joey Hess
268b4b7d6e done 2012-07-07 22:12:37 -06:00
Joey Hess
f74f0b46c1 update 2012-07-07 21:42:52 -06:00
Joey Hess
ec8ba6bf58 Merge branch 'master' into assistant 2012-07-07 11:51:19 -06:00
Joey Hess
7e76e49b9f fixed 2012-07-07 11:48:59 -06:00
Joey Hess
208e96deef Merge branch 'master' into assistant 2012-07-07 11:23:28 -06:00
Joey Hess
3247415c56 update; split out hard todo 2012-07-07 11:12:11 -06:00
Joey Hess
eb9063c0d1 update 2012-07-07 10:56:09 -06:00
Joey Hess
9bcfbc4048 todo 2012-07-06 21:17:21 -06:00
Joey Hess
d6f65aed16 Merge branch 'master' into assistant
Conflicts:
	doc/design/assistant/syncing.mdwn
2012-07-06 18:26:40 -06:00
Joey Hess
27ac0ec332 ssh connection caching is ok, but there is another problem 2012-07-06 14:58:30 -06:00
Joey Hess
8489419deb todo 2012-07-06 14:56:41 -06:00
Joey Hess
bde355a65b reorg, and add a link to a good forum post todo 2012-07-06 14:21:26 -04:00
Joey Hess
0c563c39df Merge branch 'master' into assistant 2012-07-05 17:35:19 -06:00
Joey Hess
f462520bf9 todo 2012-07-05 16:41:17 -06:00
Joey Hess
880b55f277 Merge branch 'master' into assistant 2012-07-05 16:27:09 -06:00
Joey Hess
b1629356ce blog for the day
major milestone today!
2012-07-05 14:47:10 -06:00
Joey Hess
e8df726d07 Merge branch 'master' into assistant 2012-07-05 11:05:24 -06:00
Joey Hess
bd2c4c982d update 2012-07-05 11:01:53 -06:00
Joey Hess
b7c3cc2745 Merge branch 'master' into assistant 2012-07-05 10:34:52 -06:00
Joey Hess
c1728849a9 update 2012-07-05 10:34:47 -06:00
Joey Hess
b0894f00c0 Merge branch 'master' into assistant 2012-07-05 09:12:54 -06:00
Joey Hess
a6e267eeec update 2012-07-03 11:11:32 -04:00
Joey Hess
224dac374e update 2012-07-02 16:08:23 -04:00