mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
19759 commits 13 branches 442 tags 103 MiB
Commit graph

19759 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
https://www.google.com/accounts/o8/id?id=AItOawmHp5oVW8Z9v_vHs5FRtlYj80TYMQWVTS0
8bd81516af 2014-05-30 00:12:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmHp5oVW8Z9v_vHs5FRtlYj80TYMQWVTS0
0968cba5d2 2014-05-29 23:36:17 +00:00
http://joeyh.name/
b71f9bfd56 Added a comment 2014-05-29 20:46:47 +00:00
Joey Hess
a4d760b700 add news item for git-annex 5.20140529 2014-05-29 16:46:05 -04:00
Joey Hess
76d706d181 Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid' 2014-05-29 16:37:30 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmi0jblSiI4c5-EswqKw4PXkx5M4fuVvdk
11d7f9b222 Added a comment 2014-05-29 20:10:15 +00:00
Joey Hess
9169fc86f3 remove a few orphaned comments 2014-05-29 15:27:06 -04:00
Joey Hess
f15675e109 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-29 15:24:36 -04:00
Joey Hess
222f78e9ea remove old closed bugs and todo items to speed up wiki updates and reduce size 
Remove closed bugs and todos that were least edited before 2014.

Command line used:

for f in $(grep -l '\[\[done\]\]' *.mdwn); do if [ -z $(git log --since=2014 --pretty=oneline "$f") ]; then git rm  $f; git rm -rf $(echo "$f" | sed 's/.mdwn$//'); fi; done
 2014-05-29 15:23:05 -04:00
http://joeyh.name/
05bd1345e7 Added a comment 2014-05-29 19:14:51 +00:00
Joey Hess
e157467f92 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-29 15:13:02 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmi0jblSiI4c5-EswqKw4PXkx5M4fuVvdk
040c20731c Added a comment 2014-05-29 19:10:08 +00:00
Joey Hess
bc6f0a4dfe prep release 2014-05-29 14:42:52 -04:00
Joey Hess
3796a74fc2
can't use iframe for jenkins, it seems (sameorigin) 2014-05-29 14:40:51 -04:00
Joey Hess
39a52483de
don't use https for windows autobuilder, it's expired cert 2014-05-29 14:39:03 -04:00
Joey Hess
3c5b052142 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-29 14:23:16 -04:00
Joey Hess
0e82106700
remove 2 more spam comments. Will Ban user Balan. IP bans next step. 2014-05-29 14:22:06 -04:00
http://joeyh.name/
63b63d4089 Added a comment 2014-05-29 18:21:30 +00:00
http://joeyh.name/
6539888000 Added a comment 2014-05-29 18:15:12 +00:00
Joey Hess
2a9f78b6c8
comment back out library removal line 2014-05-29 14:13:41 -04:00
Joey Hess
810fdaabca lower bound on exceptions 2014-05-29 14:00:25 -04:00
Joey Hess
450eecaa76 fix warning message 
This should work even back in debian stable's warp
 2014-05-29 13:49:45 -04:00
Joey Hess
68a56a691f forcing windows autobuilder to rebootstrap cabal libs 2014-05-29 13:45:30 -04:00
Joey Hess
970605964c
remove spam comment (will ban this spammer's openid) 2014-05-29 13:20:34 -04:00
Joey Hess
37e8945827 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-29 13:19:56 -04:00
Joey Hess
973166c2cb close 2014-05-29 13:19:07 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
818c797d0e Added a comment 2014-05-29 16:48:18 +00:00
https://id.koumbit.net/anarcat
793b39360b Added a comment 2014-05-29 16:09:38 +00:00
go8ose
839c07951d 2014-05-29 12:21:53 +00:00
Balan
badc9a4c75 Added a comment: http://freshofruits.com 2014-05-29 07:25:15 +00:00
Balan
fcc79f9bb2 Added a comment: Buy Fruits Online | Fruits Online Chennai 2014-05-29 07:23:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmXGwBCD9trUbr0aC8jtDqScpaYK6PNOx0
06c793b453 2014-05-29 06:41:04 +00:00
http://joeyh.name/
92a05910e9 Added a comment 2014-05-28 22:31:21 +00:00
http://joeyh.name/
d0ab472718 Added a comment 2014-05-28 22:29:05 +00:00
Joey Hess
0736b265da confirmed 2014-05-28 18:27:15 -04:00
Joey Hess
b84644826b devblog 2014-05-28 18:26:38 -04:00
Joey Hess
5a0779fd70 remove newlines from static js and css 
This works around a bug in the EvilSplicer; see
http://git-annex.branchable.com/bugs/Bootstrap3_icons_missing_on_Android/
 2014-05-28 18:21:01 -04:00
Joey Hess
d9fefa615c Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-28 17:50:29 -04:00
Joey Hess
469640e790 allow building with old versions of exceptions before MonadMask was split out 2014-05-28 17:48:49 -04:00
bnikolic
30398456a0 2014-05-28 21:25:57 +00:00