[Pkg-mozext-commits] [requestpolicy] 55/65: Merge branch 'release-1.0.beta11' into dev-1.0-releases
David Prévot
taffit at moszumanska.debian.org
Fri Mar 25 22:59:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit dbc124813744e1986fd7070093b22dbab0baf61d
Merge: a5a0b5a faf060d
Author: Martin Kimmerle <dev at 256k.de>
Date: Wed Feb 3 21:56:56 2016 +0100
Merge branch 'release-1.0.beta11' into dev-1.0-releases
.gitignore | 5 +-
.jscsrc | 9 +
.jshintrc | 15 +
ChangeLog.md | 46 +
Makefile | 750 ++++++++---------
README.md | 74 +-
requirements.txt | 10 +-
src/.jshintrc | 7 +
src/SourceCode-ChangeLog.md | 5 +
src/bootstrap.js | 52 +-
src/content/controllers/keyboard-shortcuts.jsm | 59 ++
src/content/controllers/old-rules.jsm | 85 ++
src/content/controllers/windows.overlay.jsm | 79 ++
src/content/controllers/windows.style-sheets.jsm | 84 ++
src/content/controllers/windows.toolbarbutton.jsm | 180 ++++
src/content/lib/classes/keyboard-shortcut.jsm | 212 +++++
src/content/lib/classes/map-of-sets.jsm | 64 ++
src/content/lib/classes/pref-branch.jsm | 78 ++
src/content/lib/classes/pref-observer.jsm | 120 +++
src/content/lib/default-preferences.js | 20 +-
src/content/lib/environment.jsm | 928 +++++++++++----------
src/content/lib/environment.process.js | 93 ++-
.../lib/framescript-to-overlay-communication.jsm | 46 +-
src/content/lib/gui-location.jsm | 104 +--
src/content/lib/http-response.jsm | 302 ++++---
src/content/lib/logger.jsm | 141 ++--
src/content/lib/manager-for-event-listeners.jsm | 62 +-
src/content/lib/manager-for-message-listeners.jsm | 68 +-
src/content/lib/observer-manager.jsm | 86 +-
src/content/lib/old-rules.jsm | 238 ++++++
src/content/lib/policy-manager.alias-functions.js | 25 +-
src/content/lib/policy-manager.jsm | 228 ++---
src/content/lib/prefs.jsm | 149 ----
src/content/lib/request-processor.compat.js | 120 ++-
src/content/lib/request-processor.jsm | 540 +++++++-----
src/content/lib/request-processor.redirects.js | 248 +++---
src/content/lib/request-result.jsm | 93 ++-
src/content/lib/request-set.jsm | 113 +--
src/content/lib/request.jsm | 97 ++-
src/content/lib/ruleset-storage.jsm | 53 +-
src/content/lib/ruleset.jsm | 539 +++++++-----
src/content/lib/script-loader.jsm | 90 +-
src/content/lib/subscription.jsm | 340 ++++----
src/content/lib/utils.jsm | 41 +-
src/content/lib/utils/constants.jsm | 14 +-
src/content/lib/utils/dom.jsm | 70 +-
src/content/lib/utils/domains.jsm | 155 ++--
src/content/lib/utils/files.jsm | 74 +-
src/content/lib/utils/info.jsm | 60 +-
src/content/lib/utils/javascript.jsm | 62 ++
src/content/lib/utils/observers.jsm | 32 +-
src/content/lib/utils/strings.jsm | 27 +-
src/content/lib/utils/windows.jsm | 65 +-
src/content/lib/utils/xul.jsm | 135 ++-
src/content/main/about-uri.jsm | 103 +--
src/content/main/content-policy.jsm | 81 +-
src/content/main/default-pref-handler.js | 32 +-
src/content/main/pref-manager.jsm | 110 +--
src/content/main/requestpolicy-service.jsm | 244 +++---
src/content/main/window-manager-toolbarbutton.js | 157 ----
src/content/main/window-manager.jsm | 234 ++----
src/content/main/window-manager.listener.js | 150 ----
src/content/models/prefs.jsm | 219 +++++
src/content/models/windows.jsm | 194 +++++
src/content/settings/advancedprefs.html | 32 +-
src/content/settings/advancedprefs.js | 315 ++++---
src/content/settings/basicprefs.html | 6 +-
src/content/settings/basicprefs.js | 167 ++--
src/content/settings/common.js | 318 ++-----
src/content/settings/defaultpolicy.html | 8 +-
src/content/settings/defaultpolicy.js | 141 ++--
src/content/settings/experimental.html | 75 ++
src/content/settings/experimental.js | 100 +++
src/content/settings/oldrules.html | 9 +-
src/content/settings/oldrules.js | 213 +++--
src/content/settings/setup.html | 6 +-
src/content/settings/setup.js | 272 +++---
src/content/settings/subscriptions.html | 6 +-
src/content/settings/subscriptions.js | 222 +++--
src/content/settings/yourpolicy.html | 8 +-
src/content/settings/yourpolicy.js | 436 +++++-----
src/content/ui/classicmenu.js | 53 +-
src/content/ui/frame.blocked-content.js | 57 +-
src/content/ui/frame.dom-content-loaded.js | 43 +-
src/content/ui/frame.js | 91 +-
src/content/ui/menu.js | 800 ++++++++++--------
src/content/ui/overlay.js | 455 +++++-----
src/content/ui/request-log.filtering.js | 29 +-
src/content/ui/request-log.interface.js | 38 +-
src/content/ui/request-log.js | 30 +-
src/content/ui/request-log.tree-view.js | 72 +-
src/content/ui/xul-trees.js | 27 +-
src/install.rdf | 23 +-
src/locale/de/requestpolicy.properties | 7 +-
src/locale/en-US/requestpolicy.properties | 5 +-
src/locale/eo/requestpolicy.properties | 5 +-
src/locale/es-MX/requestpolicy.properties | 5 +-
src/locale/eu/requestpolicy.properties | 5 +-
src/locale/fr/requestpolicy.dtd | 8 +-
src/locale/fr/requestpolicy.properties | 79 +-
src/locale/it/requestpolicy.properties | 5 +-
src/locale/ja/requestpolicy.properties | 5 +-
src/locale/ko-KR/requestpolicy.properties | 5 +-
src/locale/lv-LV/requestpolicy.properties | 5 +-
src/locale/nl/requestpolicy.properties | 5 +-
src/locale/pt-BR/requestpolicy.properties | 5 +-
src/locale/ru-RU/requestpolicy.properties | 5 +-
src/locale/sk-SK/requestpolicy.properties | 5 +-
src/locale/sv-SE/requestpolicy.properties | 5 +-
src/locale/tr/requestpolicy.properties | 5 +-
src/locale/uk-UA/requestpolicy.properties | 5 +-
src/locale/zh-CN/requestpolicy.properties | 5 +-
src/locale/zh-TW/requestpolicy.properties | 5 +-
src/skin/requestpolicy.css | 21 +
src/skin/toolbarbutton.css | 22 -
tests/content/img_1.html | 17 +-
tests/content/page-without-resources.html | 15 +
tests/content/redirect-http-location-header.php | 3 +-
tests/content/redirect-http-refresh-header.php | 4 +-
.../content/redirect-js-document-location-auto.php | 16 +
.../content/redirect-js-document-location-link.php | 25 +
.../redirect-meta-tag-different-formatting.php | 22 +
tests/content/redirect-meta-tag.php | 20 +
tests/helper-addons/dev-helper/bootstrap.js | 48 +-
.../dev-helper/content/console-observer.jsm | 77 +-
.../dev-helper/content/logging-observer.jsm | 87 ++
.../content/restart-detection-helper.jsm | 5 +-
tests/helper-addons/dev-helper/content/rpc-uri.jsm | 111 +--
tests/helper-addons/dummy-ext/bootstrap.js | 2 +
tests/marionette/rp_puppeteer/__init__.py | 24 +-
tests/marionette/rp_puppeteer/api/addon.py | 269 ++++++
tests/marionette/rp_puppeteer/api/browser_info.py | 18 +
.../marionette/rp_puppeteer/api/error_detection.py | 75 +-
tests/marionette/rp_puppeteer/api/prefs.py | 49 ++
tests/marionette/rp_puppeteer/api/requests.py | 3 +-
tests/marionette/rp_puppeteer/api/rules.py | 65 +-
tests/marionette/rp_puppeteer/tests/manifest.ini | 5 +-
tests/marionette/rp_puppeteer/tests/test_addon.py | 74 ++
tests/marionette/rp_puppeteer/tests/test_addons.py | 172 ----
.../rp_puppeteer/tests/test_error_detection.py | 30 +-
tests/marionette/rp_puppeteer/tests/test_menu.py | 41 +
.../rp_puppeteer/tests/test_old_rules_page.py | 69 ++
tests/marionette/rp_puppeteer/tests/test_prefs.py | 93 +++
.../tests/test_redirect_notification.py | 17 +-
.../marionette/rp_puppeteer/tests/test_requests.py | 4 +-
tests/marionette/rp_puppeteer/tests/test_rules.py | 40 +-
.../rp_puppeteer/tests/test_rules_table.py | 249 ++++++
.../tests/test_subscriptions_settings.py | 48 ++
.../rp_puppeteer/tests/test_your_policy.py | 304 +------
tests/marionette/rp_puppeteer/ui/addons.py | 339 --------
tests/marionette/rp_puppeteer/ui/menu.py | 95 +++
.../rp_puppeteer/ui/redirect_notification.py | 39 +-
.../rp_puppeteer/ui/settings/__init__.py | 20 +
.../rp_puppeteer/ui/settings/old_rules.py | 51 ++
.../rp_puppeteer/ui/settings/rules_table.py | 203 +++++
.../rp_puppeteer/ui/settings/subscriptions.py | 55 ++
.../rp_puppeteer/ui/settings/your_policy.py | 116 +--
tests/marionette/rp_ui_harness/decorators.py | 13 +
tests/marionette/rp_ui_harness/runner.py | 89 ++
tests/marionette/rp_ui_harness/runtests.py | 20 +
.../marionette/rp_ui_harness/test_data/__init__.py | 0
tests/marionette/rp_ui_harness/test_data/rules.py | 178 ++++
tests/marionette/rp_ui_harness/testcases.py | 25 +-
tests/marionette/rp_ui_harness/utils/__init__.py | 0
.../marionette/rp_ui_harness/utils/redirections.py | 234 ++++++
.../test_default_policy.py | 67 ++
.../test_multiple_installations.py | 205 +++--
.../test_restartlessness.py | 74 +-
.../marionette/tests/blocked_content/manifest.ini | 1 +
.../blocked_content/test_image_placeholder.py | 24 +
tests/marionette/tests/manifest.ini | 3 +
tests/marionette/tests/menu/manifest.ini | 3 +
tests/marionette/tests/menu/test_num_requests.py | 59 ++
tests/marionette/tests/menu/test_open.py | 71 ++
.../marionette/tests/menu/test_settings_buttons.py | 175 ++++
tests/marionette/tests/policy/manifest.ini | 1 +
.../marionette/tests/policy/old_rules/manifest.ini | 1 +
.../tests/policy/old_rules/test_import.py | 104 +++
.../tests/redirections/test_auto_redirect.py | 128 ++-
.../tests/redirections/test_inline_redirect.py | 11 +-
.../tests/redirections/test_link_click_redirect.py | 110 ++-
.../test_link_click_redirect_in_new_tab.py | 99 ++-
tests/marionette/tests/settings/manifest.ini | 3 +
tests/marionette/tests/settings/test_checkboxes.py | 133 +++
.../tests/settings/test_subscriptions.py | 54 ++
.../marionette/tests/settings/test_your_policy.py | 45 +
tests/marionette/tests/test_setup_page.py | 30 +-
tests/mozrunner-prefs.ini | 32 +-
tests/run-xpcshell-tests.sh | 3 +-
tests/xpcshell/.jscsrc | 10 +
tests/xpcshell/.jshintrc | 7 +
tests/xpcshell/head_loadrp.js | 32 +-
tests/xpcshell/head_utils.js | 77 +-
tests/xpcshell/test_fileutil.js | 2 +-
tests/xpcshell/test_jsutils.js | 46 +
tests/xpcshell/test_map_of_sets.js | 55 ++
tests/xpcshell/test_oldrules.js | 245 ++++++
tests/xpcshell/test_policymanager.js | 167 ++--
tests/xpcshell/test_policystorage.js | 83 +-
tests/xpcshell/test_requestresult.js | 110 +++
tests/xpcshell/test_subscription.js | 30 +-
tests/xpcshell/test_wrap_function.js | 3 +-
tests/xpcshell/test_xulutils_keyboard_shortcuts.js | 67 ++
tests/xpcshell/xpcshell.ini | 5 +
204 files changed, 11855 insertions(+), 7288 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