summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-includes
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade TBB to rebuild of version 4.0.Tails developers2014-10-152-16/+16
| | | | | The rebuild mitigates the POODLE attack by disabling SSLv3, and bumps NoScript from version 2.6.9 to 2.6.9.1.
* Update AdBlock Plus patterns.Tails developers2014-10-151-173/+644
|
* Merge remote-tracking branch 'origin/bugfix/8060-fix-default-search-engine' ↵Tails developers2014-10-1514-28/+28
|\ | | | | | | into testing
| * Drop unnecessary HTTPS part for Startpage search plugins.Tails developers2014-10-1411-22/+22
| |
| * TBB's Startpage search plugin has a different name (Closes: #8036)Tails developers2014-10-143-6/+6
| | | | | | | | | | | | ... than the old one we used prior to the TBB migration, so our branding addons wouldn't set it as the default for en-US (and locales without a localized Startpage plugin, which falls back to en-US).
* | Merge remote-tracking branch ↵Tails developers2014-10-156-31/+95
|\ \ | | | | | | | | | 'origin/bugfix/8036-workaround-for-localized-searchplugins' into testing
| * | Fallback to "similar" locale's searchplugins.Tails developers2014-10-151-4/+5
| | | | | | | | | | | | | | | E.g. if our locale is pt, which doesn't have localized search plugins, we'll use one of pt-PT and pt-BR.
| * | Simplify.Tails developers2014-10-151-2/+2
| | |
| * | Get browser locale set by the new browser localization code.Tails developers2014-10-151-1/+1
| | |
| * | Use local variables in shell functions.Tails developers2014-10-151-3/+4
| | |
| * | Merge branch 'bugfix/8122-better-browser-localization' into ↵Tails developers2014-10-156-31/+75
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | bugfix/8036-workaround-for-localized-searchplugins Conflicts: config/chroot_local-includes/usr/local/bin/tor-browser
| | * | Simplify the chroot browser's code slightly.Tails developers2014-10-152-21/+11
| | | |
| | * | Use the new, improved localization code for the browsers and Tor Launcher.Tails developers2014-10-154-9/+16
| | | |
| | * | Add localization helper functions for XUL applications.Tails developers2014-10-152-1/+48
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That is for the various browsers and Tor Launcher. This will make it possible to drop the browser localization code from Tails Greeter's PostLogin script, where that really doesn't belong. Also, this new code is an improvement in that it will pick a "similar" locale if the specific one we look for isn't available. E.g. with pt-BR we will get pt, and the Firefox is smart enough to use the pt-PT langpack.
| * | Add workaround for #8036 to enable localized search plugins.Tails developers2014-10-151-0/+18
| |/
* | Merge remote-tracking branch 'origin/testing' into ↵Tails developers2014-10-144-11/+20
|\ \ | |/ | | | | | | | | | | | | | | | | feature/8031-refactor-10-rbb-hook Conflicts: config/chroot_local-hooks/10-tbb In conflict resolution, also update to TBB 4.0 checksums and url in tbb-dist-url.txt and tbb-sha256sums.txt.
| * Merge remote-tracking branch 'origin/feature/8031-refactor-10-rbb-hook' into ↵Tails developers2014-10-1120-12/+12
| |\ | | | | | | | | | testing
| * | Revert "Activate highlight misspelled words by default in Pidgin"Tails developers2014-10-111-1/+1
| | | | | | | | | | | | This reverts commit 90e0d3223a86f0ce8b0ef8c6eeaa243396c7c0cb.
| * | Merge remote-tracking branch 'matsa/testing' into testingTails developers2014-10-111-1/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: po/fr.po
| | * \ Merge branch 'testing' of ssh://repo.or.cz/srv/git/tails/matsa into testingTails developers2014-10-101-1/+1
| | |\ \
| | | * | Activate highlight misspelled words by default in PidginTails developers2013-11-071-1/+1
| | | | |
| * | | | Merge remote-tracking branch ↵Tails developers2014-10-111-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 'origin/bugfix/8057-translatable-tor-browser-desktop-file' into testing
| | * | | | Make Tor Browser's desktop file translatable (Closes: #8057).Tails developers2014-10-101-3/+3
| | |/ / /
| * | | | Remove the amnesia branding extension from the Unsafe Browser.Tails developers2014-10-101-3/+1
| |/ / / | | | | | | | | | | | | | | | | It was added by mistake when adapting the script for the TBB-migration.
* | | | Separate data from TBB installation script.Tails developers2014-10-132-0/+5
| |_|/ |/| |
* | | Drop useless "Browser" sub-directory in the TBB installation.Tails developers2014-10-107-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | It was a relic of the TBB 3.x times when the profile was located in the parent directory of the TBB browser files. Also patch Tails Greeter with the updated path. That patch should be dropped once it's been upstreamed into Tails Greeter.
* | | Move TBB's global extensions dir.Tails developers2014-10-1015-3/+3
|/ / | | | | | | | | | | | | The new place corresponds better to where Debian puts the Iceweasel extensions. Also, it will allow us to drop the useless "Browser" sub-dir in TBB_INSTALL without having potential collisions (e.g. if there was a "Browser/extensions").
* | Remove useless commented code.Tails developers2014-10-091-1/+0
| |
* | Update AdBlock Plus patterns.Tails developers2014-10-081-816/+3226
| |
* | Removed expired Pidgin certificates (Closes: #7730).Tails developers2014-10-082-69/+0
| | | | | | | | Patch from Kill Your TV.
* | Merge remote-tracking branch ↵Tails developers2014-10-081-0/+15
|\ \ | | | | | | | | | 'killyourtv/feature/7952-hide-tbb-health-and-get-addons-in-unsafe-browser' into devel
| * | Hide option for "Tor Browser Health report" in unsafe-browserKill Your TV2014-09-271-0/+13
| | |
| * | disable Get-Addons pane in unsafe-browserKill Your TV2014-09-271-0/+2
| | |
* | | Merge branch 'feature/7732-i2p-network-manager-hook' into develTails developers2014-10-0815-309/+545
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: config/chroot_local-includes/usr/share/tails/firefox-localstore-win8.rdf
| * \ \ Merge branch 'feature/7725-i2p-browser' into ↵Tails developers2014-10-0862-617/+694
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/7732-i2p-network-manager-hook Conflicts: config/chroot_local-hooks/97-remove_i2p config/chroot_local-includes/lib/live/config/2080-install-i2p config/chroot_local-includes/usr/local/bin/tails-start-i2p config/chroot_local-includes/usr/local/lib/tails-shell-library/i2p.sh po/POTFILES.in refresh-translations wiki/src/contribute/release_process/test.mdwn
| | * | | Use exec_firefox() to start the I2P Browser.Tails developers2014-10-031-1/+4
| | | | |
| | * | | Merge branch 'feature/tor-browser-bundle' into feature/7725-i2p-browserTails developers2014-10-035-14/+16
| | |\ \ \
| | * | | | Use TBBs shared libraries in I2P BrowserKill Your TV2014-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | (copied from 4ba31985)
| | * | | | Set browser name to I2P BrowserKill Your TV2014-10-021-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TorButton forcefully sets the browser name to Tor Browser, but this browser doesn't use Tor. To try to prevent confusion I'm overriding that behavior.
| | * | | | use (brand-new) shell library to check for router consoleKill Your TV2014-10-021-1/+3
| | | | | |
| | * | | | Cherry-pick shell library from i2p-nmKill Your TV2014-10-022-0/+45
| | | | | |
| | * | | | Add TorButton proxy configsKill Your TV2014-10-021-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | This should prevent the scary "red x" from appearing (ty anonym)
| | * | | | Remove bogus quotingKill Your TV2014-10-011-1/+1
| | | | | |
| | * | | | adjust filename to work with 17cb86a0dKill Your TV2014-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | s/zz_tails/0000tails/g
| | * | | | Merge branch 'feature/tor-browser-bundle' into feature/7725-i2p-browserKill Your TV2014-10-0123-60/+118
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: refresh-translations wiki/src/contribute/design.mdwn wiki/src/contribute/design/I2P.mdwn wiki/src/contribute/design/stream_isolation.mdwn wiki/src/contribute/release_process/test.mdwn
| | * | | | | Remove I2P bookmarks from Tor BrowserKill Your TV2014-09-291-5/+0
| | | | | | |
| | * | | | | Rearrange blocks / use more variablesKill Your TV2014-09-281-34/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-arrange a couple of blocks to try to minimize the delta against unsafe-browser. Also use BROWSER_USER instead of hardcoding 'i2pbrowser'.
| | * | | | | Adjust I2P bookmarks in Tor BrowserKill Your TV2014-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...assuming there should be any.
| | * | | | | Disable searching from the URL barKill Your TV2014-09-271-0/+3
| | | | | | |
| | * | | | | Remove FoxyProxyKill Your TV2014-09-274-116/+1
| | | | | | |