Commit graph

10656 commits

Author SHA1 Message Date
Joey Hess
b426e229f7 devblog 2013-11-12 17:48:58 -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
8585465a24 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-12 17:23:39 -04:00
Joey Hess
472d9376b6 typo 2013-11-12 15:28:54 -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
http://id.clacke.se/
68966148e5 Added a comment 2013-11-12 17:17:18 +00:00
http://id.clacke.se/
1402118554 Added a comment 2013-11-12 17:10:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
231cf51087 Added a comment: Using a portable drive as another transfer device? 2013-11-12 16:52:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
83e30ff4b3 Added a comment: Using a portable drive as another transfer device? 2013-11-12 16:51:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
21f9047f1f removed 2013-11-12 16:36:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
2228b413d4 Added a comment: cabal install gnuidn fails 2013-11-12 16:28:02 +00:00
http://id.clacke.se/
748477aa19 Added a comment 2013-11-12 16:17:42 +00:00
http://id.clacke.se/
457a191502 Added a comment 2013-11-12 16:14:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmW0kg4uiMIhSHeVuvJFyo2VYMl7Qoej0s
78782bfc44 Added a comment: Woot! 2013-11-12 15:52:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y
e33f816df0 Added a comment: Yep, the env was printed 2013-11-12 10:18:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
646b0fb65e Added a comment: APK now works too 2013-11-12 09:10:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
9cacf79663 Added a comment: Thanks 2013-11-12 08:57:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlEXAlu8qKv_FHYOv-uEohdGgMY_Lw-Ges
fc16796517 Added a comment: Just happened for me as well. 2013-11-12 08:10:56 +00:00
Joey Hess
10a39a8796 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-12 00:01:28 -04:00
Joey Hess
100741b3f6 just in time! 2013-11-12 00:00:02 -04:00
http://joeyh.name/
ccb828f845 Added a comment 2013-11-12 03:58:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y
82702f0b4a Added a comment: nocopy variants work! 2013-11-12 03:17:09 +00:00
https://id.koumbit.net/anarcat
8329f6ec37 i believe the file is copied out of the git/annex directory now, so it's not a hardlink anymore 2013-11-12 01:51:19 +00:00
http://joeyh.name/
1f84c695d9 Added a comment: finally getting debugger spun up 2013-11-12 01:08:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y
77b0cf9f5c Added a comment: I got the same results as Sören. 2013-11-11 20:37:09 +00:00
Mebus
9786bc88a1 Added a comment 2013-11-11 20:24:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
b51c1cf792 Added a comment 2013-11-11 19:56:04 +00:00
http://joeyh.name/
eae4c8cf77 Added a comment 2013-11-11 19:14:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y
f7e8b7ae8a Added a comment: Both fail... 2013-11-11 18:53:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
a7565461f3 Added a comment: Galaxy S4 Android 4.3 2013-11-11 18:47:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
6888a8e816 removed 2013-11-11 18:44:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
9e5165187a Added a comment: Galaxy S4 Android 4.3 2013-11-11 18:43:27 +00:00
http://joeyh.name/
ad4841d728 Added a comment 2013-11-11 16:23:34 +00:00
http://joeyh.name/
e323537c47 Added a comment 2013-11-11 16:01:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y
2f1af69878 Added a comment: Unfortunately, it would not appear that easy... 2013-11-11 14:33:05 +00:00
http://joeyh.name/
bedacc776b Added a comment 2013-11-11 13:27:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y
0e2c662958 Added a comment: Same error as before, Nexus 5 and 7 2013-11-11 13:06:20 +00:00
https://launchpad.net/~subito
bc3eb48fa3 Added a comment: Nexus 5 Android 4.4 2013-11-11 10:07:08 +00:00
http://id.clacke.se/
4c0bda0f44 2013-11-11 05:35:43 +00:00
http://id.clacke.se/
1018e941ee removed 2013-11-11 05:32:40 +00:00
http://id.clacke.se/
e473ab7899 Added a comment 2013-11-11 05:32:14 +00:00
http://joeyh.name/
f8adbced15 Added a comment 2013-11-11 04:34:23 +00:00
http://joeyh.name/
5bb552e88d removed 2013-11-11 04:21:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y
a48090c6e8 Added a comment: Works on KitKat 2013-11-10 23:15:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y
e292055264 Added a comment: Oh, and if a 4.3 device would be helpful... 2013-11-10 22:28:48 +00:00
http://joeyh.name/
e8801f76c6 Added a comment 2013-11-10 22:23:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnegApaT6kTI0Gxy9SNmI9Og-k_fC_aS7Y
74a7ca816d Added a comment: Hooray! 2013-11-10 22:21:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7qEQF8yzbY0_PHq3QERHxUGuXmW6qw8o
70dcb42cd6 Added a comment 2013-11-10 22:10:53 +00:00
Joey Hess
ba204c6e8e devblog 2013-11-10 16:14:20 -04:00
http://joeyh.name/
afaa4d6f7d Added a comment 2013-11-10 20:12:47 +00:00
http://id.clacke.se/
59f33b8f2a 2013-11-10 18:39:07 +00:00
http://joeyh.name/
f78a894f10 Added a comment 2013-11-10 18:18:09 +00:00
Joey Hess
67a99bb03d Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-10 14:08:39 -04:00
Joey Hess
7767d50324 add custom shortcuts page, including a !commit shortcut to link to a git commit 2013-11-10 14:03:34 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
063230d470 Added a comment: Works with git annex on command line 2013-11-09 20:18:39 +00:00
Auroch
2e845cbf7f Added a comment 2013-11-09 19:24:55 +00:00
Joey Hess
59d623c8ad Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-09 14:31:03 -04:00
Joey Hess
53ab737723 clean up cruft left in log by bug 2013-11-09 14:30:26 -04:00
http://joeyh.name/
491332ad9b Added a comment 2013-11-09 18:18:49 +00:00
http://joeyh.name/
f207fb961a Added a comment 2013-11-09 18:07:56 +00:00
Joey Hess
a045af36c4 fixed 2013-11-09 13:56:40 -04:00
http://joeyh.name/
836c086dcf Added a comment 2013-11-09 17:36:02 +00:00
Mat
f2cb5b9c43 2013-11-09 14:14:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
b6b9054d6d 2013-11-09 10:50:44 +00:00
http://id.clacke.se/
44b69d4ed8 Added a comment: dummy comment 2013-11-09 09:33:35 +00:00
http://id.clacke.se/
524c87c648 removed 2013-11-09 09:32:59 +00:00
http://id.clacke.se/
872c17973e Added a comment: dummy comment 2013-11-09 09:32:33 +00:00
http://id.clacke.se/
1fc2ebdb63 2013-11-09 09:26:57 +00:00
Auroch
510e433b8d Added a comment: OK,thanx for this 2013-11-09 09:10:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
f80a847af2 Added a comment 2013-11-09 06:02:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmhfodZquCI_EEl-f3h7HkROTszlsQL6yA
607f2a168c Added a comment: Samsung Galaxy S4 also affected 2013-11-09 02:47:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
04cf1ac892 Added a comment: To answer my own question - "git annex webapp" 2013-11-09 00:10:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
a56c84330a removed 2013-11-09 00:06:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
027b651c3e Added a comment: To answer my own question - "git annex webapp" 2013-11-09 00:05:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
1d0a35800f Added a comment: Maybe I'm missing something... 2013-11-08 22:12:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
03a98c9c1f Added a comment: Yes, I just figured that out 2013-11-08 22:09:41 +00:00
http://joeyh.name/
4b10a27cb4 Added a comment 2013-11-08 19:22:17 +00:00
http://joeyh.name/
0ccb43272a Added a comment 2013-11-08 18:42:22 +00:00
http://joeyh.name/
86c9dcd104 Added a comment 2013-11-08 18:32:13 +00:00
Joey Hess
c71f1ead7c Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-08 14:29:52 -04:00
Joey Hess
28a64c8fd8 Include ssh-keygen in standalone bundle. 2013-11-08 14:29:47 -04:00
http://joeyh.name/
9f9acd8286 Added a comment 2013-11-08 18:28:37 +00:00
http://joeyh.name/
a375d84bf2 Added a comment 2013-11-08 18:24:27 +00:00
Joey Hess
7ccd107d7b fixed 2013-11-08 14:09:15 -04:00
Joey Hess
2dbe2332b0 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-08 14:03:10 -04:00
Joey Hess
86db8ef920 close 2013-11-08 13:39:42 -04:00
http://joeyh.name/
f74c3346c0 Added a comment 2013-11-08 17:38:40 +00:00
http://joeyh.name/
8123b291a0 Added a comment 2013-11-08 17:36:54 +00:00
http://joeyh.name/
14209559a4 Added a comment 2013-11-08 17:06:02 +00:00
http://joeyh.name/
02d40928eb Added a comment 2013-11-08 17:04:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio
5f8ea7f88f Added a comment: measuring how-to 2013-11-08 16:55:59 +00:00
Joey Hess
03a4b3da97 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-07 18:03:32 -04:00
Joey Hess
6784aa7605 devblog 2013-11-07 18:02:43 -04:00
Joey Hess
958312885f webapp: Improve UI around remote that have no annex.uuid set, either because setup of them is incomplete, or because the remote git repository is not a git-annex repository.
Complicated by such repositories potentially being repos that should have
an annex.uuid, but it failed to be gotten, perhaps due to the past ssh repo
setup bugs. This is handled now by an Upgrade Repository button.
2013-11-07 18:02:00 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
e76c3b81cf Added a comment: Still fails with git-annex version 4.20131105-g136b030 2013-11-07 20:32:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
36b3e0df8b Added a comment: Updated version 4.20131105-g136b030 seems to work 2013-11-07 20:28:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
7ed0995296 Added a comment 2013-11-07 19:46:32 +00:00
Frank
308a57b5b8 Added a comment: Comment 2 2013-11-07 19:45:16 +00:00
Joey Hess
b7c15f3b60 webapp: Avoid encoding problems when displaying the daemon log file. 2013-11-07 15:29:20 -04:00
Joey Hess
09abd29469 improve docs 2013-11-07 15:22:45 -04:00
Joey Hess
9ff229a798 watcher: Avoid loop when adding a file owned by someone else fails in indirect mode because its permissions cannot be modified.
Adding the file moved it to the annex, and then tried to set the mode.
Error unwind then moved the file back, and so the watcher saw the file get
deleted and then added back, and so tried again..
2013-11-07 15:18:54 -04:00
Joey Hess
4f373503f2 sync: When there are merge conflicts that get automatically resolved, exit nonzero at the end. 2013-11-07 15:02:11 -04:00
Joey Hess
1f17a87872 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-07 14:44:35 -04:00
Joey Hess
b1a9074c19 remove some old comments about safety of git working tree commands in direct mode 2013-11-07 14:43:34 -04:00
Joey Hess
62677d3268 update 2013-11-07 14:40:34 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
b879e4227b Added a comment 2013-11-07 18:40:27 +00:00
http://joeyh.name/
ffdf67efdb Added a comment 2013-11-07 18:38:23 +00:00
Joey Hess
fcf019b9ec Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-07 14:13:28 -04:00
Joey Hess
d99bdbbb84 Merge branch 'directguard' 2013-11-07 14:12:13 -04:00
http://joeyh.name/
1172a89950 Added a comment 2013-11-07 18:12:09 +00:00
Joey Hess
b4a77dba78 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-07 14:11:17 -04:00
Joey Hess
59ecc804cd add new status command
This works for both direct and indirect mode.

It may need some performance tuning.

Note that unlike git status, it only shows the status of the work tree, not
the status of the index. So only one status letter, not two .. and since
files that have been added and not yet committed do not differ between the
work tree and the index, they are not shown. Might want to add display of
the index vs the last commit eventually.

This commit was sponsored by an unknown bitcoin contributor, whose
contribution as been going up lately! ;)
2013-11-07 14:07:25 -04:00
Joey Hess
eed2ed4fdb rename status to info, and update docs 2013-11-07 12:45:59 -04:00
http://joeyh.name/
3cc637022c Added a comment 2013-11-07 16:42:15 +00:00
Joey Hess
ec2c2adb10 one more git-remote-gcrypt ref 2013-11-07 12:29:13 -04:00
http://joeyh.name/
f3cf1971da Added a comment 2013-11-07 16:01:02 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
5e1a5ff508 2013-11-07 11:22:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
60cfab0e5c 2013-11-07 10:49:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o
a907b436bc 2013-11-07 10:42:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
56185d65a9 removed 2013-11-07 09:29:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
b246f78716 Added a comment: Update git-annex seems to work 2013-11-07 09:28:51 +00:00
https://me.yahoo.com/a/2grhJvAC049fJnvALDXek.6MRZMTlg--#eec89
596d6dcffa Added a comment: OS X builds 2013-11-07 05:12:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
196400a8f4 Added a comment 2013-11-06 23:14:03 +00:00
http://joeyh.name/
0e7aa350aa Added a comment 2013-11-06 22:21:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48
280a3204a2 2013-11-06 21:38:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
2c37b6ca1d Added a comment: S3 works without encryption 2013-11-06 21:09:26 +00:00
Joey Hess
b66642ebb6 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-06 16:45:48 -04:00
Joey Hess
a422eb5481 sponsor 2013-11-06 16:42:53 -04:00
Joey Hess
3090d32d98 devblog 2013-11-06 16:39:24 -04:00
Joey Hess
691850ca39 Allow optionally configuring git-annex with -fEKG to enable awesome remote monitoring interfaceat http://localhost:4242/ 2013-11-06 16:33:45 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
4fe4ce354a 2013-11-06 19:58:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
41ed969110 2013-11-06 19:57:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
eaeae91988 2013-11-06 19:54:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
4722fa5e7a rename bugs/GPG_errors_under_OS_10.9_Mavericks.mdwn to bugs/Mac_OS_10.9_GPG_error_adding_S3_repo.mdwn 2013-11-06 19:52:54 +00:00