Commit graph

19749 commits

Author SHA1 Message Date
Joey Hess
805b3a9d89 Merge branch 'patch-1' of https://github.com/Fil/git-annex 2014-06-02 19:06:24 -04:00
Joey Hess
fcc9bd0831 update; android autobuolder container is now published 2014-06-02 19:05:20 -04:00
Fil
86d50149e9 typo ("Connnect") 2014-06-03 00:04:21 +02:00
https://launchpad.net/~eliasson
052833c678 2014-06-02 21:45:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkPSASwemBzccJmjkotESlbUSs5GPFiPCs
0f5fd737c5 Added a comment: Ok, but ? 2014-06-02 18:22:24 +00:00
http://joeyh.name/
9cffbb6503 Added a comment 2014-06-02 16:28:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
9641bf7f48 Added a comment 2014-06-02 13:36:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlPfB0_GcGJ827kZqRE1PF4D23rxpfOeg4
f481a88cf2 Added a comment: Can't find developer API key and secret 2014-06-01 21:25:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkexhIpGcYa22aPQtLm-StpHiF-MHYPh5w
13f2a45b5e Added a comment: Solved 2014-06-01 13:55:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkPSASwemBzccJmjkotESlbUSs5GPFiPCs
e63e8b6662 2014-06-01 13:25:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkPSASwemBzccJmjkotESlbUSs5GPFiPCs
d978ec01cb 2014-06-01 13:24:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawniXLhO9mLn-7EDfawdENZ2fQwlGy5w_oc
169404e294 Added a comment: Update - 20140529 2014-06-01 01:36:16 +00:00
Jamieson
4dc4190f17 minor bugs found with SSH on port != 22 2014-05-31 17:32:22 +00:00
Joey Hess
ded3cbd1b5 devblog 2014-05-30 17:56:15 -04:00
Joey Hess
43225f4917 add 2014-05-30 17:56:03 -04:00
Joey Hess
fb497564e2
update 2014-05-30 17:11:34 -04:00
Joey Hess
eb1ee0b7e9
more bug metadata etc 2014-05-30 17:08:20 -04:00
Joey Hess
1cb4853e0c confirmed needs to be a tag 2014-05-30 16:53:19 -04:00
Joey Hess
dcecca49c6 moreinfo needs to be a tag 2014-05-30 16:52:27 -04:00
Joey Hess
6d07c9c570 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-30 16:49:22 -04:00
Joey Hess
5ab287a7bf
meta 2014-05-30 16:48:33 -04:00
http://joeyh.name/
99dc5ca659 Added a comment 2014-05-30 20:47:02 +00:00
Joey Hess
2d3c415489
tag layout 2014-05-30 16:33:06 -04:00
Joey Hess
038431bc2e
tag layout 2014-05-30 16:30:55 -04:00
Joey Hess
f9d450928c Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-30 16:11:05 -04:00
Joey Hess
40a0001fd7
display tags in the main bug list 2014-05-30 16:10:16 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
ab73d75cc0 Added a comment 2014-05-30 19:37:03 +00:00
Joey Hess
0d70e36466 fix broken link 2014-05-30 15:32:42 -04:00
Joey Hess
2ee73cfd83 fix link 2014-05-30 15:31:49 -04:00
http://joeyh.name/
d1596dc5e7 Added a comment 2014-05-30 19:15:33 +00:00
Joey Hess
22033f954b Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-30 15:10:21 -04:00
http://joeyh.name/
1fec9dd04b Added a comment 2014-05-30 19:09:32 +00:00
Joey Hess
4fa8f8a6e6 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-30 15:09:26 -04:00
Joey Hess
9c0f3ae7e1 assistant: Make sanity checker tmp dir cleanup code more robust. 2014-05-30 15:08:49 -04:00
http://joeyh.name/
3de1a77893 Added a comment 2014-05-30 18:58:57 +00:00
Joey Hess
0db43ccc81 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-30 14:52:12 -04:00
Joey Hess
4f7f61e46e fix UI when enabling existing gcrypt repo
avoid editing repo for same reasons as in
52601eb606

avoid stomping on its description, even though no description exists until
after syncing is complete
2014-05-30 14:50:44 -04:00
Joey Hess
c92d43fb7b avoid stomping on existing description when enabling a special remote
Happened with eg, gcrypt remotes.
2014-05-30 14:30:43 -04:00
Joey Hess
86b9ae15dd also normalize /~/ 2014-05-30 14:23:21 -04:00
Joey Hess
52601eb606 don't show edit form after enabling ssh remote
Just after enabing a ssh remote, we've not synced with it yet, so its
description and group are not known. So, avoid showing edit form so user
doesn't see blank info. Instead, redirect to dashboard.
2014-05-30 14:17:20 -04:00
Joey Hess
9eaabf0382 webapp: avoid overwriting remote configs when enabling it
Avoid stomping on existing group and preferred content settings
when enabling or combining with an already existing remote.

Two level fix. First, use defaultStandardGroup rather than
setStandardGroup, so if there is an existing configuration in the git-annex
branch, it's not overwritten.

To handle pre-existing ssh remotes (including gcrypt), a second level is
needed, because before syncing with the remote, it's configuration won't be
available locally. (And syncing could take a long time.) So, in this case,
keep track of whether the remote is being created or enabled, and only set
configs when creating it.

This commit was sponsored by Anders Lannerback.
2014-05-30 14:03:04 -04:00
Joey Hess
7089e282b5 fetch from removable drive when adding
When adding a repo from a removable drive that already exists, fetch
from it before showing the edit form, so it will have the existing
configuration of that repo.
2014-05-30 12:48:01 -04:00
Joey Hess
de0cba18f6 webapp: Avoid stomping on existing group and preferred content settings when adding a local repository (or removable drive repository) that already exists.
This does mean that if the webapp is asked to add a git repository on
a removable drive that already exists, but is not yet a git-annex
repository, it will avoid putting it in any group. That unlikely edge case
is ok; the next step is the edit repository screen, which will show it's
not in any group and the user can pick one.
2014-05-30 12:32:44 -04:00
go8ose
d4d699ee73 Added a comment 2014-05-30 10:28:38 +00:00
Joey Hess
930d984142 bug 2014-05-29 20:34:42 -04:00
http://joeyh.name/
096af25206 Added a comment 2014-05-30 00:32:25 +00:00
Joey Hess
1c1e636b23 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-29 20:26:42 -04:00
Joey Hess
0eb6576455 lazy bytestring fromStrict is not available in stable; use fromChunks instead 2014-05-29 20:25:01 -04:00
Joey Hess
2dd274e4ca webapp: When adding a new local repository, fix bug that caused its group and preferred content to be set in the current repository, even when not combining.
There was a tricky bit here, when it does combine, the edit form is shown,
and so the info needs to be committed to the new repository, but then
pulled into the current one. And caches need to be invalidated for it
to be visible in the edit form.
2014-05-29 20:17:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmHp5oVW8Z9v_vHs5FRtlYj80TYMQWVTS0
fcbc0bb905 Added a comment 2014-05-30 00:13:27 +00:00