summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* releasing version 1.2.21.2.2Tails developers2014-12-158-33/+35
* Update upgrade-description files.Tails developers2014-12-158-30/+90
* Update changelog for 1.2.2.Tails developers2014-12-151-3/+8
* Update version and date for 1.2.2.Tails developers2014-12-1514-23/+20
* Merge remote-tracking branch 'origin/master' into stableTails developers2014-12-1532-139/+499
|\
| * Mention cert_override.txt.Tails developers2014-12-141-0/+4
| * updated PO filesamnesia2014-12-133-3/+21
| * Add DistroWatch.com "award".Tails developers2014-12-131-0/+2
| * Remove past events.Tails developers2014-12-131-13/+0
| * Update scheduled release dates.Tails developers2014-12-131-4/+4
| * Document that the RM should keep an eye on tails.b.o's certificate expiration.Tails developers2014-12-131-0/+7
| * Merge remote-tracking branch '451f/doc/improve_german'Tails developers2014-12-121-0/+28
| |\
| | * correct URLs again :)Tails developers2014-12-121-2/+2
| | * correct URLs and better sentence structureTails developers2014-12-121-4/+4
| | * correct URLTails developers2014-12-121-1/+1
| | * will-fix: #8141 put contributors to the end of the pageTails developers2014-12-111-8/+8
| | * will-fix: #8141 correct url. make this more readable.Tails developers2014-12-111-2/+6
| | * will-fix: #8141 add details on repositories, add 1 glossary, what can be tran...Tails developers2014-12-111-0/+24
| * | Remove tails@boum.org duty from frontdesk (Will-fix: #8420)Tails developers2014-12-111-4/+0
| * | updated PO filesamnesia2014-12-113-3/+21
| * | Merge branch 'master' of ssh://webmasters.boum.org/~/wikiTails developers2014-12-117-9/+83
| |\ \
| | * | updated PO filesamnesia2014-12-113-3/+52
| | * | Merge branch 'master' of ssh://webmasters.boum.org/~/wikiTails developers2014-12-113-6/+23
| | |\ \
| | | * | updated PO filesamnesia2014-12-113-6/+23
| | * | | Merge branch 'doc/6872-FAQ_bridge_relay_in_Tails'Tails developers2014-12-111-0/+8
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Use affirmative formTails developers2014-12-111-1/+1
| | | * | Fix anchor markupTails developers2014-12-111-1/+1
| | | * | Use ikiwiki shortcutTails developers2014-12-111-3/+2
| | | * | Use consistent terminologyTails developers2014-12-111-3/+3
| | | * | Use consistent typographyTails developers2014-12-111-1/+1
| | | * | FAQ: Can I help the Tor network by running a Relay or a Bridge with Tails? (#...Tails developers2014-12-111-0/+9
| | |/ /
| * | | Merge branch 'doc/6976-known_issue_sandisk_cruzer_orbiter_32gb'Tails developers2014-12-111-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | known issues - add Sandisk Cruzer Orbit 32gb to problematic USB sticks (#6976)Tails developers2014-12-111-0/+1
| |/ /
| * | Merge branch 'doc/7357-warnings_persistence_encrypted'Tails developers2014-12-111-1/+1
| |\ \ | | |/ | |/|
| | * Use consistent terminologyTails developers2014-12-111-1/+1
| | * SimplifyTails developers2014-12-111-1/+1
| | * Tails doesn't encrypt by default... except in persistence (#7357)Tails developers2014-12-111-1/+1
| |/
| * Fix UDF target-files' paths.Tails developers2014-12-102-15/+15
| * Add alpha channel incremental upgrade path from 1.2.1 to 1.2.2.Tails developers2014-12-102-13/+29
| * updated PO filesamnesia2014-12-073-9/+27
| * Add anchorTails developers2014-12-071-0/+2
| * Import new translations.Tails developers2014-12-062-76/+177
| * Add December meeting minutes.Tails developers2014-12-061-0/+86
| * Clarify how to check PO files.Tails developers2014-12-051-3/+5
| * Don't use unsafe convenience mode for verifying detached OpenPGP signatures.Tails developers2014-12-051-1/+1
* | Update website PO files.Tails developers2014-12-155-37/+553
* | Merge branch 'bugfix/handle-website-CA-change' into stableTails developers2014-12-122-0/+34
|\ \
| * | Patch tails-iuk to use the correct website certificate.Tails developers2014-12-121-0/+21
| * | Create a CA bundle for Tails Upgrader at ISO build time.Tails developers2014-12-071-0/+13
| |/
* | Fix linkTails developers2014-12-121-1/+1