summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/feature/14594-asp-gui' into wip/feature/...wip/feature/14576-automated-tests-for-ASP-guibertagaz2018-03-201-0/+7
|\
| * ASP: install DPKG hooks at the end of the build hooks.bertagaz2018-03-201-0/+7
* | Merge branch 'feature/14594-asp-gui' into wip/feature/14576-automated-tests-f...bertagaz2018-03-19281-16180/+23234
|\ \ | |/
| * Merge remote-tracking branch 'origin/devel' into feature/14594-asp-guibertagaz2018-03-1990-2265/+3453
| |\
| | * Merge branch 'stable' into develbertagaz2018-03-1958-212/+1524
| | |\
| | | * Merge branch 'master' into stablebertagaz2018-03-1944-164/+1436
| | | |\
| | | | * Merge remote-tracking branch 'origin/web/release-3.6.1'bertagaz2018-03-1848-176/+1446
| | | | |\
| | | | | * Merge remote-tracking branch 'origin/web/15425-3.6.1-release-notes' into web/...bertagaz2018-03-1814-19/+333
| | | | | |\
| | | | | | * releasing version 3.6.1bertagaz2018-03-1813-0/+1238
| | | | | | * Fix wrong Tor Browser version in 3.6.1 release notes. (refs: #15425)bertagaz2018-03-181-1/+1
| | | | | * | Delete 3.6 files.intrigeri2018-03-174-7729/+0
| | | | | * | Add 3.6.1 files.intrigeri2018-03-175-2/+7722
| | | | | * | Update IDF file for Tails Verification.intrigeri2018-03-171-3/+3
| | | | | * | Update upgrade-description files.intrigeri2018-03-1710-87/+52
| | | | | * | Add PO files for the 3.6.1 release announce.intrigeri2018-03-166-0/+924
| | | | | * | Merge remote-tracking branch 'origin/web/15425-3.6.1-release-notes' into web/...intrigeri2018-03-162-1/+58
| | | | | |\ \ | | | | |/ / / | | | |/| | / | | | | | |/
| | | | | * Release notes for 3.6.1 (Will-close: #15425)sajolida2018-03-161-0/+57
| | | | | * Use the abbreviated version of the monthsajolida2018-03-161-1/+1
| | | * | | Mark Tails 3.6.1 as released.3.6.1intrigeri2018-03-161-2/+2
| | | * | | Changelog++intrigeri2018-03-161-0/+3
| | | | |/ | | | |/|
| | | * | Merge branch 'bugfix/15417-tor-browser-7.5.2' into stable (Fix-committed: #15...intrigeri2018-03-163-18/+17
| | | |\ \
| | | | * | Revert "Tor Browser: enable Selfrando."intrigeri2018-03-161-1/+0
| | | | * | Upgrade Tor Browser to 7.5.2-build1.intrigeri2018-03-162-17/+17
| | | * | | Update website PO files.intrigeri2018-03-162-12/+12
| | | * | | Update changelog for 3.6.1.intrigeri2018-03-161-2/+9
| | | * | | Update version and date for 3.6.1.intrigeri2018-03-166-6/+6
| | | * | | Merge remote-tracking branch 'origin/master' into stableintrigeri2018-03-164-14/+39
| | | |\ \ \
| | | | | | * Updating trace file after uploading 3.6.1.bertagaz2018-03-181-1/+1
| | | | | | * Updating trace file after uploading 3.6.1.intrigeri2018-03-171-1/+1
| | | | | | * Release process: fix typo.intrigeri2018-03-171-1/+1
| | | | | | * Add incremental upgrades on the test channel for Tails 3.6.1intrigeri2018-03-172-0/+27
| | | | | | * updated PO filesamnesia2018-03-176-30/+24
| | | | | | * Merge remote-tracking branch 'origin/master'intrigeri2018-03-162-11/+35
| | | | | | |\ | | | | | |_|/ | | | | |/| |
| | | | * | | Merge remote-tracking branch 'origin/master'sajolida2018-03-1611-72/+88
| | | | |\ \ \
| | | | | * \ \ Merge remote-tracking branch 'origin/master'sajolida2018-03-1626-112/+677
| | | | | |\ \ \
| | | | | * \ \ \ Merge remote-tracking branch 'emmapeel/review-pt'sajolida2018-03-161-11/+7
| | | | | |\ \ \ \
| | | | | | * | | | some rewrapping filtered outemma peel2018-03-151-11/+7
| | | | * | | | | | Clarify unspecified items of the interface (#15423)sajolida2018-03-161-0/+28
| | | | | | | | | * Merge remote-tracking branch 'origin/doc/15416-manual-upgrade-from-3.5'intrigeri2018-03-161-3/+3
| | | | | | | | | |\ | | | | | | | | |/ / | | | | | | | |/| |
| | | | | | | | | * Remove ambiguity (#15416)sajolida2018-03-161-2/+2
| | | | | | | | | * Tails Installer was broken since 3.2 (#15233, #15416)sajolida2018-03-161-3/+3
| | | | | | | | | * Remove ambiguity when inlined in release notes (#15416)sajolida2018-03-161-1/+1
| | | | | | | * | | Tor Browser release process: don't include tor-browser-linux64-debug.tar.xz i...intrigeri2018-03-161-2/+3
| | | | | | | * | | Release process: ensure we merge something that's up-to-date.intrigeri2018-03-161-1/+1
| | * | | | | | | | Merge branch 'stable' into develintrigeri2018-03-162-10/+7
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Update PO files.intrigeri2018-03-162-10/+7
| | * | | | | | | | Merge branch 'stable' into develintrigeri2018-03-1640-2081/+1957
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch 'bugfix/15400-python-lib-breaks-reproducibility' into stable (Fi...intrigeri2018-03-161-1/+8
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | | * | | | | | Fix 00-install-tailslibsegfault2018-03-161-1/+1
| | | | * | | | | | Strip dates from Tailslib Python packagesegfault2018-03-161-1/+8