summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* WIPtest/7066-run-tbb-testsintrigeri2015-05-223-1/+84
* Merge remote-tracking branch 'origin/feature/8617-delete-obsolete-Git-branche...anonym2015-05-166-0/+106
|\
| * Add some documentation and pointers about Git submodules.intrigeri2015-05-111-0/+25
| * Mention the need to init+update submodules after cloning the main Git repo.intrigeri2015-05-111-0/+4
| * Merge branch 'testing' into feature/8617-delete-obsolete-Git-branchesintrigeri2015-05-04310-10933/+14816
| |\
| * | delete-merged-git-branches: drop buggy default value for --repo.intrigeri2015-04-291-1/+0
| * | Document how to delete merged Git branches as a post-release step.intrigeri2015-04-291-0/+11
| * | Merge branch 'devel' into feature/8617-delete-obsolete-Git-branchesintrigeri2015-04-2921-92/+132
| |\ \
| * | | Document that people with the commit bit must configure Git to use SSH when f...intrigeri2015-04-161-0/+7
| * | | Replace git-delete-branch with a new Python 3 implementation.intrigeri2015-04-162-80/+56
| * | | Add a symlink from lib/python3/tailslib to the corresponding submodule's chec...intrigeri2015-04-161-0/+1
| * | | Add our Python library as a Git submodule.intrigeri2015-04-162-0/+3
| * | | Merge branch 'devel' into feature/8617-delete-obsolete-Git-branchesintrigeri2015-04-16539-13739/+24042
| |\ \ \
| * | | | Sort branches to keep in a more meaningful order.Tails developers2015-02-241-1/+1
| * | | | Add the stable branch to the list of those that shall not be deleted.Tails developers2015-02-241-1/+1
| * | | | Make development easier by allowing to run the script from its own branch.Tails developers2015-02-241-2/+3
| * | | | Take into account the asterisk that highlights the checked-out local branch.Tails developers2015-02-241-2/+2
| * | | | Drop useless .sh extension.Tails developers2015-02-241-0/+0
| * | | | Make script executable.Tails developers2015-02-241-0/+0
| * | | | Merge remote-tracking branch 'origin/master' into feature/8617-delete-obsolet...Tails developers2015-02-24369-11001/+19716
| |\ \ \ \
| * | | | | Make some user-visible messages a bit clearer.Tails developers2015-02-241-2/+2
| * | | | | Delete up to 30 branches at a time on the remote.Tails developers2015-02-241-1/+3
| * | | | | Make regexps a bit stricter.Tails developers2015-02-241-5/+5
| * | | | | Only support one managed remote.Tails developers2015-02-241-7/+7
| * | | | | Ask for per-branch deletion confirmation.Tails developers2015-02-241-1/+7
| * | | | | Use a default remote name that's more plausible for RMs.Tails developers2015-02-241-1/+1
| * | | | | added script to delete obsolete branchesTails developers2015-02-241-0/+71
* | | | | | Clarify when the release announcement is sent to amnesia-news@.anonym2015-05-151-3/+3
* | | | | | Merge remote-tracking branch 'origin/test/9377-clock-sanity-check' into stableintrigeri2015-05-154-14/+46
|\ \ \ \ \ \
| * | | | | | Remove the impossible "Clock way in the past" scenarios.anonym2015-05-121-14/+0
| * | | | | | Test the system clock sanity check we do at boot.anonym2015-05-123-0/+33
| * | | | | | Make it possible to set the hardware clock.anonym2015-05-121-0/+13
* | | | | | | Restore stable's base branch.anonym2015-05-131-1/+1
* | | | | | | Add dummy changelog entry for Tails 1.4.1.anonym2015-05-121-0/+6
* | | | | | | Merge remote-tracking branch 'origin/master' into testinganonym2015-05-1220-43/+197
|\ \ \ \ \ \ \
| * | | | | | | Fix an incomplete sentence in blueprint.intrigeri2015-05-121-1/+1
| * | | | | | | Yay for GRUB2's syslinux configuration support.intrigeri2015-05-121-1/+2
| * | | | | | | Add alpha channel incremental upgrade path from 1.3.2 to 1.4.anonym2015-05-122-21/+21
| * | | | | | | Updating trace file after uploading 1.4.anonym2015-05-111-1/+1
| * | | | | | | Add alpha channel incremental upgrade path from 1.4~rc1 to 1.4.anonym2015-05-112-13/+28
| * | | | | | | updated PO filesamnesia2015-05-116-6/+96
| * | | | | | | Merge branch 'doc/9336-keyboard_bug' (Closes: #9336)sajolida2015-05-112-0/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Rewrite known issue (#9336)sajolida2015-05-112-7/+9
| | * | | | | | | Make anchor consistent with the otherssajolida2015-05-111-1/+1
| | * | | | | | | add the keyboard layout workaround to the known issues (#9336)BitingBird2015-05-051-0/+10
| * | | | | | | | updated PO filesamnesia2015-05-113-3/+30
| * | | | | | | | Merge branch 'doc/DownloadBrowserLimit' (Closes: #9226)sajolida2015-05-111-0/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Be affirmative instead of negative (#9226)sajolida2015-05-111-5/+4
| | * | | | | | | | We need HTML markup inside of <div>sajolida2015-05-111-2/+2
| | * | | | | | | | Revert "formatting (nothing else) (#9226)"sajolida2015-05-111-43/+34