summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* liveusb-creator (3.11.6+tails1-7)debian/3.11.6+tails1-7Tails developers2014-07-011-0/+6
* Merge branch 'master' into debianTails developers2014-07-0148-6500/+6253
|\
| * Import PO files from Transifex, update POT and PO files.Tails developers2014-07-0148-6500/+6253
* | liveusb-creator (3.11.6+tails1-6)debian/3.11.6+tails1-6Tails developers2014-06-241-4/+2
* | Merge branch 'master' into debianTails developers2014-06-240-0/+0
|\ \ | |/
| * Merge branch 'bugfix/7345-upgrade-from-iso-from-1.0-to-1.1'Tails developers2014-06-243-55/+31
| |\
* | \ Merge branch 'debian_bugfix-7345-upgrade-from-iso-from-1.0-to-1.1' into debianTails developers2014-06-244-55/+46
|\ \ \
| * | | liveusb-creator (3.11.6+tails1-5.bugfix.7345~3.gbp21039c)debian_bugfix-7345-upgrade-from-iso-from-1.0-to-1.1Tails developers2014-06-151-3/+3
| * | | Merge branch 'bugfix/7345-upgrade-from-iso-from-1.0-to-1.1' into debian_bugfi...Tails developers2014-06-151-4/+4
| |\ \ \ | | | |/ | | |/|
| | * | Actually rename isolinux->syslinux *after* operations that rely on the old na...bugfix/7345-upgrade-from-iso-from-1.0-to-1.1Tails developers2014-06-151-4/+4
| * | | liveusb-creator (3.11.6+tails1-5.bugfix.7345~2.gbp05a6d6)Tails developers2014-06-151-3/+5
| * | | Merge branch 'bugfix/7345-upgrade-from-iso-from-1.0-to-1.1' into debian_bugfi...Tails developers2014-06-152-28/+10
| |\ \ \ | | |/ /
| | * | Always reset the target drive's MBR, without asking for confirmation, after i...Tails developers2014-06-151-27/+6
| | * | Make the temporary copy of syslinux executable.Tails developers2014-06-151-0/+3
| | * | Syntax fix.Tails developers2014-06-151-1/+1
| * | | liveusb-creator (3.11.6+tails1-5.bugfix.7345~1.gbp7b64eb)Tails developers2014-06-131-0/+13
| * | | Merge branch 'bugfix/7345-upgrade-from-iso-from-1.0-to-1.1' into debian_bugfi...Tails developers2014-06-132-28/+22
| |\ \ \ |/ / / / | | _ / | | /
| * | Install the bootloader using the syslinux binary found on the target device, ...Tails developers2014-06-131-24/+16
| * | Add "utils" directory to the list of those we expect to find in the ISO files...Tails developers2014-06-131-1/+2
| * | Rename isolinux to syslinux in update_configs, instead of in install_bootloader.Tails developers2014-06-131-3/+4
* | | liveusb-creator (3.11.6+tails1-5)debian/3.11.6+tails1-5Tails developers2014-06-131-0/+8
* | | Merge branch 'master' into debianTails developers2014-06-135-76/+58
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/feature/7319-partially-covered-labels'Tails developers2014-06-135-76/+58
| |\ \ | | |/ | |/|
| | * Add consistent marigins.feature/7319-partially-covered-labelsTails developers2014-06-124-8/+8
| | * Rearrange GUI so the titles are not partially hidden. (Closes: #7319)Tails developers2014-06-124-60/+42
| | * Implement kurono's patch for #5673 in the .ui files.Tails developers2014-06-122-14/+14
| |/
* | Merge branch 'debian_feature-uefi' into debian with strategy "ours".Tails developers2014-06-130-0/+0
|\ \
| * | liveusb-creator (3.11.6+tails1-1+feature.uefi.1)debian/3.11.6+tails1-1+feature.uefi.1debian_feature-uefiTails developers2014-05-131-0/+10
| * | Merge branch 'debian' into debian_feature-uefiTails developers2014-05-136-1123/+505
| |\ \
| * \ \ Merge branch 'debian' into debian_feature-uefidebian/3.11.6-33+feature.uefi.1Tails developers2014-05-032-5/+18
| |\ \ \
| * \ \ \ Merge branch 'feature/uefi' into debian_feature-uefiTails developers2014-05-0348-679/+673
| |\ \ \ \
| * \ \ \ \ Merge branch 'wheezy' into debian_feature-uefidebian/3.11.6-30+wheezy1+feature.uefi.1Tails developers2014-04-072-3/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'debian' into debian_feature-uefidebian/3.11.6-30+feature.uefi.1Tails developers2014-03-2450-3991/+11468
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'debian' into debian_feature-uefiTails developers2014-02-271-11/+19
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'feature/uefi' into debian_feature-uefiTails developers2014-02-2751-605/+1062
| |\ \ \ \ \ \ \ \
| * | | | | | | | | liveusb-creator (3.11.6-25+feature.uefi.4.git83b85bb)debian/3.11.6-25+feature.uefi.4.git83b85bbTails developers2013-12-211-0/+7
| * | | | | | | | | Merge branch 'feature/uefi' into debian_feature-uefiTails developers2013-12-211-1/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | liveusb-creator (3.11.6-25+feature.uefi.3.gitf60c886)debian/3.11.6-25+feature.uefi.3.gitf60c886Tails developers2013-12-211-0/+6
| * | | | | | | | | | Merge branch 'feature/uefi' into debian_feature-uefiTails developers2013-12-211-0/+2
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | liveusb-creator (3.11.6-25+feature.uefi.2.git3ff95a0)debian/3.11.6-25+feature.uefi.2.git3ff95a0Tails developers2013-12-211-0/+6
| * | | | | | | | | | | Merge branch 'feature/uefi' into debian_feature-uefiTails developers2013-12-211-1/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | liveusb-creator (3.11.6-25+feature.uefi.1.gitf1c3fe8)debian/3.11.6-25+feature.uefi.1.gitf1c3fe8Tails developers2013-12-211-0/+6
| * | | | | | | | | | | | Merge branch 'feature/uefi' into debian_feature-uefiTails developers2013-12-211-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | liveusb-creator (3.11.6+tails1-4)debian/3.11.6+tails1-4Tails developers2014-05-281-0/+16
* | | | | | | | | | | | | | Merge branch 'master' into debianTails developers2014-05-2850-4563/+4755
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Import PO files from Transifex, update POT and PO files.Tails developers2014-05-2848-4538/+4719
| * | | | | | | | | | | | | Clarify variable name and info message.feature/6577-convert-to-UEFITails developers2014-05-261-4/+4
| * | | | | | | | | | | | | Pass a parent device (e.g. /dev/sdb) instead of a partition (e.g. /dev/sdb1) ...Tails developers2014-05-261-2/+2
| * | | | | | | | | | | | | Update comment to match current state of our knowledge.Tails developers2014-05-261-2/+2
| * | | | | | | | | | | | | Pass the device to modify to _set_partition_flags.Tails developers2014-05-261-5/+5