summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into feature/6354-vagrant-libvirtfeature/6354-vagrant-libvirt_oldintrigeri2015-08-212-5/+7
|\
| * Refresh Tor Browser AppArmor profile patch.intrigeri2015-08-191-4/+6
| * Restore stable's base branch.bertagaz2015-08-121-1/+1
* | WIP, untested: migrate to vagrant-libvirt.intrigeri2015-08-134-23/+58
|/
* Add dummy changelog entry.anonym2015-08-111-0/+6
* Merge remote-tracking branch 'origin/master' into stableanonym2015-08-11318-6498/+17638
|\
| * Merge remote-tracking branch 'origin/testing'anonym2015-08-11212-6074/+12246
| |\
| | * releasing version 1.5anonym2015-08-1112-0/+1024
| | * Fix some typos.anonym2015-08-111-2/+2
| | * Fix Linux version in Tails 1.5 changelog.anonym2015-08-111-1/+1
| | * Set the correct release date for Tails 1.5.anonym2015-08-114-7/+7
| | * Update hash, torrent, .packages etc. for Tails 1.5.anonym2015-08-109-74/+87
| | * Update upgrade-description files.anonym2015-08-1020-26/+224
| | * Updating SquashFS sort file1.5anonym2015-08-101-4304/+3863
| | * Update website PO files.anonym2015-08-109-43/+75
| | * Update version and date for 1.5.anonym2015-08-1014-22/+28
| | * Merge remote-tracking branch 'origin/master' into testinganonym2015-08-1060-143/+1905
| | |\
| | * | Update changelog for 1.5.anonym2015-08-101-3/+10
| | * | Merge remote-tracking branch 'origin/feature/8548-tor-browser-5.0' into testinganonym2015-08-1028-36/+17
| | |\ \
| | | * | Revert test suite adaptiations to the Tor Browser 5.0a4 fonts.anonym2015-08-1025-19/+0
| | | * | Merge remote-tracking branch 'origin/testing' into feature/8548-tor-browser-5.0anonym2015-08-10122-1403/+6715
| | | |\ \
| | | * | | Upgrade Tor Browser to 5.0.anonym2015-08-102-16/+16
| | | * | | Fix typo.anonym2015-08-101-1/+1
| | * | | | Update PO files.anonym2015-08-1041-197/+211
| | * | | | Update AdBlock Plus patterns.anonym2015-08-101-229/+650
| | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'origin/feature/9955-localize-wikipedia-searchpl...anonym2015-08-103-6/+56
| | |\ \ \
| | | * | | Fix permissions of some more generated search plugins.anonym2015-08-091-1/+3
| | | * | | Let's fix the permissions last of all.anonym2015-08-091-3/+3
| | | * | | Separate block, and simplify.anonym2015-08-091-2/+2
| | | * | | Exclude timestamp in generated Wikipedia icons.anonym2015-08-091-0/+1
| | | * | | Fix typo.anonym2015-08-091-1/+1
| | | * | | Fix typoanonym2015-08-081-5/+5
| | | * | | Generate localized Wikipedia search engine plugins.anonym2015-08-083-1/+48
| | |/ / /
| | * | | Test suite: bump timeout.intrigeri2015-08-081-1/+1
| | * | | Merge remote-tracking branch 'origin/bugfix/9924-apparmor-has-denied-step-is-...intrigeri2015-08-085-34/+42
| | |\ \ \
| | | * | | Disable printk rate limiting when monitoring the AppArmor log.anonym2015-08-081-0/+3
| | | * | | Rework how we test AppArmor denials.anonym2015-08-085-34/+39
| | * | | | Merge remote-tracking branch 'origin/bugfix/9901-bump-vagrant-ram-for-ram-bui...intrigeri2015-08-081-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Bump amount of RAM needed for Vagrant RAM builds.anonym2015-08-081-1/+1
| | |/ / /
| | * | | Test suite: bump memory allocated to the system under test to 2 GB.intrigeri2015-08-061-2/+2
| | * | | Bump memory requirements for smooth operation to 2 GB.intrigeri2015-08-061-1/+1
| | * | | Test suite: bump timeout for waiting for Tor Launcher.intrigeri2015-08-061-1/+1
| | * | | changelog: mark 1.5~rc1 as released.intrigeri2015-08-061-1/+1
| | * | | Clean up the changelog a bit.intrigeri2015-08-061-3/+1
| | * | | Update changelog again wrt. newly merged branches.1.5-rc1intrigeri2015-08-051-1/+33
| | * | | Update PO files.intrigeri2015-08-0541-296/+965
| | * | | Restore testing's base branch.intrigeri2015-08-051-1/+1
| | * | | Merge branch 'devel' into testingintrigeri2015-08-0525-871/+3653
| | |\ \ \
| | | * | | Empty the list of APT overlays: they were mergedintrigeri2015-08-055-0/+0
| | | * | | Fix more erroneous comments.intrigeri2015-08-052-6/+6