[Pkg-mozext-commits] [requestpolicy] 62/65: Merge tag 'upstream/1.0.0_beta11.1+dfsg'

[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 69a13339648c54b3ce3fa93b59723d3ff18089f0
Merge: f672e13 7b97fc1
Author: David Prévot <taffit at debian.org>
Date:   Fri Mar 25 18:46:01 2016 -0400

    Merge tag 'upstream/1.0.0_beta11.1+dfsg'
    
    Upstream version 1.0.0~beta11.1+dfsg
    
    # gpg: Signature faite le ven. 25 mars 2016 18:45:57 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> » [inconnu]
    # gpg:                 alias « David Prévot <davidp at altern.org> » [inconnu]
    # gpg:                 alias « David Prévot <davidp at no-log.org> » [inconnu]
    # gpg:                 alias « David Prévot <taffit at debian.org> » [inconnu]
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 META-INF/manifest.mf                          | 214 ++++++++++++++------------
 META-INF/mozilla.rsa                          | Bin 4196 -> 4191 bytes
 META-INF/mozilla.sf                           |   4 +-
 bootstrap.js                                  |  11 +-
 content/controllers/keyboard-shortcuts.jsm    |   2 +-
 content/controllers/windows.toolbarbutton.jsm |   2 +-
 content/lib/classes/keyboard-shortcut.jsm     |  13 +-
 content/lib/default-preferences.js            |   9 +-
 content/lib/logger.jsm                        |   5 +-
 content/lib/request-processor.compat.js       |  21 +++
 content/lib/request-processor.jsm             |  28 ++++
 content/lib/request-processor.redirects.js    |  12 +-
 content/lib/request-result.jsm                |  22 +++
 content/lib/request-set.jsm                   |  25 ++-
 content/lib/ruleset.jsm                       |   3 +
 content/lib/script-loader.jsm                 |   9 +-
 content/lib/subscription.jsm                  |  77 ++++-----
 content/lib/utils/constants.jsm               |   2 +-
 content/lib/utils/javascript.jsm              |  18 +++
 content/main/about-uri.jsm                    |   3 +-
 content/main/pref-manager.jsm                 |  17 +-
 content/main/requestpolicy-service.jsm        |   5 +-
 content/models/prefs.jsm                      |   4 +
 content/models/windows.jsm                    |   4 +-
 content/settings/advancedprefs.html           |  28 +++-
 content/settings/advancedprefs.js             |  42 ++++-
 content/settings/basicprefs.html              |   2 +-
 content/settings/defaultpolicy.html           |   2 +-
 content/settings/experimental.html            |  75 +++++++++
 content/settings/experimental.js              | 100 ++++++++++++
 content/settings/subscriptions.html           |   2 +-
 content/settings/yourpolicy.html              |   2 +-
 content/ui/menu.js                            |  99 +++++++++++-
 content/ui/overlay.js                         |  65 +++++++-
 content/ui/xul-trees.js                       |   2 +-
 install.rdf                                   |   9 +-
 locale/de/requestpolicy.properties            |   5 +-
 locale/en-US/requestpolicy.properties         |   3 +
 locale/eo/requestpolicy.properties            |   3 +
 locale/es-MX/requestpolicy.properties         |   3 +
 locale/eu/requestpolicy.properties            |   3 +
 locale/fr/requestpolicy.dtd                   |   8 +-
 locale/fr/requestpolicy.properties            |  79 +++++-----
 locale/it/requestpolicy.properties            |   3 +
 locale/ja/requestpolicy.properties            |   3 +
 locale/ko-KR/requestpolicy.properties         |   3 +
 locale/lv-LV/requestpolicy.properties         |   3 +
 locale/nl/requestpolicy.properties            |   3 +
 locale/pt-BR/requestpolicy.properties         |   3 +
 locale/ru-RU/requestpolicy.properties         |   3 +
 locale/sk-SK/requestpolicy.properties         |   3 +
 locale/sv-SE/requestpolicy.properties         |   3 +
 locale/tr/requestpolicy.properties            |   3 +
 locale/uk-UA/requestpolicy.properties         |   3 +
 locale/zh-CN/requestpolicy.properties         |   3 +
 locale/zh-TW/requestpolicy.properties         |   3 +
 56 files changed, 835 insertions(+), 246 deletions(-)

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