summaryrefslogtreecommitdiffstats
path: root/wiki
Commit message (Expand)AuthorAgeFilesLines
* Update the Tails signing key after revoking an unused subkey.anonym2015-10-291-237/+262
* Merge remote-tracking branch 'muri/muri-t10n/review-de_offline_mode' into tes...sajolida2015-10-291-8/+18
|\
| * undid a change of a msgidMuri Nicanor2015-10-271-4/+5
| * Merge remote-tracking branch 'spriver/de_offline_mode' into review-de_offline...Muri Nicanor2015-10-271-13/+22
| |\
| | * Initial translationspriver2015-10-271-13/+22
* | | Merge remote-tracking branch 'muri/muri-t10n/review-de_warning' into testingsajolida2015-10-291-209/+104
|\ \ \
| * | | fixed one missing characterMuri Nicanor2015-10-281-3/+3
| * | | Reviewed review and made some minor correctionsspriver2015-10-281-22/+21
| * | | reviewed and fixed some minor wordingsMuri Nicanor2015-10-281-25/+26
| * | | Merge remote-tracking branch 'spriver/de_warning' into review-de_warningMuri Nicanor2015-10-281-188/+83
| |\ \ \ | | |/ / | |/| |
| | * | Translated the untranslated, unfuzziedspriver2015-10-271-188/+83
| | |/
* | | Merge remote-tracking branch 'spriver/review-de_network_configuration' into t...sajolida2015-10-291-18/+16
|\ \ \
| * | | Reviewed review and made small changesspriver2015-10-281-8/+8
| * | | adapted translation to the change in the english originalMuri Nicanor2015-10-281-3/+3
| * | | Merge remote-tracking branch 'spriver/de_network_configuration' into muri-t10...Muri Nicanor2015-10-281-12/+10
| |\ \ \ | | |/ / | |/| |
| | * | Translated untranslated stringsspriver2015-10-271-12/+10
| | |/
* | | Merge remote-tracking branch 'spriver/de_startup_options' into testingsajolida2015-10-291-10/+7
|\ \ \
| * | | Edited changed stringspriver2015-10-271-10/+7
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/test/10208-clean-up-deps' into testingintrigeri2015-10-271-8/+8
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'origin/devel' into test/10208-clean-up-depsanonym2015-10-224-3/+7
| |\ \
| * \ \ Merge remote-tracking branch 'origin/devel' into test/10208-clean-up-depsanonym2015-10-2271-945/+2104
| |\ \ \
| * | | | Sort and re-split lines.anonym2015-10-171-8/+8
| * | | | x11-apps is not needed by the automated test suite.anonym2015-10-171-1/+1
| * | | | radvd is not needed by the automated test suite.anonym2015-10-171-1/+1
| * | | | libxslt1-dev is not needed by the automated test suite.anonym2015-10-171-1/+1
* | | | | Merge branch 'stable' into testinganonym2015-10-2711-23/+877
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'web/test_1.7-rc1'anonym2015-10-274-0/+836
| |\ \ \ \
| | * | | | Remove reference to #9672 in 1.7~rc1 announcement.anonym2015-10-274-49/+29
| | * | | | Review & fixes for tails 1.7~rc1 teste announcemercedes5082015-10-271-10/+9
| | * | | | [fr] translation of wiki/src/news/test_1.7-rc1.fr.poelouann2015-10-271-31/+92
| | * | | | typoelouann2015-10-271-1/+1
| | * | | | Merge branch 'web/test_1.7-rc1' of https://git-tails.immerda.ch/tails into we...elouann2015-10-274-0/+796
| | |\ \ \ \
| | | * | | | Add draft of CfT for Tails 1.7~rc1.anonym2015-10-274-0/+796
| * | | | | | + metrics127.0.0.12015-10-271-2/+2
| * | | | | | Merge remote-tracking branch 'spriver/de_support'sajolida2015-10-273-19/+21
| |\ \ \ \ \ \
| | * | | | | | Unfuzzied strings and translated inlinespriver2015-10-233-19/+21
| * | | | | | | Merge remote-tracking branch 'origin/master'intrigeri2015-10-274-14/+45
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Add signature of the Tails 1.7~rc1 ISO image.anonym2015-10-271-0/+16
| | | |/ / / / | | |/| | | |
| * | | | | | Fix typos.intrigeri2015-10-272-2/+2
* | | | | | | Fix manual test.anonym2015-10-271-1/+1
* | | | | | | Merge remote-tracking branch 'origin/master' into testinganonym2015-10-273-14/+29
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Updating trace file after uploading 1.7~rc1.anonym2015-10-271-1/+1
| * | | | | | Update upgrade-description files.anonym2015-10-272-13/+28
| |/ / / / /
* | | | | | Update website PO files.1.7-rc1anonym2015-10-2718-43/+295
* | | | | | Update the Tails signing key.anonym2015-10-271-93/+1223
* | | | | | Merge remote-tracking branch 'origin/master' into develanonym2015-10-2615-93/+937
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Freezable APT repo: add hint.intrigeri2015-10-261-0/+2
| * | | | | Freezable APT repo: TODO--intrigeri2015-10-261-3/+4
| * | | | | Revert "2rand[0,1,1]"sajolida2015-10-261-1/+444
| * | | | | Merge remote-tracking branch 'origin/master'sajolida2015-10-269-467/+81
| |\ \ \ \ \