[Pkg-mozext-commits] [tabmixplus] 50/56: Merge with default
David Prévot
taffit at moszumanska.debian.org
Mon Jun 6 00:02:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit a8ad7779aca5e09099527916d1c1bdfb48fa886c
Merge: a7a25c8 9e7c38c
Author: onemen <tabmix.onemen at gmail.com>
Date: Sat Jun 4 17:25:45 2016 +0300
Merge with default
.eslintrc | 408 --------------
.eslintrc.js | 262 +++++++++
.eslintrc_mozilla | 7 -
.hgtags | 5 +
chrome.manifest | 11 -
chrome/content/about.js | 2 +-
chrome/content/about.xul | 8 +-
chrome/content/changecode.js | 28 +-
chrome/content/click/click.js | 154 +++---
chrome/content/content.js | 165 +++++-
chrome/content/extensions/.eslintrc.js | 31 ++
chrome/content/extensions/extensions.js | 162 +++---
chrome/content/extensions/sage.js | 55 +-
chrome/content/flst/lasttab.js | 27 +-
chrome/content/links/contentLinks.js | 3 +-
chrome/content/links/links.xul | 31 +-
chrome/content/links/newTab.js | 1 +
chrome/content/links/removeBlankTab.js | 30 +-
chrome/content/links/setup.js | 57 +-
chrome/content/links/text_link.css | 3 -
chrome/content/links/text_link.xul | 23 -
chrome/content/links/userInterface.js | 129 +----
chrome/content/minit/minit.js | 156 +++---
chrome/content/minit/renameTab.xul | 5 +-
chrome/content/minit/tabView.js | 28 +-
chrome/content/minit/tablib.js | 586 +++++++++------------
chrome/content/overlay/{browsr.css => browser.css} | 24 +-
chrome/content/overlay/firefox.css | 6 +
chrome/content/overlay/tabContextMenu.xul | 8 +-
chrome/content/places/places.js | 137 +++--
chrome/content/preferences/appearance.js | 36 +-
chrome/content/preferences/appearance.xul | 36 +-
chrome/content/preferences/events.js | 15 +-
chrome/content/preferences/events.xul | 19 +-
chrome/content/preferences/links.js | 2 +-
chrome/content/preferences/links.xul | 7 +-
chrome/content/preferences/menu.js | 15 +-
chrome/content/preferences/menu.xul | 4 +-
chrome/content/preferences/mouse.js | 4 +-
chrome/content/preferences/mouse.xul | 2 +-
.../preferences/overlay/incontentPreferences.xul | 10 +-
chrome/content/preferences/overlay/main.xul | 4 +-
.../preferences/overlay/overlaySanitizeUI.js | 5 +
.../preferences/overlay/overlaySanitizeUI.xul | 20 +-
chrome/content/preferences/overlay/preferences.xml | 1 +
.../preferences/overlay/preferencesOverlay.js | 14 +-
chrome/content/preferences/preferences.js | 37 +-
chrome/content/preferences/session.js | 15 +-
chrome/content/preferences/session.xul | 20 +-
chrome/content/preferences/shortcuts.js | 6 +-
chrome/content/preferences/shortcuts.xml | 6 +-
chrome/content/preferences/shortcutsLabels.xml | 1 +
.../preferences/subdialogs/pref-appearance.css | 2 +-
.../preferences/subdialogs/pref-appearance.js | 4 +-
.../preferences/subdialogs/pref-appearance.xml | 10 +-
.../preferences/subdialogs/pref-appearance.xul | 5 +-
.../preferences/subdialogs/pref-filetype.js | 9 +-
.../preferences/subdialogs/pref-filetype.xul | 3 +-
chrome/content/session/promptservice.js | 24 +-
chrome/content/session/promptservice.xul | 8 +-
chrome/content/session/session.js | 441 +++++++---------
chrome/content/session/sessionStore.js | 124 ++---
chrome/content/tab/scrollbox.xml | 18 +-
chrome/content/tab/tab.js | 301 +++++------
chrome/content/tab/tabbrowser.xml | 2 +
chrome/content/tab/tabbrowser_4.xml | 5 +-
chrome/content/tab/tabbrowser_proxy.xml | 1 +
chrome/content/tab/tabmix.xml | 2 +
chrome/content/tab/tabmix_3.xml | 2 +
chrome/content/tab/text.xml | 30 --
chrome/content/tabmix.js | 186 ++++---
chrome/content/tabmix.xul | 4 +-
chrome/content/utils.js | 38 +-
chrome/locale/bg-BG/pref-tabmix.dtd | 8 +-
chrome/locale/bg-BG/session-manager.properties | 20 +-
chrome/locale/bg-BG/tabmix.dtd | 2 -
chrome/locale/bg-BG/tabmix.properties | 1 +
chrome/locale/ca/pref-tabmix.dtd | 8 +-
chrome/locale/ca/session-manager.properties | 16 +-
chrome/locale/ca/tabmix.dtd | 2 -
chrome/locale/ca/tabmix.properties | 1 +
chrome/locale/cs-CZ/pref-tabmix.dtd | 8 +-
chrome/locale/cs-CZ/session-manager.properties | 16 +-
chrome/locale/cs-CZ/tabmix.dtd | 2 -
chrome/locale/cs-CZ/tabmix.properties | 1 +
chrome/locale/da/pref-tabmix.dtd | 8 +-
chrome/locale/da/session-manager.properties | 16 +-
chrome/locale/da/tabmix.dtd | 2 -
chrome/locale/da/tabmix.properties | 1 +
chrome/locale/de/pref-tabmix.dtd | 8 +-
chrome/locale/de/session-manager.properties | 16 +-
chrome/locale/de/tabmix.dtd | 2 -
chrome/locale/de/tabmix.properties | 1 +
chrome/locale/el/pref-tabmix.dtd | 8 +-
chrome/locale/el/session-manager.properties | 16 +-
chrome/locale/el/tabmix.dtd | 2 -
chrome/locale/el/tabmix.properties | 1 +
chrome/locale/en-US/pref-tabmix.dtd | 10 +-
chrome/locale/en-US/session-manager.properties | 16 +-
chrome/locale/en-US/tabmix.dtd | 2 -
chrome/locale/en-US/tabmix.properties | 1 +
chrome/locale/es-ES/pref-tabmix.dtd | 8 +-
chrome/locale/es-ES/session-manager.properties | 16 +-
chrome/locale/es-ES/tabmix.dtd | 2 -
chrome/locale/es-ES/tabmix.properties | 1 +
chrome/locale/et-EE/pref-tabmix.dtd | 8 +-
chrome/locale/et-EE/session-manager.properties | 16 +-
chrome/locale/et-EE/tabmix.dtd | 2 -
chrome/locale/et-EE/tabmix.properties | 1 +
chrome/locale/fa-IR/pref-tabmix.dtd | 8 +-
chrome/locale/fa-IR/session-manager.properties | 16 +-
chrome/locale/fa-IR/tabmix.dtd | 2 -
chrome/locale/fa-IR/tabmix.properties | 1 +
chrome/locale/fr/pref-tabmix.dtd | 8 +-
chrome/locale/fr/session-manager.properties | 16 +-
chrome/locale/fr/tabmix.dtd | 2 -
chrome/locale/fr/tabmix.properties | 1 +
chrome/locale/he-IL/pref-tabmix.dtd | 8 +-
chrome/locale/he-IL/session-manager.properties | 16 +-
chrome/locale/he-IL/tabmix.dtd | 2 -
chrome/locale/he-IL/tabmix.properties | 1 +
chrome/locale/hr-HR/pref-tabmix.dtd | 8 +-
chrome/locale/hr-HR/session-manager.properties | 16 +-
chrome/locale/hr-HR/tabmix.dtd | 2 -
chrome/locale/hr-HR/tabmix.properties | 1 +
chrome/locale/hu-HU/pref-tabmix.dtd | 8 +-
chrome/locale/hu-HU/session-manager.properties | 16 +-
chrome/locale/hu-HU/tabmix.dtd | 2 -
chrome/locale/hu-HU/tabmix.properties | 1 +
chrome/locale/it/pref-tabmix.dtd | 12 +-
chrome/locale/it/session-manager.properties | 16 +-
chrome/locale/it/tabmix.dtd | 2 -
chrome/locale/it/tabmix.properties | 1 +
chrome/locale/ja/pref-tabmix.dtd | 8 +-
chrome/locale/ja/session-manager.properties | 16 +-
chrome/locale/ja/tabmix.dtd | 2 -
chrome/locale/ja/tabmix.properties | 1 +
chrome/locale/ko-KR/pref-tabmix.dtd | 8 +-
chrome/locale/ko-KR/session-manager.properties | 16 +-
chrome/locale/ko-KR/tabmix.dtd | 2 -
chrome/locale/ko-KR/tabmix.properties | 1 +
chrome/locale/nl/pref-tabmix.dtd | 8 +-
chrome/locale/nl/session-manager.properties | 22 +-
chrome/locale/nl/tabmix.dtd | 4 +-
chrome/locale/nl/tabmix.properties | 1 +
chrome/locale/pl/pref-tabmix.dtd | 8 +-
chrome/locale/pl/session-manager.properties | 16 +-
chrome/locale/pl/tabmix.dtd | 2 -
chrome/locale/pl/tabmix.properties | 1 +
chrome/locale/pt-BR/pref-tabmix.dtd | 8 +-
chrome/locale/pt-BR/session-manager.properties | 22 +-
chrome/locale/pt-BR/tabmix.dtd | 4 +-
chrome/locale/pt-BR/tabmix.properties | 1 +
chrome/locale/pt-PT/pref-tabmix.dtd | 8 +-
chrome/locale/pt-PT/session-manager.properties | 16 +-
chrome/locale/pt-PT/tabmix.dtd | 2 -
chrome/locale/pt-PT/tabmix.properties | 1 +
chrome/locale/ro/pref-tabmix.dtd | 8 +-
chrome/locale/ro/session-manager.properties | 16 +-
chrome/locale/ro/tabmix.dtd | 2 -
chrome/locale/ro/tabmix.properties | 1 +
chrome/locale/ru-RU/pref-tabmix.dtd | 8 +-
chrome/locale/ru-RU/session-manager.properties | 36 +-
chrome/locale/ru-RU/tabmix.dtd | 6 +-
chrome/locale/ru-RU/tabmix.properties | 1 +
chrome/locale/sk-SK/pref-tabmix.dtd | 8 +-
chrome/locale/sk-SK/session-manager.properties | 16 +-
chrome/locale/sk-SK/tabmix.dtd | 2 -
chrome/locale/sk-SK/tabmix.properties | 1 +
chrome/locale/sr/pref-tabmix.dtd | 8 +-
chrome/locale/sr/session-manager.properties | 16 +-
chrome/locale/sr/tabmix.dtd | 2 -
chrome/locale/sr/tabmix.properties | 1 +
chrome/locale/sv-SE/pref-tabmix.dtd | 8 +-
chrome/locale/sv-SE/session-manager.properties | 16 +-
chrome/locale/sv-SE/tabmix.dtd | 2 -
chrome/locale/sv-SE/tabmix.properties | 1 +
chrome/locale/tr/pref-tabmix.dtd | 8 +-
chrome/locale/tr/session-manager.properties | 16 +-
chrome/locale/tr/tabmix.dtd | 2 -
chrome/locale/tr/tabmix.properties | 1 +
chrome/locale/uk-UA/pref-tabmix.dtd | 8 +-
chrome/locale/uk-UA/session-manager.properties | 16 +-
chrome/locale/uk-UA/tabmix.dtd | 2 -
chrome/locale/uk-UA/tabmix.properties | 1 +
chrome/locale/vi/pref-tabmix.dtd | 8 +-
chrome/locale/vi/session-manager.properties | 16 +-
chrome/locale/vi/tabmix.dtd | 2 -
chrome/locale/vi/tabmix.properties | 1 +
chrome/locale/zh-CN/pref-tabmix.dtd | 8 +-
chrome/locale/zh-CN/session-manager.properties | 16 +-
chrome/locale/zh-CN/tabmix.dtd | 2 -
chrome/locale/zh-CN/tabmix.properties | 1 +
chrome/locale/zh-TW/pref-tabmix.dtd | 8 +-
chrome/locale/zh-TW/session-manager.properties | 16 +-
chrome/locale/zh-TW/tabmix.dtd | 2 -
chrome/locale/zh-TW/tabmix.properties | 1 +
chrome/skin/app_version/39.0/linux/browser.css | 1 +
chrome/skin/app_version/39.0/tabStyles.css | 28 +-
chrome/skin/app_version/39.0/win/tabStyles.css | 2 +-
chrome/skin/app_version/all/linux/browser.css | 5 +-
chrome/skin/app_version/all/mac/browser.css | 2 +-
chrome/skin/app_version/all/mac/progress.css | 4 +-
chrome/skin/app_version/all/win/browser.css | 4 +-
chrome/skin/app_version/all/win/progress.css | 4 +-
.../skin/app_version/before39.0/linux/browser.css | 1 +
chrome/skin/app_version/before39.0/tabStyles.css | 28 +-
chrome/skin/general.css | 8 +-
chrome/skin/preferences.css | 36 +-
chrome/skin/preferencesOverlay.css | 10 +-
chrome/skin/renameTab.css | 2 +-
chrome/skin/shortcuts.css | 6 +-
chrome/skin/tab.css | 8 +-
defaults/preferences/tabmix.js | 8 +-
install.rdf | 62 +--
modules/AsyncUtils.jsm | 5 +-
modules/ContentClick.jsm | 120 ++---
modules/ContextMenu.jsm | 13 +-
modules/Decode.jsm | 3 +-
modules/DocShellCapabilities.jsm | 7 +-
modules/DownloadLastDir.jsm | 3 +-
modules/DynamicRules.jsm | 39 +-
modules/LinkNodeUtils.jsm | 4 +-
modules/MergeWindows.jsm | 53 +-
modules/Places.jsm | 6 +-
modules/RenameTab.jsm | 5 +-
modules/Services.jsm | 72 ++-
modules/Shortcuts.jsm | 26 +-
modules/SingleWindowModeUtils.jsm | 50 +-
modules/TabGroupsMigrator.jsm | 43 +-
modules/Utils.jsm | 19 +-
modules/extensions/AddonManager.jsm | 4 +-
modules/extensions/CompatibilityCheck.jsm | 95 ++--
modules/extensions/TabGroupsManager.jsm | 14 +-
modules/log.jsm | 73 ++-
235 files changed, 2745 insertions(+), 3065 deletions(-)
diff --cc .hgtags
index fc53bb6,94603a5..9a1bd44
--- a/.hgtags
+++ b/.hgtags
@@@ -141,5 -117,8 +141,10 @@@ f85921a82b1e7b3aaacc387d9385e441363caf0
4cb555e75b8281be818000e09c7080b4d8fea6a3 0.4.2.1pre.160216a1
07a1243bcc5328d15fa1c3f511676d4759a9eaad 0.4.2.1pre.160228a1
2f0191004fdc98ab8887b87c17dfb214a20e8c72 0.4.2.1pre.160228a2
+65833102a784b2e301ff8e04ef7c5730d374d30c 0.4.2.1
+ce4e5a766c5a90b192918e6358c50e9da69f4138 0.4.2.2
+ 0c076e20b96f1917e6bf4234686a6feb9ce2a79f 0.4.2.3pre.160319a1
+ aa6d8706d637d4b68722f4fe030e536692268741 0.4.2.3pre.160328a1
+ 81464dd855c3bdacfb3a69b880d889110276bbc1 0.4.2.3pre.160425a1
+ c2cf885744887fc47a1302f0a3da1e396abbe66b 0.5.0.0pre.160515a1
+ ce044332bd423561f8c557e79ac17d3e8deb7a91 0.5.0.0pre.160522a1
diff --cc install.rdf
index 4257fb2,9e0f339..687414d
--- a/install.rdf
+++ b/install.rdf
@@@ -1,36 -1,38 +1,38 @@@
<?xml version="1.0"?>
- <RDF:RDF xmlns:NS1="http://www.mozilla.org/2004/em-rdf#"
- xmlns:NC="http://home.netscape.com/NC-rdf#"
- xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <RDF:Description RDF:about="urn:mozilla:install-manifest"
- NS1:id="{dc572301-7619-498c-a57d-39143191b318}"
- NS1:name="Tab Mix Plus"
- NS1:version="0.4.2.2"
- NS1:type="2"
- NS1:multiprocessCompatible="true"
- NS1:description="Tab browsing with an added boost."
- NS1:iconURL="chrome://tabmixplus/skin/tmp.png"
- NS1:homepageURL="http://tabmixplus.org"
- NS1:optionsURL="chrome://tabmixplus/content/preferences/preferences.xul"
- NS1:aboutURL="chrome://tabmixplus/content/about.xul"
- NS1:creator="ONEMEN (tabmix.onemen at gmail.com)"
- NS1:developer="ONEMEN">
+ <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+ <Description about="urn:mozilla:install-manifest">
+ <em:id>{dc572301-7619-498c-a57d-39143191b318}</em:id>
+ <em:name>Tab Mix Plus</em:name>
- <em:version>0.5.99</em:version>
++ <em:version>0.4.2.2</em:version>
+ <em:type>2</em:type>
+ <em:multiprocessCompatible>true</em:multiprocessCompatible>
+ <em:description>Tab browsing with an added boost.</em:description>
+ <em:iconURL>chrome://tabmixplus/skin/tmp.png</em:iconURL>
+ <em:homepageURL>http://tabmixplus.org</em:homepageURL>
+ <em:optionsURL>chrome://tabmixplus/content/preferences/preferences.xul</em:optionsURL>
+ <em:aboutURL>chrome://tabmixplus/content/about.xul</em:aboutURL>
+ <em:creator>ONEMEN (tabmix.onemen at gmail.com)</em:creator>
+ <em:developer>ONEMEN</em:developer>
<!-- Firefox -->
- <NS1:targetApplication>
- <RDF:Description RDF:about="rdf:#$n83In3"
- NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
- NS1:minVersion="31.0"
- NS1:maxVersion="47.0a1" />
- </NS1:targetApplication>
+ <em:targetApplication>
+ <Description>
+ <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+ <em:minVersion>31.0</em:minVersion>
+ <em:maxVersion>49.0a1</em:maxVersion>
+ </Description>
+ </em:targetApplication>
<!-- PaleMoon -->
- <NS1:targetApplication>
- <RDF:Description RDF:about="rdf:#$n74Pm2"
- NS1:id="{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}"
- NS1:minVersion="25.0"
- NS1:maxVersion="26.*" />
- </NS1:targetApplication>
+ <em:targetApplication>
+ <Description>
+ <em:id>{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}</em:id>
+ <em:minVersion>25.0</em:minVersion>
+ <em:maxVersion>26.*</em:maxVersion>
+ </Description>
+ </em:targetApplication>
- </RDF:Description>
- </RDF:RDF>
+ </Description>
+ </RDF>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git
More information about the Pkg-mozext-commits
mailing list