summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into feature/15342-cache-wikifeature/15342-cache-wikiintrigeri2018-03-29571-23245/+65604
|\
| * Merge branch 'feature/15332-prefer-online-docs' into stableanonym2018-03-291-3/+19
| |\
| | * tails-documentation: add support for anchors for offline usage too.anonym2018-03-291-0/+2
| | * tails-documentation: re-add support for passing a HTML anchor as the second a...intrigeri2018-03-281-0/+7
| | * tails-documentation: open translated documentation page in Tor Browser when o...intrigeri2018-03-281-3/+9
| | * tails-documentation: use documented syntax for os.execv (refs: #15332).intrigeri2018-03-281-1/+2
| * | Merge remote-tracking branch 'origin/bugfix/15457-Linux-4.15.0-2' into stableanonym2018-03-293-2/+2
| |\ \
| | * | Upgrade aufs to 4.15 20180312.intrigeri2018-03-271-0/+0
| | * | Upgrade Linux to 4.15.0-2 (refs: #15456)intrigeri2018-03-271-1/+1
| | * | Bump the snapshot of the Debian archive to 2018032702.intrigeri2018-03-271-1/+1
| | |/
| * | Merge remote-tracking branch 'origin/bugfix/15433-GNOME-settings-vs-VA-API' i...anonym2018-03-292-13/+0
| |\ \
| | * | Revert "Document GNOME Settings bug + workaround (refs: #15433)"intrigeri2018-03-221-9/+0
| | * | Remove packages needed to support Video Acceleration API (VA-API) (refs: #15433)intrigeri2018-03-221-4/+0
| | |/
| * | Merge remote-tracking branch 'origin/bugfix/15434-tails-verification-extensio...anonym2018-03-291-2/+3
| |\ \
| | * | Tor Browser AppArmor profiles: update our custom patch (refs: #15434).intrigeri2018-03-221-2/+3
| * | | Merge remote-tracking branch 'origin/bugfix/15437-IBus-in-Tor-Browser' into s...anonym2018-03-291-4/+6
| |\ \ \
| | * | | Tor Browser AppArmor profiles: update our custom patch (refs: #15437).intrigeri2018-03-221-4/+6
| | |/ /
| * | | Merge remote-tracking branch 'origin/feature/15459-torbrowser-7.5.3' into stableanonym2018-03-292-17/+17
| |\ \ \ | | |_|/ | |/| |
| | * | Upgrade Tor Browser to 7.5.3.anonym2018-03-272-17/+17
| |/ /
| * | Merge remote-tracking branch 'origin/master' into stableintrigeri2018-03-22144-1990/+4000
| |\ \ | | |/ | |/|
| | * updated PO filesamnesia2018-03-226-6/+116
| | * Document GNOME Settings bug + workaround (refs: #15433)intrigeri2018-03-221-0/+9
| | * updated PO filesamnesia2018-03-226-23/+154
| | * Document known issue + workaround for Lenovo ThinkPad 11e.intrigeri2018-03-221-0/+8
| | * updated PO filesamnesia2018-03-226-241/+61
| | * Revert "Document that it's useful to reproduce the bug in Debian (#12631)"sajolida2018-03-221-20/+0
| | * Merge branch 'doc/13333-dont-cut-why-2'sajolida2018-03-221-1/+0
| | |\
| | | * Merge remote-tracking branch 'origin/master' into doc/13333-dont-cut-why-2sajolida2018-03-2022-571/+962
| | | |\
| | | * \ Merge remote-tracking branch 'origin/master' into doc/13333-dont-cut-why-2sajolida2018-03-1999-2575/+3612
| | | |\ \
| | | * \ \ Merge remote-tracking branch 'origin/master' into doc/13333-dont-cut-why-2sajolida2018-03-14415-18630/+56867
| | | |\ \ \
| | | * | | | Prevent "Why 2" from being cut on the left (Will-fix: #13333)sajolida2018-02-241-1/+0
| | * | | | | Don't blame the usersajolida2018-03-221-1/+1
| | * | | | | updated PO filesamnesia2018-03-226-117/+309
| | * | | | | Merge branch 'master' of webmasters.boum.org:wikisajolida2018-03-226-66/+650
| | |\ \ \ \ \
| | | * | | | | updated PO filesamnesia2018-03-226-66/+650
| | * | | | | | Merge branch 'doc/15125-improve-overview-needs' (Closes: #15125)sajolida2018-03-221-3/+26
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge remote-tracking branch 'origin/master' into doc/15125-improve-overview-...sajolida2018-03-2022-571/+962
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Merge remote-tracking branch 'origin/master' into doc/15125-improve-overview-...sajolida2018-03-1999-2349/+3440
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | Merge remote-tracking branch 'origin/master' into doc/15125-improve-overview-...sajolida2018-03-14827-20746/+110292
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into doc/15125-improve-overview-...sajolida2018-01-23602-48676/+490590
| | | |\ \ \ \ \ \
| | | * | | | | | | Remove useless 'will'sajolida2017-12-271-1/+1
| | | * | | | | | | Add missing total time in upgrade-tailssajolida2017-12-271-1/+1
| | | * | | | | | | Add in total for the scenarios that include a download (#15125)sajolida2017-12-271-2/+2
| | | * | | | | | | Put time first (#15125)sajolida2017-12-271-23/+23
| | * | | | | | | | Merge branch 'doc/14965-dotfile-for-monitors' (Closes: #14965)sajolida2018-03-222-1/+48
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'cbrownstein/doc/14965-dotfile-for-monitors' int...sajolida2018-03-221-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'master' of https://git-tails.immerda.ch/tails into doc/14965-do...Cody Brownstein2018-03-14415-18464/+56396
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'master' of https://git-tails.immerda.ch/tails into doc/14965-do...Cody Brownstein2018-02-2629-306/+406
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Improve grammarCody Brownstein2018-02-251-1/+1
| | | | * | | | | | | | | | Merge branch 'master' of https://git-tails.immerda.ch/tails into doc/14965-do...Cody Brownstein2018-02-241-6/+6
| | | | |\ \ \ \ \ \ \ \ \ \