summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'wip/feature/11979-additional-disk-for-apt-cacher-ng' into wip/f...wip/feature/11972-11979-vagrantbertagaz2016-12-011-1/+1
|\
| * Don't use absolute path for acng data disk.bertagaz2016-12-011-1/+1
* | Merge branch 'wip/feature/11979-additional-disk-for-apt-cacher-ng' into wip/f...bertagaz2016-12-011-1/+1
|\ \ | |/
| * Fix typo.bertagaz2016-12-011-1/+1
* | Merge remote-tracking branch 'origin/wip/feature/11979-additional-disk-for-ap...bertagaz2016-12-012-13/+2
|\ \ | |/
| * Remove buggy code.bertagaz2016-12-011-12/+1
| * Merge remote-tracking branch 'origin/stable' into wip/feature/11979-additiona...bertagaz2016-12-01276-3127/+9188
| |\
| * | Use generic name for acng cache disk.bertagaz2016-12-011-1/+1
* | | Merge remote-tracking branch 'origin/stable' into wip/feature/11972-11979-vag...bertagaz2016-12-01273-3121/+9167
|\ \ \ | | |/ | |/|
| | |
| | \
| *-. \ Merge remote-tracking branches 'origin/test/11991-sikulix-support' and 'origi...intrigeri2016-12-0112-15/+68
| |\ \ \
| | | * | Fixes making the test suite pass for Tails 2.7.1.anonym2016-12-014-1/+1
| | | * | Resolve dl.amnesia.boum.org instead of picking a static address.anonym2016-11-292-4/+14
| | | * | Dogtailify "the support documentation page opens in Tor Browser" step.anonym2016-11-284-3/+23
| | | * | Update dustri.org IP address.anonym2016-11-281-1/+1
| | | * | Use "TorBirdy" instead of "amnesia branding" as the "anchor" addon.anonym2016-11-281-1/+1
| | * | | Do not hover outside of Sikuli's screen.anonym2016-12-011-1/+1
| | * | | Do not click outside of the Sikuli screen.anonym2016-11-281-1/+1
| | * | | Merge remote-tracking branch 'origin/stable' into test/11991-sikulix-supportanonym2016-11-281-2/+2
| | |\ \ \
| | * | | | Disable sikulix' profiling logs.anonym2016-11-221-1/+1
| | * | | | Add support for sikulix.anonym2016-11-221-3/+26
| * | | | | Add dummy changelog entry.anonym2016-12-011-0/+6
| * | | | | Merge remote-tracking branch 'origin/stable'anonym2016-12-0164-1314/+4554
| |\ \ \ \ \
| | * | | | | releasing version 2.7.1anonym2016-11-3019-57/+1058
| | * | | | | Update upgrade-description files.anonym2016-11-306-13/+70
| | * | | | | Update IDF file for DAVE.anonym2016-11-301-3/+3
| | * | | | | Mark Tails 2.7.1 as released.anonym2016-11-301-2/+2
| | * | | | | Update website PO files.2.7.1anonym2016-11-301-2/+2
| | * | | | | Update version and date for 2.7.1.anonym2016-11-3012-17/+17
| | * | | | | Update changelog for 2.7.1.anonym2016-11-301-2/+46
| | * | | | | Update PO files.anonym2016-11-308-56/+535
| | * | | | | Upgrade Tor Browser to 6.0.7-build3.anonym2016-11-302-17/+17
| | * | | | | Update AdBlock Plus patterns.anonym2016-11-301-1119/+2734
| | * | | | | Merge branch 'master' into stableanonym2016-11-30209-1808/+4578
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Add linksajolida2016-11-301-2/+2
| * | | | | | Add outreach eventssajolida2016-11-301-0/+6
| * | | | | | Updating trace file after uploading 2.7.1.anonym2016-11-301-1/+1
| * | | | | | Add alpha UDFs for Tails 2.7.1.anonym2016-11-302-13/+28
| | |/ / / / | |/| | | |
| * | | | | Tor Browser release process: feature/stretch is now 64-bit.anonym2016-11-301-1/+1
| * | | | | edited the problem part127.0.0.12016-11-281-7/+6
| * | | | | updated PO filesamnesia2016-11-2815-256/+233
| * | | | | Merge remote-tracking branch 'xin/alt'sajolida2016-11-283-14/+7
| |\ \ \ \ \
| | * | | | | Remove redundant altxin2016-11-273-14/+7
| * | | | | | Add CI tests to our reviewing guidelines.intrigeri2016-11-271-0/+2
| |/ / / / /
| * | | | | Merge remote-tracking branch 'xin/translate/misc'intrigeri2016-11-274-51/+20
| |\ \ \ \ \
| | * | | | | [fr] update translationxin2016-11-264-51/+20
| * | | | | | Merge remote-tracking branch 'origin/master'sajolida2016-11-2615-122/+183
| |\ \ \ \ \ \
| | * | | | | | updated PO filesamnesia2016-11-2615-122/+183
| * | | | | | | Update PO files and unfuzz stringssajolida2016-11-265-98/+167
| * | | | | | | Down use Oxford comma in enumeration of two onlysajolida2016-11-261-1/+1
| * | | | | | | Use consistent quotingsajolida2016-11-261-3/+3