summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* WIP: Set to enforce mode a few AppArmor profiles that are shipped in complain...feature/9764-enforce-more-apparmor-profilesintrigeri2015-07-192-0/+18
* Merge remote-tracking branch 'origin/devel' into bugfix/8007-AppArmor-hardeningintrigeri2015-07-1819-111/+152
|\
| * Merge branch 'feature/9130-tails-installer-notify-on-smal-device' into develintrigeri2015-07-184-16/+6
| |\
| | * Test suite: adjust too small device test, the installer now provide feedback ...intrigeri2015-07-103-16/+6
| | * Add the feature-9130-tails-installer-notify-on-smal-device APT overlay.intrigeri2015-07-091-0/+0
| * | Merge branch 'stable' into develintrigeri2015-07-1814-95/+141
| |\ \
| | * \ Merge branch 'master' into stableintrigeri2015-07-1814-95/+141
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/feature/9567-move-check_po-to-jenkins-to...intrigeri2015-07-186-63/+15
| | | |\ \
| | | | * | Adjust documentation for translators and RMs wrt. the new location of check_po.intrigeri2015-06-122-1/+7
| | | | * | Test suite: use check_po from its new canonical location.intrigeri2015-06-121-2/+2
| | | | * | Test suite: rename Given step to Then, that's how we use it.intrigeri2015-06-121-1/+1
| | | | * | Test suite: move initialization to the Given step, and the sanity check to wh...intrigeri2015-06-121-2/+2
| | | | * | Replace check_po.sh with a symlink pointing to the same script in the jenkins...intrigeri2015-06-121-58/+1
| | | | * | Add the jenkins-tools repository as a Git submodule.intrigeri2015-06-122-0/+3
| | | * | | (no commit message)127.0.0.12015-07-161-3/+3
| | | * | | Merge remote-tracking branch 'origin/master'intrigeri2015-07-161-0/+34
| | | |\ \ \
| | | | * | | list of translation "work in progress"127.0.0.12015-07-161-0/+24
| | | | * | | (no commit message)127.0.0.12015-07-151-0/+3
| | | | * | | (no commit message)127.0.0.12015-07-151-1/+4
| | | | * | | (no commit message)127.0.0.12015-07-151-0/+3
| | | | * | | (no commit message)127.0.0.12015-07-151-1/+1
| | | | * | | (no commit message)127.0.0.12015-07-151-0/+1
| | | * | | | Merge remote-tracking branch 'muri/muri-t10n/review-de_start_tails'intrigeri2015-07-161-24/+42
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | reviewed sprivers translation and made some small modificationsMuri Nicanor2015-06-161-9/+20
| | | | * | | Updated the start_tails pagespriver2015-06-071-22/+29
| | | | * | | Merge branch 'master' of https://git-tails.immerda.ch/tailsspriver2015-06-0749-481/+1168
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'master' of https://git-tails.immerda.ch/tailsspriver2015-05-3019-38/+669
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'master' of https://git-tails.immerda.ch/tailsTails developers2015-05-272-24/+102
| | | | |\ \ \ \ \
| | | * | | | | | | Add empty blueprint.intrigeri2015-07-151-0/+0
| | | * | | | | | | Add resources wrt. sub-modules & alternatives.intrigeri2015-07-141-0/+6
| | | * | | | | | | June report: add infra bits.intrigeri2015-07-131-2/+4
| | | * | | | | | | Merge branch 'doc/no-more-review-n-merge-email'intrigeri2015-07-134-6/+40
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Merge policy: make email to -dev@ optional.intrigeri2015-07-012-3/+3
| | | | * | | | | | | Point new code contributors to the review'n'merge tracking documentation.intrigeri2015-07-011-3/+7
| | | | * | | | | | | Document how to track review'n'merge requests with Redmine's Atom feeds.intrigeri2015-07-011-0/+30
| * | | | | | | | | | Simplify check for running Tor Browser, and add missing quotes.intrigeri2015-07-181-1/+1
| * | | | | | | | | | tor-browser: skip warning dialog if browser is already runningAustin English2015-07-181-0/+5
* | | | | | | | | | | Merge remote-tracking branch 'origin/devel' into bugfix/8007-AppArmor-hardeningintrigeri2015-07-171-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'feature/9513-OTR-v3' into develbertagaz2015-07-171-0/+8
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'devel' into feature/9513-OTR-v3bertagaz2015-07-17345-7869/+17639
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Install libotr5 and pidgin-otr 4.x from wheezy-backports: suport the OTRv3 pr...intrigeri2015-06-111-0/+8
* | | | | | | | | | | | Merge branch 'devel' into bugfix/8007-AppArmor-hardeningintrigeri2015-07-1699-559/+1683
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge remote-tracking branch 'kytv/test/9715-wget' into develintrigeri2015-07-161-3/+21
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Retry wget in the test suite on transient failurekytv2015-07-131-3/+21
| * | | | | | | | | | | | Merge branch 'bugfix/9558-deny-tmp-to-tor-browser' into develbertagaz2015-07-153-2/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'devel' into bugfix/9558-deny-tmp-to-tor-browserintrigeri2015-07-1380-489/+957
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'kytv/test/9668-whois' into develintrigeri2015-07-134-27/+49
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Revert "Use execute_successfully and combine steps"kytv2015-07-122-10/+24
| | * | | | | | | | | | | | Raise WhoisLookupFailure for LIMIT EXCEEDEDkytv2015-07-121-5/+6
| | * | | | | | | | | | | | Move code from the 'force tor circuit' step to its related functionkytv2015-07-121-5/+7