summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* config/chroot_local-hooks/59-libdvd-pkg: cleanup fake libdvd-pkg version hand...feature/7674-libdvdcss2Austin English2016-02-121-4/+4
* config/chroot_local-hooks/59-libdvd-pkg: update comment about fake libdvd-pkgAustin English2016-02-121-1/+3
* config/chroot_local-hooks/59-libdvd-pkg: move fake libdvd-pkg package creatio...Austin English2016-02-121-10/+12
* config/chroot_local-hooks/59-libdvd-pkg: remove set -xAustin English2016-02-121-1/+0
* config/chroot_apt/preferences: remove pinning for libdvd*, should not be need...Austin English2016-02-121-12/+0
* add libdvdcss2 to tailsAustin English2016-02-113-0/+49
* Merge branch 'stable' into develanonym2016-02-111-1/+1
|\
| *---. Merge remote-tracking branches 'origin/bugfix/7943-simplify-tor-launcher-prof...anonym2016-02-1175-228/+182
| |\ \ \
| | | | * Set the correct path this time.anonym2016-02-111-1/+1
* | | | | Merge remote-tracking branch 'origin/bugfix/9896-abstract-chroot-browser-conf...intrigeri2016-02-1112-97/+52
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix paths that were forgotten.anonym2016-02-111-2/+2
| * | | | Merge remote-tracking branch 'origin/stable' into bugfix/9896-abstract-chroot...intrigeri2016-02-09247-4868/+8702
| |\ \ \ \ | | |/ / /
| * | | | Clarification.anonym2016-02-041-8/+3
| * | | | Update paths in design docs.anonym2016-02-042-2/+2
| * | | | Add explanation.anonym2016-02-041-1/+2
| * | | | Refactor another part of userChrome.css for the chroot browsers.anonym2016-02-043-26/+11
| * | | | Improve the directory of for the chroot browser config.anonym2016-02-049-5/+7
| * | | | Merge remote-tracking branch 'origin/devel' into bugfix/9896-abstract-chroot-...anonym2016-02-04554-11353/+19596
| |\ \ \ \
| * \ \ \ \ Merge branch 'devel' into bugfix/9896-abstract-chroot-browser-configsintrigeri2016-01-112-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'devel' into bugfix/9896-abstract-chroot-browser-configsintrigeri2016-01-11998-11632/+97902
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'feature/jessie' into bugfix/9896-abstract-chroot-browser-configsintrigeri2015-12-141422-18746/+68639
| |\ \ \ \ \ \ \
| * | | | | | | | Abstract the chroot browser userChrome.css configurations.anonym2015-09-164-48/+31
| * | | | | | | | Abstract the chroot browser prefs.js configurations.anonym2015-09-164-34/+23
* | | | | | | | | Merge remote-tracking branch 'origin/bugfix/11097-tor-browser-fontconfig' int...intrigeri2016-02-1147-15/+26
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Use separate PrintToFile.png for the browsers, and Evince.anonym2016-02-114-2/+2
| * | | | | | | | Mass update browser and Tor Launcher related images due to font change.anonym2016-02-1141-0/+0
| * | | | | | | | Do the fontconfig dance with all browsers.anonym2016-02-113-18/+24
| * | | | | | | | Use an appropriate working directory when launching the Tor Browser.anonym2016-02-111-0/+5
* | | | | | | | | Merge remote-tracking branch 'origin/bugfix/7943-simplify-tor-launcher-profil...intrigeri2016-02-1112-79/+80
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Propagate Tor Launcher options via the wrapper.anonym2016-02-101-1/+1
| * | | | | | | Test that Tor Launcher uses the correct TBB libs.anonym2016-02-102-4/+14
| * | | | | | | Remove no longer relevant cleanup procedure.anonym2016-02-091-3/+0
| * | | | | | | Move Torbutton env configuration int the tor-browser script.anonym2016-02-092-11/+12
| * | | | | | | Move Tor Launcher env configuration.anonym2016-02-093-17/+10
| * | | | | | | Fix typo in variable.anonym2016-02-091-1/+1
| * | | | | | | Introduce TOR_LAUNCHER_INSTALL to the tor-browser library.anonym2016-02-094-14/+20
| * | | | | | | Move tor-launcher-standalone into /usr/local/lib.anonym2016-02-096-10/+10
| * | | | | | | Move tor-launcher script tor /usr/local/bin.anonym2016-02-092-1/+1
| * | | | | | | Make the -profile Tor Launcher workaround simpler.anonym2016-02-093-22/+16
| * | | | | | | Correct comment.anonym2016-02-091-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'stable' into develintrigeri2016-02-08246-4868/+8702
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'bugfix/11078-refresh-Tor-Browser-AppArmor-profile' into stableintrigeri2016-02-081-7/+11
| |\ \ \ \ \ \
| | * | | | | | Refresh patch against the Tor Browser AppArmor profile.intrigeri2016-02-081-7/+11
| |/ / / / / /
| * | | | | | Revert "Copy fingerprinting issue in 'Known issues'"sajolida2016-02-051-4/+4
| * | | | | | Merge remote-tracking branch 'origin/master' into stablesajolida2016-02-05245-4864/+8694
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master'intrigeri2016-02-052-2/+8
| | |\ \ \ \ \ \
| | | * | | | | | add more icedove reporting127.0.0.12016-02-051-1/+7
| | | * | | | | | Merge remote-tracking branch 'origin/master'sajolida2016-02-0529-639/+1535
| | | |\ \ \ \ \ \
| | | * | | | | | | Fix default keyboard shortcutsajolida2016-02-051-1/+1
| | * | | | | | | | Add new blueprint.intrigeri2016-02-051-0/+15
| | | |/ / / / / / | | |/| | | | | |