summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Have syslinux' SYSAPPEND feature add FSUUID= to the kernel command-line.feature/6397-stop-relying-on-the-removable-bitTails developers2014-06-281-0/+46
* Merge branch 'testing' into develTails developers2014-06-259-15/+15
|\
| * Merge remote-tracking branch 'origin/doc/wheezy' into testingTails developers2014-06-259-15/+15
| |\
| | * Remove ampersandTails developers2014-06-259-14/+14
| | * Rename documentation sectionTails developers2014-06-251-1/+1
| * | Merge branch 'bugfix/7345-upgrade-from-iso-from-1.0-to-1.1' into testingTails developers2014-06-248-27/+122
| |\ \
* | \ \ Merge branch 'bugfix/7345-upgrade-from-iso-from-1.0-to-1.1' into develTails developers2014-06-248-27/+122
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Make it clear that ideally, we would use the right version of tails-perl5lib ...Tails developers2014-06-241-3/+3
| * | Drop painful manual run of pherkin tests: now integrated via t/10-features.t.Tails developers2014-06-241-6/+0
| * | Merge remote-tracking branch 'origin/testing' into bugfix/7345-upgrade-from-i...Tails developers2014-06-248-18/+69
| |\ \ | |/ / |/| |
* | | Merge remote-tracking branch 'origin/doc/wheezy' into testingTails developers2014-06-233-14/+1
|\ \ \ | | |/ | |/|
| * | Finish removing dummy index pagesTails developers2014-06-223-14/+1
|/ /
* | Merge remote-tracking branch 'origin/doc/office' into testingTails developers2014-06-221-4/+17
|\ \
| * | Point to upstream documentationTails developers2014-06-221-0/+4
| * | Use canonical menu path markupTails developers2014-06-221-1/+5
| * | List all the LibreOffice toolsTails developers2014-06-221-2/+7
| * | Reuse upstream wording and remove mention of MicrosoftTails developers2014-06-221-2/+2
* | | Merge remote-tracking branch 'origin/devel' into develTails developers2014-06-222-0/+21
|\ \ \
| * \ \ Merge branch 'testing' into develTails developers2014-06-222-0/+30
| |\ \ \ | | |/ / | |/| |
| * | | Merge branch 'testing' into develTails developers2014-06-1919-56/+5827
| |\ \ \
| * | | | Release process++.Tails developers2014-06-192-0/+21
* | | | | Merge branch 'testing' into develTails developers2014-06-2221-56/+5857
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/bugfix/7338-migrate-nm-persistence-setti...Tails developers2014-06-222-0/+30
| |\ \ \ | | |/ / | |/| |
| | * | Add reminder for the 1.1 release notes.Tails developers2014-06-201-0/+3
| | * | Disable pre-Wheezy NM persistence setting when activating persistence.Tails developers2014-06-201-2/+4
| | * | Merge branch 'testing' into bugfix/7338-migrate-nm-persistence-settingTails developers2014-06-20211-2232/+13160
| | |\ \ | | |/ / | |/| |
| | * | First stab at making the new NetworkManager configuration directory persisten...Tails developers2014-05-301-0/+25
* | | | Merge branch 'testing' into develTails developers2014-06-1555-997/+2626
|\ \ \ \
| | | | * Add security discussion wrt. running syslinux from the upgraded system.Tails developers2014-06-222-0/+18
| | | | * Merge branch 'testing' into bugfix/7345-upgrade-from-iso-from-1.0-to-1.1Tails developers2014-06-2021-63/+5829
| | | | |\ | | | |_|/ | | |/| |
| | * | | Merge remote-tracking branch 'origin/feature/6342-update-camouflage-for-gnome...Tails developers2014-06-1921-63/+5829
| | |\ \ \ | |/ / / /
| | * | | Merge branch 'feature/7367-browser-camouflage' into feature/6342-update-camou...Tails developers2014-06-141-1/+2
| | |\ \ \
| | | * | | Fix toolbar colorTails developers2014-06-141-0/+1
| | | * | | Fix typoTails developers2014-06-141-1/+1
| | * | | | Merge branch 'feature/7367-browser-camouflage' into feature/6342-update-camou...Tails developers2014-06-141-0/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix tab close button colorTails developers2014-06-141-0/+6
| | | * | | Merge remote branch 'origin/devel' into feature/7367-browser-camouflageTails developers2014-06-14144-1270/+4733
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'testing' into develTails developers2014-06-123-2/+7
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch 'testing' into develTails developers2014-06-111-11/+0
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into develTails developers2014-06-10136-1256/+4694
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'testing' into develTails developers2014-06-10140-1258/+4719
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'testing' into develTails developers2014-06-101-0/+7
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge branch 'testing' into develTails developers2014-06-103-1/+25
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| | | | | | | * | | | Merge branch 'bugfix/7407-early-icon-theme' into feature/6342-update-camoufla...Tails developers2014-06-141-0/+5
| | | | | | | |\ \ \ \
| | | | | | | | * | | | Try to early set only icon themeTails developers2014-06-141-1/+6
| | | | | | | | * | | | Revert "Call the user part of the script early"Tails developers2014-06-142-10/+19
| | | | | | | | * | | | Call the user part of the script earlyTails developers2014-06-122-19/+10
| | | | | | | * | | | | Merge branch 'bugfix/7326-systray-icons' into feature/6342-update-camouflage-...Tails developers2014-06-141-1/+1
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | Actually install 48x48 icons by fixing typoTails developers2014-06-141-1/+1
| | | | | | | * | | | | | Merge remote-tracking branch 'origin/bugfix/7329-unsafe-browser-with-win8-cam...Tails developers2014-06-131-4/+0
| | | | | | | |\ \ \ \ \ \