summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into doc/15016-disable-secure-bootdoc/15016-disable-secure-bootintrigeri2018-03-16423-20542/+57934
|\
| * Calendar: remove past events.intrigeri2018-03-161-11/+0
| * Merge remote-tracking branch 'origin/master'intrigeri2018-03-16192-12858/+15245
| |\
| | * Add more rules for when sending merge requests to main list.127.0.0.12018-03-151-6/+8
| | * updated PO filesamnesia2018-03-156-30/+6
| | * Remove superfluous titleUlrike Uhlig2018-03-151-2/+0
| | * Argh, wrong link.Ulrike Uhlig2018-03-151-1/+1
| | * Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2018-03-156-1591/+1098
| | |\
| | | * updated PO filesamnesia2018-03-156-1591/+1098
| | * | Merge branch 'wed/donate-through-ddg'Ulrike Uhlig2018-03-151-0/+0
| | |\ \ | | | |/ | | |/|
| | | * Add ddg imageUlrike Uhlig2018-03-151-0/+0
| | * | Merge branch 'wed/donate-through-ddg'Ulrike Uhlig2018-03-152-295/+31
| | |\ \ | | | |/
| | | * Merge branch 'master' into wed/donate-through-ddgUlrike Uhlig2018-03-15139-10862/+13848
| | | |\ | | | |/ | | |/|
| | * | Merge branch 'master' of webmasters.boum.org:wikiUlrike Uhlig2018-03-15148-10939/+13944
| | |\ \
| | | * | (no commit message)127.0.0.12018-03-151-0/+11
| | | * | Merge remote-tracking branch 'origin/master'sajolida2018-03-1416-164/+101
| | | |\ \
| | | | * \ Merge remote-tracking branch 'emmapeel/automatic_translations3.6'bertagaz2018-03-146-66/+88
| | | | |\ \
| | | | | * | automatic translations release 3.6emma peel2018-03-143-15/+16
| | | | | * | automatic translations release 3.6emma peel2018-03-144-51/+72
| | | | * | | Remove UDF for unreleased versions.bertagaz2018-03-148-84/+0
| | | | * | | Fix UDF for 3.4.bertagaz2018-03-142-14/+13
| | | | |/ /
| | | * | | Add output from 'Writing good documentation' metaphorssajolida2018-03-141-0/+53
| | | * | | Rename blueprintsajolida2018-03-141-0/+0
| | | |/ /
| | | * | Merge remote-tracking branch 'origin/master'sajolida2018-03-146-228/+174
| | | |\ \
| | | | * | updated PO filesamnesia2018-03-146-228/+174
| | | * | | Merge branch 'feature/15106-installation-complete'sajolida2018-03-140-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Merge remote-tracking branch 'origin/master' into feature/15106-installation-...sajolida2018-01-23668-49325/+491687
| | | | |\ \
| | | * | | | Fix broken linkssajolida2018-03-141-2/+2
| | | * | | | Fix wrong links in security announcement.bertagaz2018-03-137-90/+90
| | | * | | | Update website PO files.bertagaz2018-03-1312-6/+1722
| | | * | | | Fix wrong date format in release news.bertagaz2018-03-131-1/+1
| | | * | | | Restore master's base branch.bertagaz2018-03-131-1/+1
| | | * | | | Merge remote-tracking branch 'origin/web/release-3.6'bertagaz2018-03-13127-10791/+12114
| | | |\ \ \ \
| | | | * \ \ \ Merge remote-tracking branch 'origin/web/14680-3.6-release-notes' into web/re...bertagaz2018-03-132-2/+117
| | | | |\ \ \ \
| | | | | * | | | Mention we do not provide automatic upgrades for this release.bertagaz2018-03-131-4/+3
| | | | | * | | | Add reproducibility issue to the 3.6 release note.bertagaz2018-03-131-0/+3
| | | | | * | | | This is an AppAmor issue on /home/amnesia/.gnupg/tofu.dbsajolida2018-03-131-1/+2
| | | | | * | | | Rephrasesajolida2018-03-131-4/+4
| | | | | * | | | Merge remote-tracking branch 'origin/web/14680-3.6-release-notes' into web/14...sajolida2018-03-131-1/+4
| | | | | |\ \ \ \
| | | | | | * | | | Tentatively add an entry for enigmail in the known issues.bertagaz2018-03-121-1/+4
| | | | | * | | | | Redact missing bitsajolida2018-03-131-1/+2
| | | | | * | | | | Merge remote-tracking branch 'origin/testing' into web/14680-3.6-release-notessajolida2018-03-13187-3751/+22207
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | | * | | | | Release notes for 3.6 (Will-close: #14680)sajolida2018-03-121-0/+110
| | | | | * | | | | This is in the template alreadysajolida2018-03-121-2/+0
| | | | | * | | | | Tor in 3.6 is 0.3.2.10sajolida2018-03-121-1/+1
| | | | * | | | | | releasing version 3.6bertagaz2018-03-1318-7906/+834
| | | | * | | | | | Remove icremental upgrade path dor 3.6.bertagaz2018-03-136-53/+39
| | | | * | | | | | Update IDF file for Tails Verification.bertagaz2018-03-131-4/+4
| | | | * | | | | | Update upgrade-description files.bertagaz2018-03-1322-47/+245
| | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Mark Tails 3.6 as released.3.6bertagaz2018-03-121-2/+2