summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/feature/stretch' into wip/5630-11972-det...wip/5630-11972-deterministic-builds-in-jenkinsbertagaz2017-03-191-2/+2
|\
| * Mark Tails 3.0~beta3 as released.3.0-beta3anonym2017-03-191-2/+2
* | Merge remote-tracking branch 'origin/feature/stretch' into wip/5630-11972-det...bertagaz2017-03-19279-6738/+4109
|\ \ | |/
| * Update website PO files.intrigeri2017-03-1952-560/+741
| * Add missing changelog entry.intrigeri2017-03-191-0/+2
| * Merge remote-tracking branch 'origin/master' into feature/stretchintrigeri2017-03-191-4/+2
| |\
| | * Release process: simplify.intrigeri2017-03-191-5/+2
| | * Release process: fix DEB* variables.intrigeri2017-03-191-1/+2
| * | Update changelog for 3.0~beta3.intrigeri2017-03-191-2/+70
| * | Empty the list of APT overlays: they were mergedintrigeri2017-03-191-0/+0
| * | Merge branch 'bugfix/12219-xorg-server-1.19.3-1' into feature/stretchintrigeri2017-03-191-0/+0
| |\ \
| | * \ Merge branch 'feature/stretch' into bugfix/12219-xorg-server-1.19.3-1intrigeri2017-03-187-34/+105
| | |\ \
| | * | | Enable the bugfix-12219-xorg-server-1.19.3-1 APT overlay (refs: #12219).intrigeri2017-03-181-0/+0
| * | | | Update PO files.intrigeri2017-03-1947-2851/+2077
| * | | | Don't try to hide openjdk-8-policytool.desktop, that we don't install anymore.intrigeri2017-03-191-1/+0
| * | | | Empty the list of APT overlays: they were mergedintrigeri2017-03-191-0/+0
| * | | | Remove the feature-12373-honor-debug-kernel-cmdline APT overlay: superseded b...intrigeri2017-03-191-0/+0
| * | | | Merge remote-tracking branch 'origin/feature/stretch' into feature/stretchintrigeri2017-03-191-0/+0
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/feature/12373-honor-debug-kernel-cmdline...bertagaz2017-03-191-0/+0
| | |\ \ \ \
| | | * | | | Enable branch apt suiteAlan2017-03-181-0/+0
| * | | | | | Merge remote-tracking branch 'origin/feature/12263-remove-i2p' into feature/s...intrigeri2017-03-19114-3009/+510
| |\ \ \ \ \ \
| | * | | | | | Reintroduce dkms hook, that was removed by mistake in commit:e9d0204.intrigeri2017-03-161-0/+46
| | * | | | | | po/POTFILES.in: remove I2P-related POT files.intrigeri2017-03-161-3/+0
| | * | | | | | Merge remote-tracking branch 'origin/devel' into feature/12263-remove-i2pintrigeri2017-03-15245-4289/+13443
| | |\ \ \ \ \ \
| | * | | | | | | Drop the "I2P will be removed in Tails 2.12" notification (refs: #12263).intrigeri2017-03-065-77/+0
| | * | | | | | | Merge branch 'devel' into feature/12263-remove-i2pintrigeri2017-03-0645-212/+508
| | |\ \ \ \ \ \ \
| | * | | | | | | | Completely remove I2P.anonym2017-02-28164-5293/+585
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into feature/stretchintrigeri2017-03-1910-171/+408
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Make it clear we have no buildds.intrigeri2017-03-181-0/+4
| | * | | | | | | Improve the APT custom repo doc.intrigeri2017-03-181-4/+9
| | * | | | | | | Fix custom APT repo doc.intrigeri2017-03-181-1/+1
| | * | | | | | | Merge remote-tracking branch 'spriver/review-de_tails_211'intrigeri2017-03-182-50/+113
| | |\ \ \ \ \ \ \
| | | * | | | | | | Simplifyingspriver2017-03-161-1/+1
| | | * | | | | | | Fix typosspriver2017-03-161-3/+3
| | | * | | | | | | reviewed the translation and made some small changesMuri Nicanor2017-03-102-16/+17
| | | * | | | | | | Merge remote-tracking branch 'spriver/de_tails_211' into review-de_tails_211Muri Nicanor2017-03-102-48/+110
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Grammarspriver2017-03-101-2/+2
| | | | * | | | | | | Rephrasing and unifyingspriver2017-03-101-8/+8
| | | | * | | | | | | Initial translationspriver2017-03-101-31/+73
| | | | * | | | | | | Fix linefeedsspriver2017-03-101-9/+17
| | | | * | | | | | | Initial translationspriver2017-03-101-17/+29
| | * | | | | | | | | Merge remote-tracking branch 'spriver/review-de_tails_210'intrigeri2017-03-182-46/+83
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add version to donate linkspriver2017-03-161-2/+2
| | | * | | | | | | | | Remove superfluous wordspriver2017-03-161-3/+2
| | | * | | | | | | | | Grammatical improvementspriver2017-03-161-3/+3
| | | * | | | | | | | | reviewed the translation and made some changesMuri Nicanor2017-03-101-14/+15
| | | * | | | | | | | | Merge remote-tracking branch 'spriver/de_tails_210' into review-de_tails_210Muri Nicanor2017-03-102-45/+82
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Initial translationspriver2017-02-081-17/+20
| | | | * | | | | | | | Initial translationspriver2017-02-081-28/+62
| | * | | | | | | | | | Be more precise wrt. when one needs to upload the orig tarball.intrigeri2017-03-181-1/+2