Carsten "Tomcat" Book
af394a68f4
Merge mozilla-central to fx-team
2014-06-26 15:53:44 +02:00
Carsten "Tomcat" Book
39ff1551ea
merge fx-team to mozilla-central a=merge
2014-06-26 15:33:24 +02:00
Gregory Szorc
5204495185
Bug 1029031 - Bustage followup to b77106f50779
...
Fixed bad patch change that was made before landing. Derp.
--HG--
extra : amend_source : 6d49ce3db4908a75f9c3ec2931ed97fb41e1f9ff
2014-06-25 23:21:23 -07:00
Gregory Szorc
90626e2426
Bug 1029031 - Record default search provider in FHR; r=bsmedberg, MattN
...
--HG--
extra : rebase_source : 7e3c2688db567bac8760c405d9e9d7d41e8564d9
extra : amend_source : a5f4264ec947ae27e3036018034e0b17bf1e8590
2014-06-25 12:44:00 -07:00
Gregory Szorc
e69630a4f8
Bug 1029031 - Rewrite test to use tasks; r=MattN
...
An upcoming patch will add more code to
browser_urlbar_search_healthreport.js. We now have support for running
tasks in bc tests, so let's use it to make my life easier.
--HG--
extra : rebase_source : 2fbec7c264f7ebaa8b9abd49694ae56c4d74b7c7
extra : amend_source : 551ee4c0e87f42cd44c9b5395278b56dfbc89b90
2014-06-25 12:38:37 -07:00
Wes Kocher
c8c625d1b9
Merge m-c to fx-team a=merge
2014-06-25 18:44:50 -07:00
Tim Taubert
58ac756975
Bug 993013 - Fix 'this._cps2 is undefined' errors in test runs r=adw
2014-06-25 16:30:17 +02:00
Mark Banner
58a1857c2c
Bug 1030103 Loop button doesn't overflow when window width is reduced. r=mconley
2014-06-26 09:00:07 +01:00
David Keeler
84c9f4219e
bug 1029797 - remove redundant "Security information for this page" section of Page Info window r=dao
2014-06-24 14:31:06 -07:00
David Keeler
42c8d55f8f
bug 1029862 - hide unnecessary 'which is run by (unknown)' text in site identity popup for domain validated sites r=dao
2014-06-24 15:12:52 -07:00
Jim Blandy
4d6a633bba
Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
...
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):
- Never set the buffer's mode.
Years ago, Emacs did not have a good JavaScript mode, so it made sense
to use Java or C++ mode in .js files. However, Emacs has had js-mode for
years now; it's perfectly serviceable, and is available and enabled by
default in all major Emacs packagings.
Selecting a mode in the -*- file variable line -*- is almost always the
wrong thing to do anyway. It overrides Emacs's default choice, which is
(now) reasonable; and even worse, it overrides settings the user might
have made in their '.emacs' file for that file extension. It's only
useful when there's something specific about that particular file that
makes a particular mode appropriate.
- Correctly propagate settings that establish the correct indentation
level for this file: c-basic-offset and js2-basic-offset should be
js-indent-level. Whatever value they're given should be preserved;
different parts of our tree use different indentation styles.
- We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
Remove tab-width: settings, at least in files that don't contain tab
characters.
- Remove js2-mode settings that belong in the user's .emacs file, like
js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
Brian R. Bondy
8bf75b11c9
Bug 1017156 - Fix tests for blank tab name now expected in TabOpen event. r=dao
2014-06-24 09:45:38 -04:00
Brian R. Bondy
a8377bf6ce
Bug 1017156 - about:preferences briefly shows as the tab title when opening the in-content preferences. r=dao
2014-06-24 09:45:31 -04:00
Ryan VanderMeulen
bdd2586316
Merge m-c to fx-team. a=merge
2014-06-23 10:59:41 -04:00
Paul Rouget
b3534d1700
Bug 1028014 - webide should be named webide, not app manager. r=dcamp
2014-06-23 17:36:11 +08:00
Jared Wein
50ca7c7998
Bug 754304 - make in-content preferences linkable via URL, follow-up to use the ignoreFragment API change that bug 1025195 landed. r=me
...
--HG--
extra : rebase_source : 6405245a2ccfdd09cc3cad86cf846d8c71c5abf7
2014-06-20 00:32:58 -04:00
Jared Wein
8242d9a4cc
Bug 754304 - make in-content preferences linkable via URL. r=mattn
2014-06-19 16:12:52 -04:00
Birunthan Mohanathas
ec8396a564
Bug 1016240 - Exterminate CR+LF line endings. r=briansmith,cpearce,ehsan,gavin
2014-06-18 17:56:02 -07:00
Jared Wein
dad32a197c
Bug 1025195 - switchToTabHavingURI should have an option to ignore URL hashes when looking for already opened tabs. r=dao
...
--HG--
extra : rebase_source : 02cf11785573131ac8d0b267512e4cf93c43eb31
2014-06-17 10:01:41 -04:00
Drew Willcoxon
e71f047ea2
Bug 1021110 - Icons in about:newtab's search panel should be high-res (2x DPI) on high-res displays. r=ttaubert
2014-06-17 15:23:52 -07:00
Gijs Kruitbosch
58d2f9b243
Bug 934103 - aURL is undefined, r=dao
...
--HG--
extra : rebase_source : f2a98e2ebf7ed8237518d429ce3ee0ca1dc4c943
2014-06-17 16:05:10 +01:00
Ryan VanderMeulen
582d76eaeb
Merge m-c to fx-team. a=merge
2014-06-17 15:42:06 -04:00
Drew Willcoxon
30da9098aa
Bug 1019990 - about:newtab preloader should load content.js. r=ttaubert
2014-06-17 12:35:34 -07:00
Drew Willcoxon
2d91185496
Bug 1019991 - about:newtab should lazily build its search panel popup. r=ttaubert
2014-06-17 12:35:34 -07:00
Drew Willcoxon
b56d2e57b4
Bug 1019989 - ContentSearch should pass images as shared ArrayBuffers instead of data URI strings. r=felipe
2014-06-17 12:35:34 -07:00
Carsten "Tomcat" Book
86bbfb82a8
merge fx-team to mozilla-central a=merge
2014-06-17 14:09:46 +02:00
Allison Naaktgeboren
2f07e9e88c
Bug 1016138 followup - only call add on the master-password probe when a MP is enabled. r=markh
2014-06-17 10:03:47 +10:00
Neil Deakin
d1e2ff665c
Bug 994117, disable transition for popups in social tests, r=mixedpuppy
2014-06-16 14:43:10 -04:00
Mike Conley
e41e74bb92
Bug 988133 - Workaround crashes in nsDocShellEditorData::ReattachToWindow() when doing view source in a remote tab. r=felipe.
...
This bug works around the crash by not retrieving the document from the cache, but by
hitting the network again for the document source. That's clearly not ideal, but the
crash is worse. This is a band-aid solution until we can get the cache retrieval
working properly. This workaround should not ride the trains to release.
2014-06-13 14:22:06 -04:00
Mark Hammond
70a112711b
Bug 1016138 - Add telemetry probe for master password usage. r=dolske
2014-06-14 11:45:52 +10:00
Patrick Brosset
a77341d73c
Bug 1014547 - Add a css transform highlighter to the style-inspector; r=bgrins
2014-06-13 16:27:10 +02:00
Florian Quèze
13b7c7896a
Bug 1000253 - Background tabs with persistent device permissions can access devices without the user noticing, r=jesup,MattN.
2014-06-13 14:51:12 +02:00
Mark Hammond
e5f8195ef1
Bug 1023734 - make show() method sane and remove hide() method in about:accounts. r=ttaubert
2014-06-12 13:01:04 +10:00
Gijs Kruitbosch
a8383c76d9
Bug 908534 - test that chromeUI notification is shown for about:support when opened as a new tab, r=ttaubert
2014-06-11 11:56:30 +01:00
Shashank Sabniveesu
aaab06bdc3
Bug 1022214 - Remove the obsolete mTabstripCloseButton property. r=dao
2014-06-11 11:55:44 +02:00
Ed Lee
55480a23b3
Bug 975235 - Send click pings for Directory Tiles (including which link, tile, other metadata) [r=adw]
...
Send a ping from the DirectoryLinks module on various click actions from newtab page.
2014-06-09 22:03:23 -07:00
Mark Banner
e9c2b2dd2d
Merge Elm to m-c. a=merge
2014-06-09 23:04:43 +01:00
Ryan VanderMeulen
e8706596e2
Merge fx-team to m-c. a=merge
2014-06-09 16:47:38 -04:00
Ed Morley
9007c5ebe4
Merge mozilla-central and inbound
2014-06-09 17:18:00 +01:00
Masayuki Nakano
c2c42b4d67
Bug 1020832 tabbrowser's constructor shouldn't use Cc and Ci since using it sometimes causes undefined error r=enndeakin
2014-06-09 22:42:02 +09:00
Florian Quèze
c54bd196cb
Bug 1015527 - Back/Forward navigation shouldn't break the Translation UI, r=felipe.
2014-06-09 16:50:58 +02:00
Mark Banner
d400d85162
Merge m-c to elm. a=merge
2014-06-09 13:00:42 +01:00
Nicolas Perriault
d7b1fab1be
Bug 1003029 Use local versions of OT assets. r=Standard8,rs=gijs,r=abr
2014-06-05 17:01:18 +01:00
Gijs Kruitbosch
512849a7ab
Bug 1016419 - implement showing lwt in customization mode, r=mconley,jaws
2014-06-02 21:59:38 +01:00
Mark Hammond
582feb9120
Bug 1017941 - Initialize loop during delayedStartup() to avoid observer leaks. r=Unfocused
2014-05-30 12:19:41 +10:00
Mark Banner
e8639257e3
Bug 1008116 Show the Loop button by default and update the tooltip and panel text. r=mhammond
2014-05-29 21:13:48 +01:00
Mark Banner
efdee5fb6e
Bug 1007601 Fix styling of the loop panel so it is laid out properly and without a white border. Also make the iframe creation dynamic, to avoid an iframe in the DOM when we don't need one. r=mhammond
2014-05-29 21:13:47 +01:00
Mark Banner
280d75d148
Bug 1000007 Separate out loop from the social api, and add a loop specific service and API injection. r=mhammond
2014-05-29 21:13:46 +01:00
Tim Taubert
980311dcc6
merge m-c to inbound
2014-05-29 08:32:31 +02:00
Wes Kocher
c49f3d6864
Merge m-c to fx-team
2014-05-28 17:26:00 -07:00