[Pkg-mozext-commits] [tabmixplus] 11/47: Merge with default
David Prévot
taffit at moszumanska.debian.org
Fri Sep 26 20:57:00 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch upstream
in repository tabmixplus.
commit 641d949c880cdf5b4eca118866632306a6fb5cce
Merge: 08aef35 fe5339a
Author: onemen <tabmix.onemen at gmail.com>
Date: Fri Sep 19 10:21:44 2014 +0300
Merge with default
.hgtags | 7 +
chrome.manifest | 14 +-
chrome/content/changecode.js | 4 +-
chrome/content/click/click.js | 117 ++-
chrome/content/content.js | 207 +++++
chrome/content/extensions/extensions.js | 41 +-
chrome/content/flst/lasttab.js | 23 +-
chrome/content/links/contentLinks.js | 855 +--------------------
chrome/content/links/setup.js | 77 +-
chrome/content/links/userInterface.js | 9 +-
chrome/content/minit/minit.js | 189 ++++-
chrome/content/minit/tabView.js | 42 +-
chrome/content/minit/tablib.js | 76 +-
chrome/content/overlay/browsr.css | 35 +-
chrome/content/overlay/tabContextMenu.xul | 17 +-
chrome/content/overlay/tabstoolbar.xul | 21 +
chrome/content/places/places.js | 21 +-
chrome/content/preferences/appearance.js | 2 +-
chrome/content/preferences/bindings.xml | 3 +-
chrome/content/preferences/links.js | 6 +-
chrome/content/preferences/menu.js | 11 +
chrome/content/preferences/menu.xul | 4 +
chrome/content/preferences/mouse.js | 12 +-
chrome/content/preferences/mouse.xul | 11 +-
.../preferences/overlay/incontentPreferences.xul | 24 +-
chrome/content/preferences/overlay/main.xul | 37 +
chrome/content/preferences/overlay/preferences.css | 5 +
chrome/content/preferences/overlay/preferences.xml | 36 +
.../preferences/overlay/preferencesOverlay.js | 160 +---
.../preferences/overlay/preferencesOverlay.xul | 24 -
.../overlay/{tab_panel.xul => tabs.xul} | 11 +
chrome/content/preferences/preferences.js | 2 +-
chrome/content/preferences/session.xul | 4 +
chrome/content/session/promptservice.js | 4 +-
chrome/content/session/session.js | 743 ++++++++----------
chrome/content/session/sessionStore.js | 12 +-
chrome/content/tab/scrollbox.xml | 151 +++-
chrome/content/tab/tab.js | 338 ++++----
chrome/content/tab/tabbrowser_4.xml | 117 ++-
chrome/content/tab/text.xml | 3 +-
chrome/content/tabmix.js | 239 ++++--
chrome/content/tabmix.xul | 18 +-
chrome/locale/bg-BG/pref-tabmix.dtd | 2 +-
chrome/locale/bg-BG/tabmix.dtd | 2 +-
chrome/locale/ca/pref-tabmix.dtd | 4 +-
chrome/locale/cs-CZ/pref-tabmix.dtd | 22 +-
chrome/locale/da/pref-tabmix.dtd | 4 +-
chrome/locale/de/pref-tabmix.dtd | 8 +-
chrome/locale/el/pref-tabmix.dtd | 2 +-
chrome/locale/en-US/pref-tabmix.dtd | 1 +
chrome/locale/es-ES/pref-tabmix.dtd | 4 +-
chrome/locale/et-EE/pref-tabmix.dtd | 4 +-
chrome/locale/fa-IR/pref-tabmix.dtd | 4 +-
chrome/locale/fr/pref-tabmix.dtd | 2 +-
chrome/locale/he-IL/pref-tabmix.dtd | 4 +-
chrome/locale/hr-HR/pref-tabmix.dtd | 4 +-
chrome/locale/hu-HU/pref-appearance.dtd | 10 +-
chrome/locale/hu-HU/pref-tabmix.dtd | 2 +-
chrome/locale/it/pref-tabmix.dtd | 4 +-
chrome/locale/ja/pref-tabmix.dtd | 14 +-
chrome/locale/ko-KR/pref-tabmix.dtd | 4 +-
chrome/locale/nl/pref-appearance.dtd | 10 +-
chrome/locale/nl/pref-tabmix.dtd | 4 +-
chrome/locale/pl/pref-tabmix.dtd | 2 +-
chrome/locale/pt-BR/pref-tabmix.dtd | 2 +-
chrome/locale/pt-PT/pref-tabmix.dtd | 4 +-
chrome/locale/ro/pref-tabmix.dtd | 14 +-
chrome/locale/ro/tabmix.properties | 6 +-
chrome/locale/ru-RU/pref-tabmix.dtd | 2 +-
chrome/locale/sk-SK/pref-tabmix.dtd | 2 +-
chrome/locale/sr/pref-tabmix.dtd | 2 +-
chrome/locale/sv-SE/pref-tabmix.dtd | 4 +-
chrome/locale/tr/pref-tabmix.dtd | 4 +-
chrome/locale/uk-UA/misc.dtd | 12 +-
chrome/locale/uk-UA/pref-appearance.dtd | 20 +-
chrome/locale/uk-UA/pref-tabmix.dtd | 168 ++--
chrome/locale/uk-UA/session-manager.properties | 6 +-
chrome/locale/uk-UA/shortcuts.dtd | 28 +-
chrome/locale/uk-UA/tabmix.dtd | 8 +-
chrome/locale/uk-UA/tabmix.properties | 12 +-
chrome/locale/vi/pref-tabmix.dtd | 4 +-
chrome/locale/zh-CN/pref-tabmix.dtd | 2 +-
chrome/locale/zh-TW/pref-tabmix.dtd | 2 +-
chrome/skin/app_version/4.0/general.css | 60 +-
chrome/skin/app_version/4.0/linux/browser.css | 13 +-
chrome/skin/app_version/4.0/mac/browser.css | 16 +
chrome/skin/app_version/4.0/win/browser.css | 24 +-
chrome/skin/preferencesOverlay.css | 26 +-
chrome/skin/tab.css | 14 +-
defaults/preferences/tabmix.js | 6 +-
install.rdf | 1 +
modules/AutoReload.jsm | 72 +-
.../contentLinks.js => modules/ContentClick.jsm | 707 +++++++++++------
modules/ContextMenu.jsm | 76 ++
modules/DocShellCapabilities.jsm | 96 +++
modules/MergeWindows.jsm | 2 +-
modules/Places.jsm | 15 +-
modules/RenameTab.jsm | 2 +-
modules/Services.jsm | 21 +
modules/SingleWindowModeUtils.jsm | 3 +-
modules/extensions/TabGroupsManager.jsm | 48 +-
modules/log.jsm | 37 +-
102 files changed, 2839 insertions(+), 2551 deletions(-)
diff --cc .hgtags
index 571980d,620c8af..4974ef4
--- a/.hgtags
+++ b/.hgtags
@@@ -89,9 -76,13 +89,16 @@@ b40faaa000de2a2df9fc74de6e29ae63f036bf9
2026114acf0e2ee0ed59ef48caca422c41845e7f 0.4.1.3pre.131218a1
5b22828149cfaf9bc0730a32b066def1b4883bb7 0.4.1.3pre.131218a2
83a3fbf15cdf335591de39bb9133ed45bcc1976b 0.4.1.3pre.140204a1
+397bbb03e4233e34b9db1e7936079323cbf2ff02 0.4.1.3
e97b35a1d06ba2f9d265d114845551ecb11b5dfa 0.4.1.3.1pre.140215a1
+4765c21b08fe8325b3382a6ffcd3de2403e94b9d 0.4.1.3.1
51ce27c62c740c8535c1bcfaefc5c225a2678411 0.4.1.4pre.140414a1
9c15148becd4b56e584ae0ce2fb1714e58c74d40 0.4.1.4pre.140613a1
+f2ce023091db6a83155863f29ff603079d8fda1d 0.4.1.4
+ c010910934edbc4b49286802e68501545bbcff73 0.4.1.5pre.140802a1
+ 355eea56e27e9babfdce863550ad2d9054cfa83b 0.4.1.5pre.140824a1
+ fc82dea49309daf7725c4ae27a4db80d596814c5 0.4.1.5pre.140831a1
+ 15073de3d80c04b28cbda711b31f206efd72aba5 0.4.1.5pre.140903a1
+ 38a2718220707b69472e9bd03a64437cb40c0d9c 0.4.1.5pre.140903a2
+ a296ee80860577dbdac700b6a3711a969d983392 0.4.1.5pre.140913a2
+ 69f66a49d945c0d1d327aa95be5f7ccd23cdaeb1 0.4.1.5pre.140913a3
diff --cc install.rdf
index dd39c4c,7b29364..63cc78a
--- a/install.rdf
+++ b/install.rdf
@@@ -5,8 -5,9 +5,9 @@@
<RDF:Description RDF:about="urn:mozilla:install-manifest"
NS1:id="{dc572301-7619-498c-a57d-39143191b318}"
NS1:name="Tab Mix Plus"
- NS1:version="0.4.99"
+ NS1:version="0.4.1.4"
NS1:type="2"
+ NS1:multiprocessCompatible="true"
NS1:description="Tab browsing with an added boost."
NS1:iconURL="chrome://tabmixplus/skin/tmp.png"
NS1:homepageURL="http://tmp.garyr.net"
--
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