[Pkg-mozext-commits] [tabmixplus] 09/09: Merge with default
David Prévot
taffit at moszumanska.debian.org
Mon Aug 4 03:32:02 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to tag 0.4.1.0
in repository tabmixplus.
commit 17c73cbb37b485f23a5976de9087996920c4ef9d
Merge: 0c6499e b49c3cd
Author: onemen <tabmix.onemen at gmail.com>
Date: Mon Apr 8 12:30:31 2013 +0300
Merge with default
.hgtags | 48 +
chrome.manifest | 30 +-
chrome/content/changecode.js | 123 ++
chrome/content/click/click.js | 20 +-
chrome/content/extensions/extensions.js | 39 +-
chrome/content/extensions/sage.js | 2 +
chrome/content/flst/lasttab.js | 4 +-
chrome/content/links/contentLinks.js | 1 +
chrome/content/links/setup.js | 74 +-
chrome/content/links/userInterface.js | 10 +-
chrome/content/minit/minit.js | 244 +---
chrome/content/minit/tabView.js | 562 ++++++++
chrome/content/minit/tablib.js | 104 +-
.../overlay/{browsroverlay4.css => browsr.css} | 86 +-
.../overlay/{browsroverlay17.css => browsr_17.css} | 3 -
chrome/content/overlay/browsroverlay_base.css | 87 --
chrome/content/places/places.js | 60 +-
chrome/content/pref/pref-appearance.js | 35 -
chrome/content/pref/pref-tabmix.js | 1341 -------------------
chrome/content/pref/pref-tabmix.xul | 1345 --------------------
chrome/content/preferences/appearance.js | 153 +++
chrome/content/preferences/appearance.xul | 290 +++++
chrome/content/preferences/bindings.xml | 49 +
chrome/content/preferences/events.js | 125 ++
chrome/content/preferences/events.xul | 392 ++++++
chrome/content/preferences/incompatible.xul | 34 +
chrome/content/preferences/links.js | 56 +
chrome/content/preferences/links.xul | 116 ++
chrome/content/preferences/menu.js | 104 ++
chrome/content/preferences/menu.xul | 335 +++++
chrome/content/preferences/mouse.js | 69 +
chrome/content/preferences/mouse.xul | 192 +++
.../overlay}/incontentPreferences.xul | 2 +-
.../overlay}/overlaySanitizeUI.js | 2 +
.../overlay}/overlaySanitizeUI.xul | 2 +-
.../overlay}/preferencesOverlay.js | 4 +-
.../overlay}/preferencesOverlay.xul | 0
.../{pref => preferences/overlay}/tab_panel.xul | 0
chrome/content/preferences/preferences.js | 531 ++++++++
chrome/content/preferences/preferences.xul | 71 ++
chrome/content/preferences/session.js | 129 ++
chrome/content/preferences/session.xul | 282 ++++
.../{pref/shortcuts => preferences}/shortcuts.js | 0
.../{pref/shortcuts => preferences}/shortcuts.xml | 10 +-
.../{pref/shortcuts => preferences}/shortcuts.xul | 8 +-
.../subdialogs}/pref-appearance.css | 4 +-
.../preferences/subdialogs/pref-appearance.js | 42 +
.../subdialogs}/pref-appearance.xml | 61 +-
.../subdialogs}/pref-appearance.xul | 12 +-
.../subdialogs}/pref-filetype.js | 2 +
.../subdialogs}/pref-filetype.xul | 2 +-
chrome/content/session/promptservice.js | 2 +
chrome/content/session/session.js | 609 ++-------
chrome/content/session/sessionStore.js | 48 +-
chrome/content/tab/scrollbox.xml | 53 +-
chrome/content/tab/tab.js | 249 ++--
chrome/content/tab/tabbrowser_4.xml | 30 +-
chrome/content/tabmix.js | 152 +--
chrome/content/tabmix.xul | 4 +-
chrome/content/utils.js | 397 +-----
chrome/locale/ar/shortcuts.dtd | 20 +-
chrome/locale/bg-BG/pref-appearance.dtd | 1 +
chrome/locale/ca/pref-appearance.dtd | 1 +
chrome/locale/cs-CZ/pref-appearance.dtd | 1 +
chrome/locale/da/pref-appearance.dtd | 1 +
chrome/locale/de/pref-appearance.dtd | 1 +
chrome/locale/el/pref-appearance.dtd | 1 +
chrome/locale/en-US/pref-appearance.dtd | 1 +
chrome/locale/es-ES/pref-appearance.dtd | 1 +
chrome/locale/et-EE/pref-appearance.dtd | 1 +
chrome/locale/fa-IR/pref-appearance.dtd | 1 +
chrome/locale/fr/pref-appearance.dtd | 1 +
chrome/locale/he-IL/pref-appearance.dtd | 1 +
chrome/locale/hr-HR/pref-appearance.dtd | 1 +
chrome/locale/hu-HU/pref-appearance.dtd | 1 +
chrome/locale/hu-HU/pref-tabmix.dtd | 10 +-
chrome/locale/hu-HU/session-manager.properties | 4 +-
chrome/locale/hu-HU/shortcuts.dtd | 28 +-
chrome/locale/hu-HU/tabmix.properties | 64 +-
chrome/locale/it/pref-appearance.dtd | 1 +
chrome/locale/it/tabmix.dtd | 4 +-
chrome/locale/ja/pref-appearance.dtd | 1 +
chrome/locale/ja/pref-tabmix.dtd | 2 +-
chrome/locale/ko-KR/pref-appearance.dtd | 1 +
chrome/locale/nl/pref-appearance.dtd | 1 +
chrome/locale/pl/pref-appearance.dtd | 1 +
chrome/locale/pt-BR/pref-appearance.dtd | 1 +
chrome/locale/pt-PT/pref-appearance.dtd | 1 +
chrome/locale/ro/pref-appearance.dtd | 1 +
chrome/locale/ro/pref-tabmix.dtd | 2 +-
chrome/locale/ro/shortcuts.dtd | 16 +-
chrome/locale/ro/tabmix.properties | 16 +-
chrome/locale/ru-RU/pref-appearance.dtd | 1 +
chrome/locale/sk-SK/pref-appearance.dtd | 1 +
chrome/locale/sr/pref-appearance.dtd | 1 +
chrome/locale/sv-SE/pref-appearance.dtd | 1 +
chrome/locale/tr/pref-appearance.dtd | 1 +
chrome/locale/uk-UA/pref-appearance.dtd | 1 +
chrome/locale/vi/pref-appearance.dtd | 1 +
chrome/locale/zh-CN/pref-appearance.dtd | 1 +
chrome/locale/zh-TW/pref-appearance.dtd | 1 +
chrome/skin/preferences.css | 298 ++++-
.../{preferences.css => preferencesOverlay.css} | 0
chrome/skin/prefs.css | 355 ------
chrome/skin/shortcuts.css | 117 ++
defaults/preferences/tabmix.js | 24 -
install.rdf | 2 +-
modules/AutoReload.jsm | 2 +
modules/Decode.jsm | 2 +
modules/MergeWindows.jsm | 1 +
modules/RenameTab.jsm | 2 +
modules/Services.jsm | 40 +
modules/Shortcuts.jsm | 11 +-
modules/SingleWindowModeUtils.jsm | 13 +-
modules/Slideshow.jsm | 2 +
modules/extensions/CompatibilityCheck.jsm | 2 +
modules/extensions/SessionManagerAddon.jsm | 77 ++
modules/extensions/TabGroupsManager.jsm | 2 +
modules/log.jsm | 98 +-
119 files changed, 5084 insertions(+), 5002 deletions(-)
diff --cc .hgtags
index e664793,5681d27..a0f3183
--- a/.hgtags
+++ b/.hgtags
@@@ -1,7 -1,48 +1,55 @@@
+c9e57d39c7c59c970977450d67f7df9264b8ee88 0.4.0
+eaa8b78930ad7fcff9773be9f8fc13ebcf6e219e 0.4.0.1
+dd9917881b73ce183029dfc9c45a7d2af686e9b7 0.4.0.2
+7d813eafe65e7ab4d3a6deb05a6cc16f6612c516 0.4.0.3
+a510b9b4e763f8156c93e7963f2c1c10b9570720 0.4.0.3.1
+6dc69afdfc77df8e570d8cd837cb620427c7704a 0.4.0.4
+c9ae3e463cff223c5c05566bbdd6a8cecc141da9 0.4.0.5
+ 26c11c46e80c113f10af4f19affe13c8a9f2f909 0.4.0pre.111126a
+ cef56fa1b49a8800c6740517ebe4cd53862c3590 0.4.0pre.111127a
+ f7fa1366c51ca9a3ec4449ccfed5429f8cb203a3 0.4.0pre.111128a
+ 7e72886fb37afc851fbdb8e9b0c3d5b2acdc3fdf 0.4.0pre.111129a
+ af775b8d5680eb34f4bf0653deab6633caf8ed75 0.4.0pre.111206a
+ 40018f45c6d3413bdf3789f9d64ee9a65bbf1516 0.4.0pre.111208a
+ f8a45fa302e3706b315851dedeffbe636db17b3f 0.4.0pre.111209a
+ ec4d99ffa2719c8b1eabe9cbddd94c22ba1ef0fa 0.4.0pre.111215a
+ b77ad4d3d8345488278d9549cba6ec51cd167ae3 0.4.0pre.111220a
+ fb205495879b070832c7c6f2922acfc4528a5532 0.4.0pre.111223a
+ c0ab70868e9d0b157cffd63219092f8d004f3800 0.4.0pre.120102a
+ 269321b038dfac2ab0c4de2e23ed332997f6e38e 0.4.0pre.120114a
+ d7b673624f616d17984241f4afb79ac667b48065 0.4.0pre.120118a
+ 72cfbce61d5172ad8bed4cea58b09213991f3419 0.4.0pre.120129a
+ 55a2f481c5220ef695565741309dce8126d4a544 0.4.0pre.120130a
+ 6dd2851821e73ba27a59fb3d0eb5bc37b1241a9a 0.4.0pre.120204a
+ dedfdec880e26890fdbb40cc8760e4d215328f28 0.4.0.1pre.120227a
+ f2b95cef717104761f1f9b3f778219eb5229f0ac 0.4.0.1pre.120302a
+ a74d07614bdfb3db1457d4eb7d289e4fa4022f07 0.4.0.1pre.120308a
+ 074bf87825c68c02705aebe4b79378b6c3ec1afa 0.4.0.2pre.120330a
+ a77e9e2f446d6c2b9e0b4d0cd854af4cde0a3dd7 0.4.0.2pre.120405a
+ 8475741b8136a85d9a39d999e51d09eb810d213a 0.4.0.2pre.120407a
+ ec057c84f9d8f9298be4fb52e9df0891a55d4d1f 0.4.0.2pre.120407b
+ 51aaff20856987e782fef7ce8ed727cd2bcb6339 0.4.0.2pre.120416a
+ 6c0faf11fe03bb67cde411db7eec33864dc95f13 0.4.0.2pre.120417a
+ 8bb083682bec78cfe87a80c6d99d447b0370c99a 0.4.0.2pre.120507a
+ e99ae4035afd615325efe2491937d8300e7daf6e 0.4.0.3pre.120518a
+ e28ee7eff4335ba542e6b43b1d9e73e079888690 0.4.0.3pre.120618a
+ d09a89f60571e3833bf55f1a7240c9227b0c95fa 0.4.0.3pre.120620a
+ df34f148fd512a09b41da35e90c9dc6177c95d8c 0.4.0.3pre.120622a
+ 504644061675f34ea9b651cb832e9eccecf80d70 0.4.0.3pre.120627a
+ 74eea7d3f0a88f9e8d11930b6385b55d99c130ce 0.4.0.3pre.120707a
+ ec254a3445dc2729751ba337c2513c99b2b7831a 0.4.0.4pre.121214a
+ daf6029ed6d64e91a88cf5080ae3c1007ea428a3 0.4.0.4pre.121222a
+ 9b667f97338c4df23551694a76d49c422235bb3d 0.4.0.4pre.121222b
+ e0027c415d55fa7736a6fb7c76e00dbda7d091b0 0.4.0.5pre.130114a
+ ad346885bb91bc1ef0d00b06d9e29a0d96fd0f42 0.4.0.5pre.130120a
+ f5468ca27ad5f69f3f939ac52122da5a0dc0c19e 0.4.0.5pre.130201a
+ f8f93dde3b2cda5c44459d2dc5a3d019c0609a00 0.4.0.5pre.130201b
+ a307471ac23a13efcdf9369a183ebe8252035586 0.4.0.5pre.130210a
+ 34708e1196dfbe682bf07c7ba8d2f6da6452c8a5 0.4.0.5pre.130217a
+ 548471b425acfc700426ba784ec5d6d49f65079a 0.4.0.5pre.130223a
+ 752d227ce31c2a677227c01c4b38ff9c169fb253 0.4.0.1pre.120313a
+ 200edc9e70244b763b179f7b2d7eba06df3ab04b 0.4.0.3pre.120719a
+ 6b76cacd3ea8ddd788355747bf6b9166b14d94d3 0.4.0.3pre.120724a
+ c1c96713d890e75aafe302c417b826855fd69af0 0.4.0.4pre.121231a
+ 54df8fc95b89331c553c81ecefdf81fec8967f11 0.4.0.6pre.130226a
+ 532893659cbcc346fa16f8ad641bc10ec18e24d8 0.4.0.6pre.130316a
diff --cc chrome.manifest
index 3b33c3b,1ce3d09..c21049f
--- a/chrome.manifest
+++ b/chrome.manifest
@@@ -1,7 -1,7 +1,6 @@@
content tabmixplus chrome/content/
- skin tabmixplus classic/1.0 chrome/skin/
resource tabmixplus modules/
-locale tabmixplus ar chrome/locale/ar/
locale tabmixplus bg-BG chrome/locale/bg-BG/
locale tabmixplus ca chrome/locale/ca/
locale tabmixplus cs-CZ chrome/locale/cs-CZ/
@@@ -63,16 -66,16 +62,13 @@@ overlay chrome://sage/content/sage.xu
overlay chrome://wizzrss/content/wizzrss.xul chrome://tabmixplus/content/extensions/wizzrss.xul
overlay chrome://wizzrss/content/feedster.xul chrome://tabmixplus/content/extensions/wizzrss.xul
- style chrome://global/content/customizeToolbar.xul chrome://tabmixplus/skin/tab.css
- style chrome://browser/content/preferences/preferences.xul chrome://tabmixplus/skin/preferences.css
-
- style chrome://browser/content/browser.xul chrome://tabmixplus/content/overlay/browsroverlay4.css appversion<17
- style chrome://browser/content/browser.xul chrome://tabmixplus/content/overlay/browsroverlay17.css appversion>=17
- style chrome://browser/content/browser.xul chrome://tabmixplus/skin/app_version/4.0/win/browser_xp15.css appversion<16 os=WINNT osversion<6
- style chrome://browser/content/browser.xul chrome://tabmixplus/skin/app_version/4.0/win/browser_xp16.css appversion>=16 os=WINNT osversion<6
-
- skin tabmix-os tabmixplus chrome://tabmixplus/skin/app_version/4.0/win/ os=WINNT
- skin tabmix-os tabmixplus chrome://tabmixplus/skin/app_version/4.0/mac/ os=Darwin
- skin tabmix-os tabmixplus chrome://tabmixplus/skin/app_version/4.0/linux/ os=Linux
+ skin tabmixplus classic/1.0 chrome/skin/
+ skin tabmix-os classic/1.0 chrome/skin/app_version/4.0/win/ os=WINNT
+ skin tabmix-os classic/1.0 chrome/skin/app_version/4.0/mac/ os=Darwin
+ skin tabmix-os classic/1.0 chrome/skin/app_version/4.0/linux/ os=Linux
-
+ style chrome://browser/content/browser.xul chrome://tabmixplus/content/overlay/browsr_17.css appversion>=17
+ style chrome://browser/content/browser.xul chrome://tabmixplus/skin/app_version/4.0/win/browser_xp15.css os=WINNT osversion<6 appversion<16
+ style chrome://browser/content/browser.xul chrome://tabmixplus/skin/app_version/4.0/win/browser_xp16.css os=WINNT osversion<6 appversion>=16
- style chrome://browser/content/browser.xul chrome://tabmix-os/skin/browser.css
+ style chrome://global/content/customizeToolbar.xul chrome://tabmixplus/skin/tab.css
+ style chrome://browser/content/preferences/preferences.xul chrome://tabmixplus/skin/preferencesOverlay.css
-
-manifest test.manifest
diff --cc install.rdf
index ec54e64,bf6d6f2..8c24e5e
--- a/install.rdf
+++ b/install.rdf
@@@ -10,10 -10,12 +10,10 @@@
NS1:description="Tab browsing with an added boost."
NS1:iconURL="chrome://tabmixplus/skin/tmp.png"
NS1:homepageURL="http://tmp.garyr.net"
- NS1:optionsURL="chrome://tabmixplus/content/pref/pref-tabmix.xul"
- NS1:updateURL="http://tmp.garyr.net/updates-dev.rdf"
+ 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"
- NS1:updateKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmemitmxKFPUxOApIk0IiE9MTdDpoLpEEZpVIeeE5apzQcRPvq2ZoL9SAi1/nwVmGGa+jenml0dU6iDA42b8NkbcoFAruED77AUWfB4OKDtZ7oBpzTbcNmeWsJQkQuff2Kj0upIvzQ5ZU8lZn5YI9NQYXIDMtBWhG7N5Pqw27bMQIDAQAB">
+ NS1:developer="ONEMEN">
<NS1:targetApplication RDF:resource="rdf:#$n83In3"/>
</RDF:Description>
<RDF:Description RDF:about="rdf:#$n83In3"
--
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