summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/web/assistant' into web/9385-download-an...web/9385-download-and-verify-csssajolida2015-11-1056-86/+530
|\
| * Merge branch 'web/10301-mac-router' into web/assistantsajolida2015-11-011-2/+2
| |\
| | * Make it clear that the DVD is not the final productsajolida2015-11-011-1/+1
| | * Merge remote-tracking branch 'origin/stable' into web/10301-mac-routersajolida2015-10-2274-941/+2106
| | |\
| | * | Improve languagesajolida2015-10-211-1/+1
| * | | Merge branch 'web/10314-mac-dvd' into web/assistantsajolida2015-10-2819-34/+131
| |\ \ \
| | * \ \ Merge branch 'web/assistant' into web/10314-mac-dvdsajolida2015-10-274-4/+4
| | |\ \ \
| | * | | | Improve spacingsajolida2015-10-263-3/+3
| | * | | | Add missing imagesajolida2015-10-261-0/+0
| | * | | | Remove (2) from state image on mac/dvdsajolida2015-10-262-1/+2
| | * | | | Simplifysajolida2015-10-261-1/+1
| | * | | | Add and adapt 'create persistence' to mac/dvdsajolida2015-10-262-2/+4
| | * | | | Explicit the type of device (DVD or USB stick) in titles on mac/dvdsajolida2015-10-263-7/+6
| | * | | | Add and adapt 'restart on final Tails' to mac/dvdsajolida2015-10-262-6/+14
| | * | | | This has been factored out in install/inc/steps/mac_startup_disks.inlinesajolida2015-10-261-4/+0
| | * | | | Only display when there's a temporary Tailssajolida2015-10-261-1/+1
| | * | | | Merge branch 'web/10313-mac-usb' into web/10314-mac-dvdsajolida2015-10-265-10/+24
| | |\ \ \ \
| | * | | | | Move infography one step downsajolida2015-10-261-1/+2
| | * | | | | Add and adapt "install final Tails" to mac/dvdsajolida2015-10-264-2/+10
| | * | | | | Fix weird display problemsajolida2015-10-261-3/+5
| | * | | | | Add and adapt "restart on temporary Tails" to mac/dvdsajolida2015-10-264-10/+22
| | * | | | | Hide 'dvd' and 'mac-dvd' by defaultsajolida2015-10-261-2/+2
| | * | | | | Add missing stylesheetsajolida2015-10-261-0/+6
| | * | | | | Add context switch to mac/dvdsajolida2015-10-263-0/+4
| | * | | | | Add outro (state infography and trophy) to burning DVDsajolida2015-10-262-0/+8
| | * | | | | Add infography for inserting DVDsajolida2015-10-262-0/+2
| | * | | | | Add instruction on burning a DVD from Macsajolida2015-10-261-1/+32
| | * | | | | Create CSS structure for mac/dvdsajolida2015-10-262-1/+11
| * | | | | | Merge branch 'web/10310-clone' into web/assistantsajolida2015-10-280-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'web/assistant' into web/10310-clonesajolida2015-10-274-4/+4
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Remove trailing whitespacesajolida2015-10-231-1/+1
| | * | | | | | Move all <style> into <head> and complexify scenario-dependent CSS mechanismsajolida2015-10-2320-43/+114
| | * | | | | | Merge branch 'web/assistant' into web/10310-clonesajolida2015-10-2320-113/+495
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/stable' into web/10310-clonesajolida2015-10-2274-941/+2106
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| * | | | | | | | Merge branch 'web/assistant' into web/10313-mac-usbsajolida2015-10-274-4/+4
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'web/10159-remove-sd-cards' into web/assistant (Closes: #10159)sajolida2015-10-274-4/+4
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Most USB have more than 4 GB nowadayssajolida2015-10-234-4/+4
| | | * | | | | | Don't talk about SD cards anymoresajolida2015-10-234-4/+4
| | |/ / / / / /
| * | | | | | | Merge branch 'web/9433-rephrase-copy-from-a-friend' into web/10313-mac-usb (C...sajolida2015-10-271-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Replace 'friend' with 'other Tails'sajolida2015-10-231-1/+1
| | |/ / / / /
| * | | | | | Duplicate explanation about Mac startup disk for final Tailssajolida2015-10-263-8/+11
| * | | | | | Be more precisesajolida2015-10-261-1/+1
| * | | | | | Add outro after installing temporary Tailssajolida2015-10-262-2/+6
| | |_|_|/ / | |/| | | |
| * | | | | Explain better the screenshotsajolida2015-10-261-3/+3
| * | | | | Use screenshot provided by SpencerOnesajolida2015-10-262-1/+1
| * | | | | Merge branch 'web/assistant' into web/10313-mac-usbsajolida2015-10-2316-106/+490
| |\ \ \ \ \ | | |/ / / /
| * | | | | Remove trailing whitespacesajolida2015-10-221-1/+1
| * | | | | Improve typographysajolida2015-10-221-2/+2
| * | | | | Add persistence creation to mac/usbsajolida2015-10-221-0/+2
| * | | | | Add final Tails for Mac/USB scenariosajolida2015-10-222-0/+18