Commit graph

2344 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
7c816e78d8 blog for the day 2012-08-26 16:03:11 -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
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
bb949ed2d2 Added a comment 2012-08-23 21:25:48 +00:00
Joey Hess
0416157e90 Merge branch 'master' of ssh://git-annex.branchable.com 2012-08-23 16:28:08 -04:00
Joey Hess
73c24e05d8 blog for the day 2012-08-23 16:27:21 -04:00
Joey Hess
d5d4b8db34 update 2012-08-23 16:24:22 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmubB1Sj2rwFoVdZYvGV0ACaQUJQyiJXJI
199cedf978 Added a comment: Amazon Glacier 2012-08-23 06:32:24 +00:00
Joey Hess
dfb6709064 blog for the day 2012-08-22 15:47:08 -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
e3e8d32924 Merge branch 'master' into assistant 2012-08-21 13:12:38 -04:00
Joey Hess
8f4870c7b6 add amazon glacier 2012-08-21 12:20:51 -04:00
http://dieter-be.myopenid.com/
3aeb371652 Added a comment: better logo? 2012-08-20 21:22:25 +00:00
Joey Hess
68f1be8f0a Merge branch 'master' into assistant
Conflicts:
	Makefile
	debian/copyright
2012-08-20 16:04:56 -04:00
Joey Hess
501071f6b2 Merge branch 'master' of ssh://git-annex.branchable.com 2012-08-20 15:32:01 -04:00
Joey Hess
0d721c8d6d blog for the day 2012-08-20 15:28:37 -04:00
Joey Hess
773a06fce6 updates 2012-08-19 20:18:26 -04:00
http://claimid.com/strager
bc6ba0cbeb Added a comment 2012-08-17 15:59:49 +00:00
Joey Hess
dcd208513d Merge branch 'master' into assistant
Conflicts:
	debian/changelog
2012-08-17 08:22:43 -07:00
Joey Hess
96bc6ce883 blog for the day 2012-08-16 21:19:02 -07:00
Joey Hess
8283e50dd1 moved thanks page 2012-08-16 17:10:41 -07:00
Joey Hess
c9e495128f add a new toplevel assistant page
will flesh out later
2012-08-16 17:10:01 -07:00
Joey Hess
cbca93cf7c Merge branch 'master' into assistant
Conflicts:
	debian/changelog
2012-08-16 16:36:32 -07:00
http://joeyh.name/
05374cd660 Added a comment 2012-08-16 23:34:12 +00:00
http://cweiske.de/
633f0efe7a Added a comment 2012-08-15 22:02:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkRtcrbacbXmmxJBPopLgNDTjS21v7JkMk
2f5176ceb8 typo 2012-08-15 18:31:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawneJXwhacIb0YvvdYFxhlNVpz6Wpg6V7AA
2d41d6a209 Added a comment 2012-08-13 00:37:36 +00:00
http://claimid.com/strager
fb29916e48 Added a comment 2012-08-11 16:08:47 +00:00
http://joeyh.name/
876b4c652c Added a comment 2012-08-11 14:41:51 +00:00
http://claimid.com/strager
c3b0e01c5b Added a comment 2012-08-11 04:55:13 +00:00
http://claimid.com/strager
a2cc373879 Added a comment 2012-08-11 04:50:52 +00:00
Joey Hess
f89a954be9 blog for the day 2012-08-10 19:03:40 -04:00
Joey Hess
96fe122d09 wobble 2012-08-09 16:37:39 -04:00
Joey Hess
c7a457351f wibble 2012-08-09 16:31:16 -04:00
Joey Hess
fefafe5783 fix link 2012-08-09 16:20:19 -04:00
Joey Hess
17957c3397 todo: restart 2012-08-09 16:14:18 -04:00
Joey Hess
05ae62e2a7 blog for the day 2012-08-09 16:02:16 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmarFV8Z8A-KF06IUC4fvf2M6crWVDzrL8
0e50f0a09a another folder suggestion for the poll (even though it's closed) 2012-08-09 08:43:23 +00:00
Joey Hess
4ab6128f71 fix filename 2012-08-08 18:08:32 -04:00
Joey Hess
521636a60a blog for the day 2012-08-08 18:07:44 -04:00
Joey Hess
7e2d07484f Merge branch 'master' into assistant 2012-08-07 13:31:43 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlCGROoy62svBUy6P24x1KoGoDWrBq2ErA
0a857248f4 Added a comment 2012-08-07 04:15:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlJ2utMQgMEYAOs3Dfc6eZRyUzt4acNXUU
4037c7f828 Added a comment 2012-08-06 23:48:28 +00:00
Joey Hess
e872299926 Merge branch 'master' of ssh://git-annex.branchable.com 2012-08-06 18:52:16 -04:00
Joey Hess
28d9ba18d6 blog for the day 2012-08-06 18:50:10 -04:00