Commit graph

15100 commits

Author SHA1 Message Date
Joey Hess
621939b5c6 Merge branch 'master' of ssh://git-annex.branchable.com
Conflicts:
	doc/polls/2013/operating_system.mdwn
2013-11-13 16:11:42 -04:00
Joey Hess
578546001c turn off sidebar in polls 2013-11-13 16:09:41 -04:00
http://joeyh.name/
cd86a505f2 poll vote (Linux) 2013-11-13 20:08:28 +00:00
Joey Hess
ac78fd2198 poll 2013-11-13 16:08:06 -04:00
Joey Hess
d305cdf37f poll 2013-11-13 16:07:05 -04:00
Joey Hess
a3c1984476 typo 2013-11-13 16:06:49 -04:00
Joey Hess
1343a70885 poll 2013-11-13 16:06:21 -04:00
Joey Hess
4c990aaf6f poll 2013-11-13 16:05:40 -04:00
Joey Hess
c579ee2fec starting 2013 survey 2013-11-13 16:01:35 -04:00
Joey Hess
58b72a30c2 log missing index at notice priority 2013-11-13 14:42:59 -04:00
Joey Hess
6a45f4cdaf inverted logic 2013-11-13 14:41:32 -04:00
Joey Hess
eab4470440 better handling of missing index file 2013-11-13 14:39:26 -04:00
Joey Hess
188e4c00c1 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-13 14:27:35 -04:00
Joey Hess
13108b7196 assistant: Notice on startup when the index file is corrupt, and auto-repair. 2013-11-13 14:27:17 -04:00
Joey Hess
5e7e0c7dc0 repair: Handle case where index file is corrupt, but all objects are ok. 2013-11-13 13:41:02 -04:00
Joey Hess
20167fe945 ensure .git/annex exists before opening log file when starting assistant 2013-11-13 12:54:18 -04:00
http://joeyh.name/
b95c7d0596 Added a comment 2013-11-13 16:51:41 +00:00
http://joeyh.name/
612478767b Added a comment 2013-11-13 16:37:47 +00:00
Joey Hess
a11b394fb1 already fixed 2013-11-13 12:36:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmGscQQgW5GCg00ExUJOQH-aG8SvKQgWMo
0d4e0c744e 2013-11-13 16:22:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlEXAlu8qKv_FHYOv-uEohdGgMY_Lw-Ges
2973acb793 Added a comment 2013-11-13 09:03:24 +00:00
http://nullroute.eu.org/~grawity/
e3146f6852 Added a comment 2013-11-13 06:22:49 +00:00
Joey Hess
f30300e877 work around for windows watcher cabal build problem 2013-11-12 21:23:20 -04:00
Joey Hess
3e9419b088 avoid using Utility.Touch without WITH_CLIBS 2013-11-12 21:05:04 -04:00
Joey Hess
4ae4ae78d7 no openLog on windows 2013-11-12 21:02:45 -04:00
Joey Hess
b426e229f7 devblog 2013-11-12 17:48:58 -04:00
Joey Hess
de3411bca8 re-disable assistant on Windows
Linking dist\build\git-annex\git-annex.exe ...
ghc.exe: could not execute: C:\Program Files (x86)\Haskell
Platform\2012.4.0.0\lib/../mingw/bin/gcc.exe

What a unhelpful failure mode. Possibly argument list too long or
something?
2013-11-12 17:44:47 -04:00
Joey Hess
778d22e311 update to highlight current month 2013-11-12 17:41:48 -04:00
Joey Hess
9a58de553c remove -Assistant from windows build flag 2013-11-12 17:39:11 -04:00
Joey Hess
7ebdcc7535 use Win32-inotify
May mean the watcher works on Windows. Untested.
2013-11-12 17:29:29 -04:00
Joey Hess
8585465a24 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-12 17:23:39 -04:00
Joey Hess
b9b5e3370d build assistant and watcher on windows (doesn't work yet) 2013-11-12 17:22:34 -04:00
Joey Hess
472d9376b6 typo 2013-11-12 15:28:54 -04:00
Joey Hess
98ac1f4fd5 depend on git 1.8.4 2013-11-12 15:14:35 -04:00
http://joeyh.name/
0870379706 Added a comment 2013-11-12 19:10:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao
8e0800da72 Added a comment: git-annex from wheezy-backports should depend on a more recent git version on debian wheezy (7.2) 2013-11-12 18:57:53 +00:00
http://joeyh.name/
c869dc95db removed 2013-11-12 18:35:09 +00:00
http://joeyh.name/
66c41e4f11 removed 2013-11-12 18:34:33 +00:00
http://joeyh.name/
03f8a65e05 removed 2013-11-12 18:34:02 +00:00
Joey Hess
aa66489d25 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-12 14:26:07 -04:00
Joey Hess
16fa980689 separate android 4.0 and 4.3 builds needed
Also, parameterize the abdroid abi version
2013-11-12 14:24:53 -04:00
http://joeyh.name/
6e5bfa16cc Added a comment 2013-11-12 18:18:16 +00:00
http://joeyh.name/
37934053f4 Added a comment 2013-11-12 18:12:49 +00:00
http://joeyh.name/
111b877251 Added a comment 2013-11-12 18:10:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
837e367553 removed 2013-11-12 17:39:26 +00:00
http://id.clacke.se/
99bb8f8cf1 removed 2013-11-12 17:22:24 +00:00
http://id.clacke.se/
8a7a6c94c8 Added a comment 2013-11-12 17:22:01 +00:00
http://id.clacke.se/
9c2059852b removed 2013-11-12 17:21:02 +00:00
http://id.clacke.se/
da9226abed Added a comment 2013-11-12 17:19:32 +00:00
http://id.clacke.se/
49d9ba97a7 Added a comment 2013-11-12 17:18:37 +00:00