[Pkg-mozext-commits] [requestpolicy] 76/80: Merge branch 'release-1-0-beta10' into dev-1.0-releases
David Prévot
taffit at moszumanska.debian.org
Sun Jul 5 15:02:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit 48bda95160a2a2da54349c9bfb67dee827237f89
Merge: 631b524 4fcfd9f
Author: Martin Kimmerle <dev at 256k.de>
Date: Wed Jul 1 20:30:31 2015 +0200
Merge branch 'release-1-0-beta10' into dev-1.0-releases
.gitignore | 3 +
ChangeLog.md | 7 +
Makefile | 259 +++++++++++++---
README.md | 2 +-
requirements.txt | 2 +
src/SourceCode-ChangeLog.md | 15 +
src/bootstrap.js | 2 +-
src/chrome.manifest | 42 +--
src/content/lib/default-preferences.js | 2 -
src/content/lib/environment.jsm | 4 +-
src/content/lib/environment.process.js | 6 +-
.../lib/framescript-to-overlay-communication.jsm | 2 +-
src/content/lib/gui-location.jsm | 2 +-
src/content/lib/http-response.jsm | 2 +-
src/content/lib/logger.jsm | 82 ++++-
src/content/lib/manager-for-event-listeners.jsm | 2 +-
src/content/lib/manager-for-message-listeners.jsm | 2 +-
src/content/lib/observer-manager.jsm | 6 +-
src/content/lib/policy-manager.jsm | 6 +-
src/content/lib/prefs.jsm | 4 +-
src/content/lib/request-processor.compat.js | 2 +-
src/content/lib/request-processor.jsm | 12 +-
src/content/lib/request-processor.redirects.js | 95 +++---
src/content/lib/request-set.jsm | 2 +-
src/content/lib/request.jsm | 2 +-
src/content/lib/ruleset-storage.jsm | 2 +-
src/content/lib/ruleset.jsm | 2 +-
src/content/lib/script-loader.jsm | 2 +-
src/content/lib/subscription.jsm | 8 +-
src/content/lib/utils.jsm | 2 +-
src/content/lib/utils/constants.jsm | 7 +-
src/content/lib/utils/domains.jsm | 2 +-
src/content/lib/utils/strings.jsm | 2 +-
src/content/lib/utils/windows.jsm | 2 +-
src/content/lib/utils/xul.jsm | 4 +-
src/content/main/about-uri.jsm | 6 +-
src/content/main/content-policy.jsm | 8 +-
src/content/main/default-pref-handler.js | 2 +-
src/content/main/pref-manager.jsm | 4 +-
src/content/main/requestpolicy-service.jsm | 116 ++++++-
src/content/main/window-manager-toolbarbutton.js | 6 +-
src/content/main/window-manager.jsm | 28 +-
src/content/multiple-installations.html | 78 +++++
src/content/settings/advancedprefs.html | 13 +-
src/content/settings/basicprefs.html | 13 +-
src/content/settings/common.js | 2 +-
src/content/settings/defaultpolicy.html | 13 +-
src/content/settings/oldrules.html | 13 +-
src/content/settings/settings.css | 3 +-
src/content/settings/setup.html | 13 +-
src/content/settings/subscriptions.html | 13 +-
src/content/settings/yourpolicy.html | 13 +-
src/content/settings/yourpolicy.js | 2 +-
src/content/ui/classicmenu.js | 42 +--
src/content/ui/frame.blocked-content.js | 6 +-
src/content/ui/frame.js | 6 +-
src/content/ui/menu.js | 121 ++++----
src/content/ui/overlay.js | 84 +++---
src/content/ui/request-log.filtering.js | 10 +-
src/content/ui/request-log.interface.js | 8 +-
src/content/ui/request-log.js | 12 +-
src/content/ui/request-log.tree-view.js | 18 +-
src/content/ui/request-log.xul | 44 +--
src/content/ui/xul-trees.js | 145 +++++----
src/install.rdf | 148 ++++++++-
src/locale/de/requestpolicy.properties | 1 -
src/locale/en-US/requestpolicy.properties | 1 -
src/locale/eo/requestpolicy.properties | 1 -
src/locale/es-MX/requestpolicy.properties | 1 -
src/locale/eu/requestpolicy.dtd | 12 +-
src/locale/eu/requestpolicy.properties | 193 ++++++------
src/locale/fr/requestpolicy.properties | 1 -
src/locale/it/requestpolicy.properties | 1 -
src/locale/ja/requestpolicy.properties | 3 +-
src/locale/ko-KR/requestpolicy.properties | 1 -
src/locale/lv-LV/requestpolicy.properties | 1 -
src/locale/nl/requestpolicy.properties | 1 -
src/locale/pt-BR/requestpolicy.properties | 1 -
src/locale/ru-RU/requestpolicy.properties | 1 -
src/locale/sk-SK/requestpolicy.properties | 1 -
src/locale/sv-SE/requestpolicy.properties | 1 -
src/locale/tr/requestpolicy.properties | 1 -
src/locale/uk-UA/requestpolicy.properties | 1 -
src/locale/zh-CN/requestpolicy.properties | 9 +-
src/locale/zh-TW/requestpolicy.properties | 1 -
src/skin/initial-setup.css | 2 +-
src/skin/request-log.css | 2 +-
src/skin/requestpolicy.css | 136 ++++-----
src/skin/toolbarbutton-seamonkey.css | 38 +--
src/skin/toolbarbutton.css | 80 ++---
tests/UnitTest-ChangeLog.md | 5 +
tests/content/link.html | 27 ++
.../dev-helper}/bootstrap.js | 0
.../dev-helper}/chrome.manifest | 0
.../dev-helper}/content/console-observer.jsm | 8 +-
.../content/restart-detection-helper.jsm | 0
.../dev-helper}/content/rpc-uri.jsm | 0
.../dev-helper}/install.rdf | 0
tests/helper-addons/dummy-ext/bootstrap.js | 4 +
tests/helper-addons/dummy-ext/install.rdf | 23 ++
tests/marionette/rp_puppeteer/__init__.py | 1 +
tests/marionette/rp_puppeteer/api/__init__.py | 1 +
.../marionette/rp_puppeteer/api/error_detection.py | 70 +++++
tests/marionette/rp_puppeteer/api/prefs.py | 20 ++
tests/marionette/rp_puppeteer/tests/manifest.ini | 3 +
tests/marionette/rp_puppeteer/tests/test_addons.py | 172 +++++++++++
.../rp_puppeteer/tests/test_error_detection.py | 45 +++
tests/marionette/rp_puppeteer/tests/test_prefs.py | 26 ++
tests/marionette/rp_puppeteer/ui/__init__.py | 1 +
tests/marionette/rp_puppeteer/ui/addons.py | 335 +++++++++++++++++++++
tests/marionette/rp_ui_harness/__init__.py | 5 +
tests/marionette/rp_ui_harness/testcases.py | 49 +++
.../tests/addon_install_and_upgrade/manifest.ini | 2 +
.../test_multiple_installations.py | 167 ++++++++++
.../test_restartlessness.py | 40 +++
tests/marionette/tests/manifest.ini | 2 +
tests/marionette/tests/test_setup_page.py | 40 +++
tests/mozmill/addon-manifest.ini | 5 -
.../detectErrors/testDetectingErrors.js | 2 +-
.../restartlessness/lib/addon-manager-utils.js | 10 +-
.../highLevelTests/restartlessness/manifest.ini | 13 +
.../restartlessness/testDisableExtension.js | 4 +-
.../restartlessness/testEnableExtension.js | 2 +-
.../restartlessness/testInstallExtension.js | 2 +-
.../restartlessness/testUninstallExtension.js | 6 +-
tests/mozmill/lib/constants.js | 2 +-
tests/mozmill/lib/menu-utils.js | 2 +-
tests/mozmill/lib/request-log-utils.js | 20 +-
tests/mozmill/test-ff.ini | 11 +-
.../tests/testPolicy/lib/num-request-counter.js | 16 +-
tests/mozrunner-prefs.ini | 25 +-
tests/run-mozmill.sh | 5 -
tests/xpcshell/head_loadrp.js | 4 +-
tests/xpcshell/head_utils.js | 4 +-
tests/xpcshell/test_fileutil.js | 2 +-
tests/xpcshell/test_policymanager.js | 6 +-
tests/xpcshell/test_policystorage.js | 4 +-
tests/xpcshell/test_subscription.js | 2 +-
138 files changed, 2488 insertions(+), 784 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list