summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use if/end instead of Ruby 'and'feature/xxxx-check-vagrant-versionAustin English2016-05-241-2/+3
* fixups from anonym reviewAustin English2016-05-241-6/+7
* move kvm module check to vm:upAustin English2016-05-241-3/+3
* Rakefile: also check that kvm module is loadedAustin English2016-05-241-0/+3
* Rakefile: check that vagrant >= 1.8Austin English2016-05-241-0/+7
* Merge remote-tracking branch 'origin/devel' into develintrigeri2016-05-242-1/+8
|\
| * Merge remote-tracking branch 'hybridwipe/feature/11420-verify-libdvdcss' into...anonym2016-05-241-0/+7
| |\
| | * libdvd-css should not be checkedfeature/11420-verify-libdvdcssAustin English2016-05-221-1/+1
| | * config/chroot_local-hooks/59-libdvd-pkg: verify libdvdcss package installationAustin English2016-05-221-0/+7
| * | Merge remote-tracking branch 'origin/feature/11443-onioncircuits-0.4' into develanonym2016-05-241-1/+1
| |\ \
| | * | Install onioncircuits from jessie-backports.intrigeri2016-05-241-1/+1
* | | | Merge branch 'feature/6154-secure-autoconfig-in-icedove' into develintrigeri2016-05-249-85/+375
|\ \ \ \ | |/ / / |/| | |
| * | | Correct hkps:// keyserver pool URL for Enigmail.intrigeri2016-05-241-1/+1
| * | | Design doc: update links to source code, and add a few new ones that were mis...intrigeri2016-05-241-1/+3
| * | | Design doc: improve formatting.intrigeri2016-05-241-2/+2
| * | | Design doc: link to the relevant ticket.intrigeri2016-05-241-1/+1
| * | | Fix typos in comments.intrigeri2016-05-241-2/+2
| * | | Merge remote-tracking branch 'origin/master' into feature/6154-secure-autocon...intrigeri2016-05-241-0/+33
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/devel' into feature/6154-secure-autoconf...intrigeri2016-05-244-3/+5
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Drop commented-out pref.anonym2016-05-241-3/+0
| * | | | Merge remote-tracking branch '451f/feature/11215+icedove_design_doc' into fea...anonym2016-05-2416-264/+353
| |\ \ \ \
| | * | | | Update design documentation for Icedove.Ulrike Uhlig2016-05-241-6/+15
| | * | | | Update design documentation for Icedove.Ulrike Uhlig2016-05-241-7/+6
| | * | | | Merge remote-tracking branch 'tails/master' into feature/11215+icedove_design...Ulrike Uhlig2016-05-24358-1818/+51883
| | |\ \ \ \
| | * | | | | Update design documentation of Icedove wrt the automatic configuration wizard.Ulrike Uhlig2016-05-161-4/+16
| * | | | | | Rename variable for consistency.anonym2016-05-241-4/+3
| * | | | | | Make Icedove default to POP iff persistence is enabled.anonym2016-05-241-1/+23
| * | | | | | Add helper for setting Mozilla prefs.anonym2016-05-241-0/+13
| * | | | | | Make extensions.torbirdy.defaultprotocol affect the auto wizard.anonym2016-05-242-0/+42
| * | | | | | Disable (insecure) MX lookups for the Icedove auto configuration.anonym2016-05-241-0/+5
| * | | | | | Icedove pref changed name.anonym2016-05-241-2/+3
| * | | | | | Merge branch 'devel' into feature/6154-secure-autoconfig-in-icedoveintrigeri2016-05-23893-22650/+65113
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into feature/6154-secure-autoconf...anonym2016-05-1636-396/+488
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into feature/6154-secure-autoconf...intrigeri2016-05-1495-804/+1514
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into feature/6154-secure-autoconf...anonym2016-04-29667-23996/+20953
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/devel' into feature/6154-secure-autoconf...anonym2016-03-1944-101/+314
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use hkps keyserver in Engimail.anonym2016-03-191-1/+1
| * | | | | | | | | | | Stop patching in our default into Torbirdy.anonym2016-03-193-71/+62
| * | | | | | | | | | | Use saner channel for Torbirdy prefs.anonym2016-03-182-8/+1
| * | | | | | | | | | | Merge remote-tracking branch 'origin/devel' into feature/6154-secure-autoconf...anonym2016-03-18147-1563/+2961
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bump temporary Torbirdy patch.anonym2016-03-171-10/+49
| * | | | | | | | | | | | Add temporary patch for TorBirdy.anonym2016-03-091-0/+154
| * | | | | | | | | | | | Remove stray character.anonym2016-03-091-1/+1
| * | | | | | | | | | | | Configure the automatic configuration wizard to only use secure protocols.anonym2016-03-091-0/+4
| * | | | | | | | | | | | Enable Icedove's automatic configuration wizard.anonym2016-03-091-0/+8
| * | | | | | | | | | | | Enable the feature-6154-secure-autoconfig-in-icedove APT overlay.anonym2016-03-091-0/+0
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into develintrigeri2016-05-2416-260/+362
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Musings about static build environments.anonym2016-05-241-0/+33
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/contrib/9746-business-cards'sajolida2016-05-231-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Link to business cards indexsajolida2016-02-251-0/+1