[Pkg-mozext-commits] [requestpolicy] 32/50: Merge branch 'release-1.0.beta12.0' into dev-1.0-releases

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 13fd51582464cb6d11cb511116ef7b228e5ebacb
Merge: fe0919d e72efe0
Author: Martin Kimmerle <dev at 256k.de>
Date:   Mon Jun 20 23:38:43 2016 +0200

    Merge branch 'release-1.0.beta12.0' into dev-1.0-releases

 .github/ISSUE_TEMPLATE.md                          |  16 ++
 .gitignore                                         |   1 +
 ChangeLog.md                                       |  16 ++
 Makefile                                           |  50 +++----
 README.md                                          |   2 +-
 requirements.txt                                   |  11 +-
 src/content/controllers/keyboard-shortcuts.jsm     |   6 +
 src/content/lib/classes/keyboard-shortcut.jsm      |   7 +-
 src/content/lib/default-preferences.js             |   2 +
 src/content/lib/environment.jsm                    |   2 +-
 src/content/lib/environment.process.js             |   3 +-
 src/content/lib/request.jsm                        |  44 ++++--
 src/content/lib/ruleset.jsm                        | 124 +++++++---------
 src/content/lib/script-loader.jsm                  |   7 +-
 src/content/lib/utils.jsm                          |   2 +-
 src/content/lib/utils/domains.jsm                  |  26 ++++
 src/content/lib/utils/info.jsm                     |   5 +-
 src/content/lib/utils/rules.jsm                    |  78 ++++++++++
 src/content/main/about-uri.jsm                     |  19 ++-
 src/content/main/pref-manager.jsm                  |   2 +-
 src/content/main/rp-service-2.jsm                  |  67 +++++++++
 src/content/models/prefs.jsm                       |   2 +
 src/content/settings/common.js                     |  41 ------
 src/content/settings/oldrules.js                   |   6 +-
 src/content/settings/yourpolicy.js                 |   7 +-
 src/content/ui/frame.js                            |   2 +-
 src/content/ui/menu.js                             |  26 +---
 src/install.rdf                                    |   6 +-
 src/locale/{es-MX => es-ES}/requestpolicy.dtd      |   4 +-
 src/locale/es-ES/requestpolicy.properties          | 126 ++++++++++++++++
 src/locale/es-MX/requestpolicy.dtd                 |   4 +-
 src/locale/es-MX/requestpolicy.properties          | 162 ++++++++++-----------
 src/locale/fr/requestpolicy.properties             |   2 +-
 tests/content/.htaccess                            |   5 +-
 tests/content/favicon.ico.php                      |  19 +++
 .../rp_puppeteer/tests/test_request_log.py         |  21 +++
 .../rp_puppeteer/tests/test_rules_table.py         |   6 -
 tests/marionette/rp_puppeteer/ui/request_log.py    |  26 +++-
 .../rp_puppeteer/ui/settings/rules_table.py        |  22 ++-
 tests/marionette/rp_ui_harness/runtests.py         |   8 +-
 tests/marionette/rp_ui_harness/test_data/rules.py  |  21 +--
 tests/marionette/rp_ui_harness/testcases.py        |   2 +-
 tests/mozrunner-prefs.ini                          |   3 +-
 tests/run-xpcshell-tests.sh                        |   3 +
 tests/xpcshell/.jscsrc                             |   9 +-
 tests/xpcshell/test_rule_match.js                  | 113 ++++++++++++++
 tests/xpcshell/test_ruleutils.js                   |  41 ++++++
 tests/xpcshell/xpcshell.ini                        |   3 +
 48 files changed, 843 insertions(+), 337 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git