summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek2014-07-04
|
* removedGravatar https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek2014-07-04
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek2014-07-04
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmM6DfQEsnM9atNrdbmj3ql9QUOALLFd2c2014-07-04
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmM6DfQEsnM9atNrdbmj3ql9QUOALLFd2c2014-07-04
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmM6DfQEsnM9atNrdbmj3ql9QUOALLFd2c2014-07-04
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-04
|\
* | support commit.gpgsignGravatar Joey Hess2014-07-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support users who have set commit.gpgsign, by disabling gpg signatures for git-annex branch commits and commits made by the assistant. The thinking here is that a user sets commit.gpgsign intending the commits that they manually initiate to be gpg signed. But not commits made in the background, whether by a deamon or implicitly to the git-annex branch. gpg signing those would be at best a waste of CPU and at worst would fail, or flood the user with gpg passphrase prompts, or put their signature on changes they did not directly do. See Debian bug #753720. Also makes all commits done by git-annex go through a few central control points, to make such changes easier in future. Also disables commit.gpgsign in the test suite. This commit was sponsored by Antoine Boegli.
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek2014-07-04
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-04
|\
* | deal with android SDK changeGravatar Joey Hess2014-07-04
| | | | | | | | No longer has android-17 target, now it's android-18.
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmlO6w9_FAVe3v6MdnkePxaTJqp0RPbGhM2014-07-04
|/
* Merge orca:/tmp/buildGravatar Joey Hess2014-07-03
|\
| * update android haskell patchesGravatar Joey Hess2014-07-04
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-03
|\ \
* | | devblogGravatar Joey Hess2014-07-03
| | |
| * | Added a commentGravatar http://joeyh.name/2014-07-03
| | |
| * | Added a commentGravatar cbaines2014-07-03
| | |
* | | close as dupGravatar Joey Hess2014-07-03
| |/ |/|
| * Added a commentGravatar http://joeyh.name/2014-07-03
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-03
|\
* | Android: patch git to avoid fchmod, which fails on /sdcard.Gravatar Joey Hess2014-07-03
| |
| * Added a comment: Errors from ScreenshotsGravatar https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w2014-07-03
| |
| * removedGravatar https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w2014-07-03
| |
| * Added a comment: Errors from ScreenshotsGravatar https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w2014-07-03
| |
| * Added a commentGravatar http://joeyh.name/2014-07-03
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-03
|\
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek2014-07-03
| |
| * Added a comment: Same boatGravatar https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek2014-07-03
| |
| * Added a commentGravatar http://joeyh.name/2014-07-03
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-03
|\|
| * Added a commentGravatar http://joeyh.name/2014-07-03
| |
| * Added a commentGravatar http://joeyh.name/2014-07-03
| |
| * Added a commentGravatar http://joeyh.name/2014-07-03
| |
* | closeGravatar Joey Hess2014-07-03
| |
| * Added a commentGravatar http://joeyh.name/2014-07-03
|/
* really add non-date metadata tooGravatar Joey Hess2014-07-03
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-03
|\
* | update for metadataGravatar Joey Hess2014-07-03
| |
| * Added a comment: metadataGravatar http://joeyh.name/2014-07-03
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-03
|\
* | import metadata from feedsGravatar Joey Hess2014-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When annex.genmetadata is set, metadata from the feed is added to files that are imported from it. Reused the same feedtitle and itemtitle, feedauthor, itemauthor, etc names that are used in --template. Also added title and author, which are the item title/author if available, falling back to the feed title/author. These are more likely to be common metadata fields. (There is a small bit of dupication here, but once git gets around to packing the object, it will compress it away.) The itempubdate field is not included in the metadata as a string; instead it is used to generate year and month fields, same as is done when adding files with annex.genmetadata set. This commit was sponsored by Amitai Schlair, who cooincidentially is responsible for ikiwiki generating nice feed metadata!
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY2014-07-03
| |
| * rename ↵Gravatar https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY2014-07-03
| | | | | | | | bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup___40__fixed_by_regular_update_from_2014-06-30__41__.mdwn to bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__.mdwn
| * rename bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup.mdwn to ↵Gravatar https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY2014-07-03
| | | | | | | | bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup___40__fixed_by_regular_update_from_2014-06-30__41__.mdwn
| * Added a comment: Cconfirmed it was a LXDE issue, now fixed.Gravatar https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY2014-07-03
| |
| * (no commit message)Gravatar josch2014-07-03
| |
| * (no commit message)Gravatar josch2014-07-03
| |
| * poll vote (OpenStack SWIFT)Gravatar 202.6.117.1892014-07-03
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI82014-07-02
| |