summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rakefile: print git status when there are uncommitted changesfeature/11108-improve-rakefileAustin English2016-02-121-3/+6
* Rakefile: fix typoAustin English2016-02-121-3/+3
* Merge remote-tracking branch 'muri/muri-t10n/review-de_offline_mode' into develsajolida2015-10-281-8/+18
|\
| * undid a change of a msgidMuri Nicanor2015-10-271-4/+5
| * Merge remote-tracking branch 'spriver/de_offline_mode' into review-de_offline...Muri Nicanor2015-10-271-13/+22
| |\
| | * Initial translationspriver2015-10-271-13/+22
* | | Merge remote-tracking branch 'origin/test/10345-run-vnc-server-forever' into ...intrigeri2015-10-271-1/+1
|\ \ \
| * \ \ Merge branch 'devel' into test/10345-run-vnc-server-foreveranonym2015-10-21151-2450/+3499
| |\ \ \
| * | | | Run the automated test suite's vnc server forever.anonym2015-10-071-1/+1
* | | | | Merge branch 'testing' into develintrigeri2015-10-272-11/+8
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/test/10208-clean-up-deps' into testingintrigeri2015-10-272-11/+8
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge remote-tracking branch 'origin/devel' into test/10208-clean-up-depsanonym2015-10-226-5/+14
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge remote-tracking branch 'origin/devel' into test/10208-clean-up-depsanonym2015-10-2274-947/+2106
| | |\ \ \ \
| | * | | | | Sort and re-split lines.anonym2015-10-171-8/+8
| | * | | | | x11-apps is not needed by the automated test suite.anonym2015-10-172-2/+1
| | * | | | | radvd is not needed by the automated test suite.anonym2015-10-172-2/+1
| | * | | | | libxslt1-dev is not needed by the automated test suite.anonym2015-10-172-2/+1
* | | | | | | Restore devel's base branch.anonym2015-10-271-1/+1
|/ / / / / /
* | | | | | Merge branch 'stable' into testinganonym2015-10-2711-23/+877
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into stableanonym2015-10-2728-130/+1843
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'web/test_1.7-rc1'anonym2015-10-274-0/+836
| | |\ \ \ \ \
| | | * | | | | Remove reference to #9672 in 1.7~rc1 announcement.anonym2015-10-274-49/+29
| | | * | | | | Review & fixes for tails 1.7~rc1 teste announcemercedes5082015-10-271-10/+9
| | | * | | | | [fr] translation of wiki/src/news/test_1.7-rc1.fr.poelouann2015-10-271-31/+92
| | | * | | | | typoelouann2015-10-271-1/+1
| | | * | | | | Merge branch 'web/test_1.7-rc1' of https://git-tails.immerda.ch/tails into we...elouann2015-10-274-0/+796
| | | |\ \ \ \ \
| | | | * | | | | Add draft of CfT for Tails 1.7~rc1.anonym2015-10-274-0/+796
| | | * | | | | | Merge branch 'master' of https://git-tails.immerda.ch/tailselouann2015-10-274-14/+45
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of https://git-tails.immerda.ch/tailselouann2015-10-263-15/+460
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of https://git-tails.immerda.ch/tailselouann2015-10-263-5/+7
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of https://git-tails.immerda.ch/tailselouann2015-10-25354-9799/+18644
| | | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | + metrics127.0.0.12015-10-271-2/+2
| | * | | | | | | | | | | Merge remote-tracking branch 'spriver/de_support'sajolida2015-10-273-19/+21
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Unfuzzied strings and translated inlinespriver2015-10-233-19/+21
| | * | | | | | | | | | | | Merge remote-tracking branch 'origin/master'intrigeri2015-10-274-14/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Add signature of the Tails 1.7~rc1 ISO image.anonym2015-10-271-0/+16
| | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Fix typos.intrigeri2015-10-272-2/+2
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'bugfix/firmware-nonfree-20151018-2' into stableanonym2015-10-2174-941/+2106
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Remove pre-#6094 leftovers.anonym2015-10-271-5/+0
* | | | | | | | | | | | | Fix typo.anonym2015-10-271-1/+1
* | | | | | | | | | | | | Improve gherkin.anonym2015-10-271-1/+1
* | | | | | | | | | | | | Improve gherkin.anonym2015-10-271-1/+1
* | | | | | | | | | | | | Improve gherkin.anonym2015-10-271-1/+1
* | | | | | | | | | | | | Fix manual test.anonym2015-10-271-1/+1
* | | | | | | | | | | | | fix typos in debian/changelogelouann2015-10-271-2/+2
* | | | | | | | | | | | | Update changelog.anonym2015-10-271-1/+0
* | | | | | | | | | | | | Revert "Update test suite images wrt. reworded Installer for Wheezy."anonym2015-10-273-0/+0
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into testinganonym2015-10-273-14/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Updating trace file after uploading 1.7~rc1.anonym2015-10-271-1/+1
| * | | | | | | | | | | | Update upgrade-description files.anonym2015-10-272-13/+28
| | |_|/ / / / / / / / / | |/| | | | | | | | | |