[Pkg-mozext-commits] [tabmixplus] 101/107: Merge with default
David Prévot
taffit at moszumanska.debian.org
Tue Dec 29 19:02:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit 5468dc9551f80c800eff5f4515a0528caaf05c44
Merge: a3dd56b b4f68a5
Author: onemen <tabmix.onemen at gmail.com>
Date: Fri Dec 25 09:34:49 2015 +0200
Merge with default
.eslintrc | 432 ++
.hgtags | 5 +
chrome.manifest | 8 +-
chrome/content/about.js | 8 +-
chrome/content/changecode.js | 22 +-
chrome/content/click/click.js | 122 +-
chrome/content/content.js | 188 +-
chrome/content/extensions/extensions.js | 185 +-
chrome/content/extensions/sage.js | 95 +-
chrome/content/extensions/sage.xul | 12 +-
chrome/content/flst/lasttab.js | 697 +-
chrome/content/links/contentLinks.js | 6 +-
chrome/content/links/newTab.js | 40 +-
chrome/content/links/removeBlankTab.js | 4 +-
chrome/content/links/setup.js | 312 +-
chrome/content/links/userInterface.js | 313 +-
chrome/content/minit/autoReload.js | 9 +-
chrome/content/minit/minit.js | 343 +-
chrome/content/minit/tabView.js | 43 +-
chrome/content/minit/tablib.js | 487 +-
chrome/content/overlay/browsr.css | 19 +-
chrome/content/overlay/firefox.css | 17 +
chrome/content/overlay/palemoon.css | 21 +
chrome/content/places/places.js | 756 ++-
chrome/content/preferences/appearance.js | 14 +-
chrome/content/preferences/appearance.xul | 20 +-
chrome/content/preferences/bindings.xml | 2 +-
chrome/content/preferences/events.js | 31 +-
chrome/content/preferences/links.js | 7 +-
chrome/content/preferences/links.xul | 9 +-
chrome/content/preferences/menu.js | 24 +-
chrome/content/preferences/menu.xul | 4 +
chrome/content/preferences/mouse.js | 17 +-
.../preferences/overlay/incontentPreferences.xul | 6 -
.../preferences/overlay/overlaySanitizeUI.js | 19 +-
.../preferences/overlay/preferencesOverlay.js | 111 +-
chrome/content/preferences/preferences.js | 144 +-
chrome/content/preferences/session.js | 21 +-
chrome/content/preferences/session.xul | 6 +-
chrome/content/preferences/shortcuts.js | 23 +-
chrome/content/preferences/shortcuts.xml | 28 +-
chrome/content/preferences/shortcutsLabels.xml | 7 +-
.../preferences/subdialogs/pref-appearance.css | 5 +
.../preferences/subdialogs/pref-appearance.js | 19 +-
.../preferences/subdialogs/pref-appearance.xml | 17 +-
.../preferences/subdialogs/pref-filetype.js | 244 +-
.../preferences/subdialogs/pref-filetype.xul | 3 +-
chrome/content/session/promptservice.js | 466 +-
chrome/content/session/session.js | 6841 ++++++++++----------
chrome/content/session/sessionStore.js | 1831 +++---
chrome/content/tab/scrollbox.xml | 130 +-
chrome/content/tab/tab.js | 573 +-
chrome/content/tab/tabbrowser_4.xml | 6 +-
chrome/content/tab/text.xml | 2 +-
chrome/content/tabmix.js | 259 +-
chrome/content/utils.js | 38 +-
chrome/locale/bg-BG/pref-appearance.dtd | 3 +-
chrome/locale/bg-BG/pref-tabmix.dtd | 2 +-
chrome/locale/ca/pref-appearance.dtd | 3 +-
chrome/locale/ca/pref-tabmix.dtd | 2 +-
chrome/locale/cs-CZ/pref-appearance.dtd | 3 +-
chrome/locale/cs-CZ/pref-tabmix.dtd | 6 +-
chrome/locale/da/pref-appearance.dtd | 3 +-
chrome/locale/da/pref-tabmix.dtd | 2 +-
chrome/locale/de/pref-appearance.dtd | 3 +-
chrome/locale/de/pref-tabmix.dtd | 2 +-
chrome/locale/el/pref-appearance.dtd | 3 +-
chrome/locale/el/pref-tabmix.dtd | 2 +-
chrome/locale/en-US/pref-appearance.dtd | 3 +-
chrome/locale/en-US/pref-tabmix.dtd | 2 +-
chrome/locale/es-ES/pref-appearance.dtd | 3 +-
chrome/locale/es-ES/pref-tabmix.dtd | 2 +-
chrome/locale/et-EE/pref-appearance.dtd | 3 +-
chrome/locale/et-EE/pref-tabmix.dtd | 20 +-
chrome/locale/fa-IR/pref-appearance.dtd | 3 +-
chrome/locale/fa-IR/pref-tabmix.dtd | 2 +-
chrome/locale/fr/pref-appearance.dtd | 3 +-
chrome/locale/fr/pref-tabmix.dtd | 2 +-
chrome/locale/he-IL/pref-appearance.dtd | 3 +-
chrome/locale/he-IL/pref-tabmix.dtd | 2 +-
chrome/locale/hr-HR/pref-appearance.dtd | 3 +-
chrome/locale/hr-HR/pref-tabmix.dtd | 2 +-
chrome/locale/hu-HU/pref-appearance.dtd | 3 +-
chrome/locale/hu-HU/pref-tabmix.dtd | 8 +-
chrome/locale/hu-HU/tabmix.properties | 6 +-
chrome/locale/it/pref-appearance.dtd | 3 +-
chrome/locale/it/pref-tabmix.dtd | 4 +-
chrome/locale/ja/pref-appearance.dtd | 5 +-
chrome/locale/ja/pref-tabmix.dtd | 8 +-
chrome/locale/ko-KR/pref-appearance.dtd | 3 +-
chrome/locale/ko-KR/pref-tabmix.dtd | 2 +-
chrome/locale/nl/pref-appearance.dtd | 3 +-
chrome/locale/nl/pref-tabmix.dtd | 2 +-
chrome/locale/pl/pref-appearance.dtd | 3 +-
chrome/locale/pl/pref-tabmix.dtd | 2 +-
chrome/locale/pt-BR/pref-appearance.dtd | 3 +-
chrome/locale/pt-BR/pref-tabmix.dtd | 2 +-
chrome/locale/pt-PT/pref-appearance.dtd | 3 +-
chrome/locale/pt-PT/pref-tabmix.dtd | 2 +-
chrome/locale/ro/pref-appearance.dtd | 3 +-
chrome/locale/ro/pref-tabmix.dtd | 4 +-
chrome/locale/ru-RU/pref-appearance.dtd | 3 +-
chrome/locale/ru-RU/pref-tabmix.dtd | 4 +-
chrome/locale/ru-RU/tabmix.properties | 4 +-
chrome/locale/sk-SK/pref-appearance.dtd | 3 +-
chrome/locale/sk-SK/pref-tabmix.dtd | 2 +-
chrome/locale/sr/pref-appearance.dtd | 3 +-
chrome/locale/sr/pref-tabmix.dtd | 2 +-
chrome/locale/sv-SE/pref-appearance.dtd | 3 +-
chrome/locale/sv-SE/pref-tabmix.dtd | 2 +-
chrome/locale/tr/pref-appearance.dtd | 3 +-
chrome/locale/tr/pref-tabmix.dtd | 2 +-
chrome/locale/uk-UA/pref-appearance.dtd | 3 +-
chrome/locale/uk-UA/pref-tabmix.dtd | 2 +-
chrome/locale/vi/pref-appearance.dtd | 3 +-
chrome/locale/vi/pref-tabmix.dtd | 2 +-
chrome/locale/zh-CN/pref-appearance.dtd | 3 +-
chrome/locale/zh-CN/pref-tabmix.dtd | 8 +-
chrome/locale/zh-CN/tabmix.properties | 6 +-
chrome/locale/zh-TW/pref-appearance.dtd | 3 +-
chrome/locale/zh-TW/pref-tabmix.dtd | 2 +-
chrome/skin/app_version/39.0/win/browser.css | 24 +-
.../39.0/win/{browser.css => tabStyles.css} | 21 +-
chrome/skin/app_version/41.0/win/browser.css | 30 +
chrome/skin/app_version/all/mac/browser.css | 3 +-
chrome/skin/app_version/all/mac/progress.css | 2 +-
chrome/skin/app_version/all/win/browser.css | 23 +-
chrome/skin/app_version/all/win/progress.css | 2 +-
chrome/skin/app_version/before39.0/win/browser.css | 18 +
chrome/skin/preferences.css | 19 +
defaults/preferences/tabmix.js | 19 +-
install.rdf | 21 +-
modules/AboutNewTab.jsm | 99 +
modules/AsyncUtils.jsm | 6 +-
modules/AutoReload.jsm | 55 +-
modules/ContentClick.jsm | 146 +-
modules/ContextMenu.jsm | 5 +-
modules/Decode.jsm | 12 +-
modules/DocShellCapabilities.jsm | 9 +-
modules/DownloadLastDir.jsm | 3 +-
modules/DynamicRules.jsm | 208 +-
modules/LinkNodeUtils.jsm | 2 +-
modules/MergeWindows.jsm | 33 +-
modules/NewTabURL.jsm | 30 +-
modules/Places.jsm | 92 +-
modules/RenameTab.jsm | 11 +-
modules/Services.jsm | 75 +-
modules/Shortcuts.jsm | 112 +-
modules/SingleWindowModeUtils.jsm | 64 +-
modules/Slideshow.jsm | 19 +-
modules/Utils.jsm | 42 +-
modules/extensions/AddonManager.jsm | 63 +-
modules/extensions/CompatibilityCheck.jsm | 102 +-
modules/extensions/TabGroupsManager.jsm | 17 +-
modules/log.jsm | 47 +-
155 files changed, 9022 insertions(+), 7702 deletions(-)
diff --cc .hgtags
index b378ba2,cfbe641..6c2fe76
--- a/.hgtags
+++ b/.hgtags
@@@ -129,4 -107,8 +129,9 @@@ c0f3653f204e5d6f42633b2c70496fe8851d763
9a66acc65f0108b057c31de9b33a463a0e09f3b3 0.4.1.9pre.150801a2
fa3c152344b7ff75ca855d9ad31d6e50d6c75c2d 0.4.1.9pre.150815a1
14630a99562de7c4a24342ce8b5109a38f20b394 0.4.1.9pre.150819a1
+628f4c45eb9a51365fe9bd99fe04a0c0be1e85e5 0.4.1.9
+ bcf67a1e1e79e7c02782ffdd797de2b55984112a 0.4.2.0pre.151021a1
+ 7380291c712324002e48a6fd7ac28647a0aa930e 0.4.2.0pre.151031a1
+ 8fc9feb70bd613369bfc754709d3adbf0955ac55 0.4.2.0pre.151113a1
+ 0e4a991b7117c194174286b72349aa6fe0d91cdc 0.4.2.0pre.151127a1
+ f85921a82b1e7b3aaacc387d9385e441363caf0c 0.4.2.0pre.151212a1
diff --cc chrome.manifest
index 1fd4620,ad6b8a3..cd39912
--- a/chrome.manifest
+++ b/chrome.manifest
@@@ -84,3 -89,8 +85,6 @@@ skin tabmix-os classic/1.0 ch
style chrome://global/content/customizeToolbar.xul chrome://tabmixplus/skin/tab.css
style chrome://browser/content/preferences/preferences.xul chrome://tabmixplus/skin/preferencesOverlay.css
+
+ style chrome://browser/content/browser.xul chrome://tabmixplus/content/overlay/firefox.css application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
+ style chrome://browser/content/browser.xul chrome://tabmixplus/content/overlay/palemoon.css application={8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}
-
-manifest test.manifest
--
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