summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Rakefile: warn if vagrant isn't 1.4.3feature/11125-rakefile-detect-vagrant-versionAustin English2016-02-161-0/+6
* Revert "Revert "Add dummy changelog entry.""bertagaz2016-02-131-0/+6
* Merge branch 'stable' into develbertagaz2016-02-138-44/+44
|\
| * Merge remote-tracking branch 'origin/master' into stablebertagaz2016-02-1318-390/+503
| |\
| | * updated PO filesamnesia2016-02-134-36/+36
| | * Merge branch 'master' of ssh://webmasters.boum.org//home/webmasters/boum.org/...amnesia2016-02-131-1/+1
| | |\
| | * \ Merge branch 'master' of ssh://webmasters.boum.org//home/webmasters/boum.org/...amnesia2016-02-131-2/+5
| | |\ \
| | * | | updated PO filesamnesia2016-02-134-8/+8
* | | | | Merge remote-tracking branch 'origin/master' into develbertagaz2016-02-132-3/+6
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'origin/stable'bertagaz2016-02-131-1/+1
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Fix wrong release notes include.bertagaz2016-02-131-1/+1
| * | | Merge remote-tracking branch 'origin/master'intrigeri2016-02-13173-923/+1717
| |\ \ \ | | | |/ | | |/|
| * | | Mirror pool: mention WIP discussion.intrigeri2016-02-131-2/+5
* | | | Merge remote-tracking branch 'origin/master' into develbertagaz2016-02-1368-550/+1632
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/stable'bertagaz2016-02-13173-923/+1717
| |\ \ \ | | |/ / | |/| / | | |/
| | * Releasing version 2.0.1.bertagaz2016-02-1315-0/+892
| | * Import files from the 2.0.1 releasebertagaz2016-02-139-84/+39
| | * Test suite: bump timeout when waiting for Tor Browser print dialog.intrigeri2016-02-131-1/+1
| | * Test suite: bump timeout for "I see shared client tunnels in the I2P router c...intrigeri2016-02-131-1/+1
| | * Add signed 2.0.1 torrent.intrigeri2016-02-122-0/+16
| | * Update IDF file for DAVE.anonym2016-02-121-3/+3
| | * Update upgrade-description files.anonym2016-02-126-13/+70
| | * Merge remote-tracking branch 'origin/feature/11105-tor-browser-5.5.2' into st...anonym2016-02-123-19/+19
| | |\
| | | * Fix indentation.anonym2016-02-121-1/+1
| | | * Let's only copy the new tarballs.anonym2016-02-121-1/+1
| | | * Upgrade Tor Browser to 5.5.2.anonym2016-02-122-17/+17
| | * | Update website PO files.bertagaz2016-02-126-55/+62
| | * | Update version and date for 2.0.1.bertagaz2016-02-1212-17/+17
| | * | Merge remote-tracking branch 'origin/master' into stableintrigeri2016-02-121-11/+11
| | |\ \
| | * | | Update changelog for 2.0.1.intrigeri2016-02-121-3/+48
| * | | | Release process: move HTML anchor to the beginning of the section it's about.intrigeri2016-02-131-2/+2
| * | | | Merge remote-tracking branch 'muri/review-de_printing'intrigeri2016-02-131-10/+32
| |\ \ \ \
| | * | | | reviewed the initial translation and made small changesMuri Nicanor2016-02-121-7/+7
| | * | | | Merge remote-tracking branch 'spriver/de_printing' into review-de_printingMuri Nicanor2016-02-121-10/+32
| | |\ \ \ \
| | | * | | | Initial translationspriver2016-02-081-10/+32
| * | | | | | Update the jenkins-tools submodule: adjust check_po for newer i18nspector.intrigeri2016-02-131-0/+0
| * | | | | | Initial draft of the new mirror pool data model.intrigeri2016-02-121-10/+60
| * | | | | | TODO++intrigeri2016-02-121-0/+2
| * | | | | | TODO++intrigeri2016-02-121-0/+3
| |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/master'intrigeri2016-02-124-14/+45
| |\ \ \ \ \
| | * | | | | Updating trace file after uploading 2.0.1.anonym2016-02-121-1/+1
| | * | | | | Add an upgrade path to 2.0.1 on the 2.0 alpha channel.anonym2016-02-122-13/+28
| | * | | | | Add Vagrant instructions with too new Virtualbox.anonym2016-02-121-0/+16
| | | |_|/ / | | |/| | |
| * | | | | Add missing release process step.intrigeri2016-02-121-0/+1
| * | | | | Move initial research to a dedicated page.intrigeri2016-02-122-308/+309
| |/ / / /
| * | | | Fix Markdown formatting.intrigeri2016-02-121-11/+11
* | | | | Merge remote-tracking branch 'hybridwipe/feature/11108-improve-rakefile' into...anonym2016-02-121-6/+9
|\ \ \ \ \
| * | | | | 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 'origin/devel' into develintrigeri2016-02-121-0/+32
|\ \ \ \ \ \