Commit graph

10272 commits

Author SHA1 Message Date
Joey Hess
9cb223a8b3 Detect systems that have no user name set in GECOS, and also don't have user.name set in git config, and put in a workaround so that commits to the git-annex branch (and the assistant) will still succeed despite git not liking the system configuration. 2013-04-22 15:36:34 -04:00
Joey Hess
8861e270be sync, assistant: Sync with remotes that have annex-ignore set
This is so git remotes on servers without git-annex installed can be used
to keep clients' git repos in sync.

This is a behavior change, but since annex-sync can be set to disable
syncing with a remote, I think it's acceptable.
2013-04-22 14:57:09 -04:00
Joey Hess
b9341fd4c0 handle rpath in OSXMkLibs
Now oberon has some binaries and libraries that use rpath, so I had to put
in this ugly hack to replace the @rapth/lib with the lib in the app.

This was particularly tricky for libraries that use @rpath because I could
not find a way to extract the rpath from the library. (Only from the
executable, by running it.. ugh!) The hack I put in place may fail if
multiple different libraries use rpath to refer to other libraries,
and the "@rpath/lib" string is the same, but actually refers to different
files.
2013-04-22 13:33:29 -04:00
Joey Hess
78868866de Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-22 11:25:16 -04:00
Joey Hess
1579c98d4d fix osx build 2013-04-22 11:24:48 -04:00
140.233.6.178
de4557cead poll vote (/sdcard/annex) 2013-04-22 13:28:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
c5e35c4005 2013-04-22 10:03:02 +00:00
Richard Hartmann
46d2343d59 Typo 2013-04-22 09:10:16 +02:00
Joey Hess
49d039fe6a Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-21 19:12:05 -04:00
Joey Hess
b6d53c426b blog for the day 2013-04-21 19:11:53 -04:00
Joey Hess
4df9036fa2 got XMPP building for Android
Also enable local pairing, which also builds now thanks to WebDAV
fixes to the haskell network library.
2013-04-21 19:10:23 -04:00
49.176.102.23
dd0532b7c4 poll vote (/sdcard/annex) 2013-04-21 22:59:11 +00:00
84.194.180.65
184a458a12 poll vote (Whole /sdcard) 2013-04-21 20:25:59 +00:00
Joey Hess
8df5be7804 fix build with xmpp enabled but not local pairing 2013-04-21 13:24:56 -04:00
212.255.225.202
ac74ab2c2a poll vote (/sdcard/annex) 2013-04-21 16:35:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
8d34639b54 new forum post 2013-04-21 03:33:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
4b04a835a9 poll vote (/sdcard/annex) 2013-04-21 03:09:20 +00:00
Joey Hess
accf949f9c change section 2013-04-20 20:24:57 -04:00
Joey Hess
984bc8570d improve usage messages 2013-04-20 20:23:11 -04:00
Joey Hess
54e7cdb55c close poll 2013-04-20 19:40:48 -04:00
http://joeyh.name/
26388c453b Added a comment 2013-04-20 23:38:48 +00:00
Joey Hess
5faedad2d6 recent change broke this 2013-04-20 19:35:33 -04:00
Joey Hess
cefe2fac2d Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-20 19:29:26 -04:00
Joey Hess
a24a471ea9 blog for the day 2013-04-20 19:28:46 -04:00
Joey Hess
580f22f45d forgot to commit this new file 2013-04-20 19:27:36 -04:00
Joey Hess
844e772910 fix warnings 2013-04-20 19:25:50 -04:00
Joey Hess
70e251547e fix menu file installation directory 2013-04-20 19:02:14 -04:00
Joey Hess
4ddf9b7467 webapp: Don't default to making repository in cwd when started from within a directory containing a git-annex file (eg, standalone tarball directory). 2013-04-20 18:53:04 -04:00
Joey Hess
780ed8ebf1 fix warning 2013-04-20 18:52:46 -04:00
Joey Hess
d2e92e2494 Install FDO desktop menu file when webapp is started in standalone mode. 2013-04-20 18:48:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnE6kFAbud1LWrQuyX76yMYnUjHt9tR-A8
203a2e87b8 Added a comment: Direct mode 2013-04-20 20:55:10 +00:00
82.26.93.238
020af970af poll vote (Whole /sdcard) 2013-04-20 19:23:47 +00:00
82.26.93.238
ec730d423d poll vote (/sdcard/annex) 2013-04-20 18:38:04 +00:00
62.16.199.39
dc8e11471b poll vote (/sdcard/annex) 2013-04-20 17:21:38 +00:00
2a01:e35:8abf:e790:c214:3dff:fed7:730f
fe02126d87 poll vote (/sdcard/annex) 2013-04-20 16:56:58 +00:00
98.232.226.200
39a76de0f5 poll vote (/sdcard/annex) 2013-04-20 16:21:22 +00:00
184.175.42.76
725d3e2ee0 poll vote (/sdcard/annex) 2013-04-20 14:28:57 +00:00
https://m-f-k.myopenid.com/
1e527cddb4 typo 2013-04-20 13:44:37 +00:00
https://m-f-k.myopenid.com/
e4f9238201 poll vote (/sdcard/annex) 2013-04-20 13:42:54 +00:00
93.207.189.79
01c1e38b72 poll vote (DCIM directory (photos and videos only)) 2013-04-20 13:42:35 +00:00
24.22.142.175
1cb5f72687 poll vote (/sdcard/annex) 2013-04-20 13:41:26 +00:00
81.103.22.225
6eb5ed8393 poll vote (/sdcard/annex) 2013-04-20 10:40:05 +00:00
http://meep.pl/
e255c2d25c poll vote (/sdcard/annex) 2013-04-20 10:22:28 +00:00
91.180.173.226
72a5f1d597 poll vote (DCIM directory (photos and videos only)) 2013-04-20 09:55:54 +00:00
88.164.170.119
0d966735d2 poll vote (/sdcard/annex) 2013-04-20 09:55:37 +00:00
78.53.211.209
f2a709705d poll vote (/sdcard/annex) 2013-04-20 09:37:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmnG4EuvZWse5hvgrl0XAK-U61e-0iGaao
e11d0c4ea7 poll vote (/sdcard/annex) 2013-04-20 09:16:35 +00:00
82.159.135.82
aaaa72574d poll vote (/sdcard/annex) 2013-04-20 08:30:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnjjCyhVEcTRM5m4iIBqL3ZCooPx7ZYB_E
a8c1a6f6be poll vote (/sdcard/annex) 2013-04-20 08:28:56 +00:00
84.208.143.189
d59b7f10b3 poll vote (/sdcard/annex) 2013-04-20 07:40:47 +00:00