summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable' into test/9516-tor-bootstraptest/9516-tor-bootstrapbertagaz2015-09-045-27/+5
|\
| * Merge branch 'feature/9597-jenkins-share-artifacts-between-jobs' into stablebertagaz2015-09-042-17/+3
| |\
| | * Remove sourcing of ENV_FILE when building in jenkins.bertagaz2015-09-041-6/+0
| | * Merge branch 'stable' into feature/9597-jenkins-share-artifacts-between-jobsbertagaz2015-09-03635-11290/+40842
| | |\ | | |/ | |/|
| * | Merge remote-tracking branch 'kytv/test/9890-udev-watchdog-from-usb' into stableanonym2015-09-022-1/+2
| |\ \
| | * | Remove step from manual test suite; it's been automatedkytv2015-08-041-1/+0
| | * | Test that udev-watchdog is monitoring the correct device when booted from USBkytv2015-08-041-0/+2
| * | | Merge remote-tracking branch 'kytv/test/9877-remove-unused-step' into stableanonym2015-09-021-9/+0
| |\ \ \
| | * | | Remove unused 'gksu' stepkytv2015-08-041-9/+0
| | |/ /
| | | * build-tails: remove unnecessary test.bertagaz2015-09-011-1/+1
| | | * Store artifacts in a subdirectory of $WORKSPACE in Jenkins.bertagaz2015-09-012-2/+5
| | | * Remove the latest link step in the Jenkins build process.bertagaz2015-06-221-6/+0
| | | * Set ARTIFACTS_DIR=$WORKSPACE when building in Jenkins.bertagaz2015-06-221-7/+2
* | | | WIPanonym2015-09-012-6/+2
* | | | Log Tor's bootstrapping status to syslog.anonym2015-09-011-0/+6
* | | | Fix indentation.anonym2015-09-011-23/+23
* | | | Fix indentation.anonym2015-09-011-16/+16
* | | | Merge remote-tracking branch 'origin/stable' into test/9516-tor-bootstrapanonym2015-08-31257-2183/+12976
|\ \ \ \ | |/ / /
| * | | Add dummy changelog entry.anonym2015-08-281-0/+6
| * | | Actually the Vietnamese fonts have looked the same for a long time.anonym2015-08-284-8/+7
| * | | Add known issue for Tails 1.5.1.anonym2015-08-284-24/+43
| * | | [fr] Translate 1.5.1 release date.intrigeri2015-08-281-2/+2
| * | | Merge remote-tracking branch 'origin/stable' into stableintrigeri2015-08-2888-1094/+3289
| |\ \ \
| | * | | Unite duplicate sections.anonym2015-08-281-6/+4
| | * | | releasing version 1.5.1anonym2015-08-2810-55/+40
| | * | | Update upgrade-description files.anonym2015-08-2810-13/+112
| | * | | Add release notes and security notice for Tails 1.5.1.1.5.1anonym2015-08-2812-0/+621
| | * | | Update website PO files.anonym2015-08-282-29/+2
| | * | | Update version and date for 1.5.1.anonym2015-08-2811-16/+16
| | * | | Update changelog for 1.5.1.anonym2015-08-281-3/+14
| | * | | Update PO files.anonym2015-08-2842-135/+767
| | * | | Update AdBlock Plus patterns.anonym2015-08-281-821/+1739
| | * | | Merge remote-tracking branch 'origin/master' into stableanonym2015-08-28151-1155/+8007
| | |\ \ \
| | * \ \ \ Merge branch 'feature/10112-tor-browser-5.0.2' into stableanonym2015-08-282-16/+16
| | |\ \ \ \
| | | * | | | Upgrade Tor Browser to 5.0.2.anonym2015-08-282-16/+16
| | |/ / / /
| * | | | | Merge remote-tracking branch 'origin/master' into stableintrigeri2015-08-28158-1169/+8078
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add empty UDF for 1.5.1.anonym2015-08-284-0/+42
| | * | | | Publish the upgrade to 1.5.1 on the alpha channel.anonym2015-08-282-13/+28
| | * | | | Updating trace file after uploading 1.5.1.anonym2015-08-281-1/+1
| | |/ / /
| | * | | updated PO filesamnesia2015-08-273-7/+16
| | * | | Merge remote-tracking branch 'mercedes/doc/manual-installation-mac'sajolida2015-08-271-1/+1
| | |\ \ \
| | | * | | Fixing Mac manual installation instructionsTails developers2015-08-161-1/+1
| | * | | | Allow local connections to Mumble serversajolida2015-08-261-0/+4
| | * | | | Add one more idea.intrigeri2015-08-261-0/+7
| | * | | | updated PO filesamnesia2015-08-266-193/+244
| | * | | | Merge branch 'doc/9391-circuitview' (Closes: #9391)sajolida2015-08-262-23/+35
| | |\ \ \ \
| | | * | | | Improve grammar (#9391)sajolida2015-08-261-2/+2
| | | * | | | Merge remote-tracking branch 'origin/master' into doc/9391-circuitviewintrigeri2015-08-2517-147/+453
| | | |\ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'origin/master' into doc/9391-circuitviewintrigeri2015-08-215-7/+20
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into doc/9391-circuitviewsajolida2015-08-20314-6779/+20872
| | | |\ \ \ \ \ \