summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* liveusb-creator (3.11.6+tails1-20+feature.9672.rework.installer.wording.on.wh...debian_feature/9672-rework-installer-wording-on-wheezyintrigeri2015-10-031-0/+13
* Merge branch 'feature/9672-rework-installer-wording-on-wheezy' into debian_fe...intrigeri2015-10-033-15/+7
|\
| * Run make gui.feature/9672-rework-installer-wording-on-wheezyintrigeri2015-10-033-15/+7
* | Merge remote-tracking branch '451f/master_wording' into debian_feature/9672-r...intrigeri2015-10-032-14/+18
|\ \ | |/
| * Update wording for tails/wheezy.Ulrike Uhlig2015-10-031-9/+9
| * Merge remote-tracking branch 'installer/master' into master_wordingUlrike Uhlig2015-10-0259-5301/+6523
| |\
| | * Merge remote-tracking branch 'origin/master'intrigeri2015-09-160-0/+0
| | |\
| | | * Update on the french translationDebian Live user2015-09-161-7/+8
| | * | [fr] Revert translation of "Clone & Install".intrigeri2015-09-161-2/+5
| | * | Update on the french translationDebian Live user2015-09-161-7/+8
| | |/
* | | Merge branch 'tails/wheezy' into debian_feature/9672-rework-installer-wording...intrigeri2015-10-0360-5307/+6465
|\ \ \
| * | | Adjust gbp.conf to match new Git repository layout and tag names.intrigeri2015-10-021-1/+2
| * | | Update gbp configuration to match new branch name.intrigeri2015-10-021-1/+1
| * | | liveusb-creator (3.11.6+tails1-20)debian/3.11.6+tails1-20anonym2015-08-101-0/+6
| * | | Merge branch 'master' into debiananonym2015-08-1052-265/+162
| |\ \ \ | | | |/ | | |/|
| | * | Import PO files from Transifex.anonym2015-08-1052-265/+162
| * | | liveusb-creator (3.11.6+tails1-19)debian/3.11.6+tails1-19intrigeri2015-08-041-0/+1
| * | | Merge branch 'master' into debianintrigeri2015-08-0452-5235/+6395
| |\ \ \ | | |/ /
| | * | Import PO files from Transifex.intrigeri2015-08-0452-5235/+6395
| * | | Update debian/changelog.intrigeri2015-08-041-0/+15
| * | | Merge branch 'master' into debianintrigeri2015-08-044-17/+70
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'kurono/Bug/9886-installer-should-not-raise-exce...intrigeri2015-08-040-0/+0
| | |\ \
| | | * | Bug/9886 remove exception on small deviceTails developers2015-08-031-1/+0
| | * | | Merge branch 'feature/5623-Installer-should-refuse-empty-device' (Closes: Tai...intrigeri2015-08-044-7/+51
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Feature #5623: small change to message.Tails developers2015-08-031-1/+1
| | | * | Feature #5623: fix merge conflicts.Tails developers2015-08-031-1/+1
| | | * | Merge branch 'master' into feature/5623-Installer-should-refuse-empty-deviceTails developers2015-08-032-13/+37
| | | |\ \
| | | | * \ fix merge conflicts.Tails developers2015-07-314-6/+52
| | | | |\ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'origin/bugfix/9349-safer-error-logging'anonym2015-07-242-10/+19
| | |\ \ \ \
| | | * | | | Delete the log file on exit, if it's empty.bugfix/9349-safer-error-loggingintrigeri2015-07-132-1/+8
| | | * | | | Merge branch 'master' into bugfix/9349-safer-error-loggingintrigeri2015-07-1356-973/+355
| | | |\ \ \ \
| | | * | | | | Don't use a predictable file name for the subprocess error log (Closes: Tails...intrigeri2015-06-051-9/+11
| | | | | * | | Feature 5623: remove not nedeed exception.feature/5623-Installer-should-refuse-empty-deviceTails developers2015-07-211-2/+0
| | | | | * | | Feature 5623: remove false - usb found message -Tails developers2015-07-131-2/+0
| | | | | |/ /
| | | | | * | Merge branch 'master' into feature/5623-Installer-should-refuse-empty-deviceintrigeri2015-07-0956-973/+355
| | | | | |\ \ | | | | | |/ / | | | | |/| |
| | | | | * | Make some newly introduced strings translatable.intrigeri2015-07-091-2/+2
| | | | | * | Slightly rephrase advice to user.intrigeri2015-07-091-2/+2
| | | | | * | Fix typo.intrigeri2015-07-091-1/+1
| | | | | * | Feature 5623: exclude devices without a tails installation.Tails developers2015-07-071-22/+20
| | | | | * | Rename device_can_upgrade method to device_can_be_upgraded, which expresses i...intrigeri2015-07-032-2/+2
| | | | | * | Feature 5623: improve the running from tails check.Tails developers2015-06-242-7/+10
| | | | | * | Feature 5623: Add function to check if we run on Tails currentlyTails developers2015-06-233-1/+17
| | | | | * | Feature 5623: rewrite the alert message.Tails developers2015-06-221-7/+4
| | | | | * | feature/5623: include iso9660 and console mode error.Tails developers2015-06-162-6/+11
| | | | | * | Feature 5623: change warning message.Tails developers2015-05-121-3/+3
| | | | | * | Feature 5623: create new function to check device upgrade.Tails developers2015-05-062-2/+16
| | | | | * | Feature 5623: Installer should refuse empty deviceTails developers2015-05-052-4/+19
| | | | |/ / | | | |/| |
| * | | | | liveusb-creator (3.11.6+tails1-18+feature.9130.tails.installer.notify.on.smal...debian_feature/9130-tails-installer-notify-on-smal-deviceintrigeri2015-07-091-0/+18
| * | | | | Merge branch 'feature/9130-tails-installer-notify-on-smal-device' into debian...intrigeri2015-07-092-7/+22
| |\ \ \ \ \ | | |/ / / /
| | * | | | Feature 9130: fix the exception.Tails developers2015-07-071-0/+1