Commit Graph

25064 Commits

Author SHA1 Message Date
Ryan VanderMeulen
891ff40ca8 No bug - Revert browser-plugins.js to revision 687318d464a5. a=me 2014-09-15 23:20:24 -04:00
Nigel Babu
489aede8a8 Merge fx-team to m-c with bustage fix, a=merge 2014-09-16 08:43:45 +05:30
Shu-yu Guo
91e6a020b9 Bug 1001090 - Followup: fix merge error in browser-plugins.js on a CLOSED TREE. r=bustage 2014-09-15 18:23:03 -07:00
Paul Rouget
2029d23d5e Bug 1045647 - register webide components in package-manifest.in. r=jryans 2014-09-15 17:18:23 -07:00
Adrian Aichner
a481306867 Bug 1064282 - Scratchpad should have statusbar like Page Source viewer. r=fitzgen
---
 browser/devtools/scratchpad/scratchpad.js          |   12 ++++++++++++
 browser/devtools/scratchpad/scratchpad.xul         |    1 +
 .../test/browser_scratchpad_run_error_goto_line.js |   11 +++++++++++
 .../chrome/browser/devtools/scratchpad.properties  |    5 +++++
 4 files changed, 29 insertions(+), 0 deletions(-)
2014-09-15 17:18:16 -07:00
Wes Kocher
332233753a Merge m-c to inbound a=merge 2014-09-15 16:41:45 -07:00
Shu-yu Guo
320f4e1440 Bug 1001090 - Part 5: Fix errors in tests throughout the tree. (r=robcee,gavin) 2014-09-15 16:30:47 -07:00
Shu-yu Guo
285e8aa396 Bug 1001090 - Part 4: Fix errors in chrome code. (r=zombie,gavin,fitzgen,dcamp,bgrins,fabrice,gwagner,margaret,mrbkap,mak,njn,vicamo) 2014-09-15 16:30:46 -07:00
Wes Kocher
d9ee208fe7 Merge fx-team to m-c a=merge 2014-09-15 16:24:37 -07:00
Wes Kocher
bafba8c453 Merge inbound to m-c a=merge 2014-09-15 15:18:28 -07:00
Chris Cooper
b26f23499f Backed out changeset f763f26a2f35 - a=blocklist-update 2014-09-15 17:49:04 -04:00
ffxbld
8dd920469a No bug, Automated blocklist update from host bld-linux64-spot-318 - a=blocklist-update 2014-09-15 14:35:41 -07:00
Chris Cooper
878fd5feeb Bug 1066403 - replace empty blocklist - a=blocklist-update 2014-09-15 14:40:56 -04:00
Mike Conley
ba0dd9b993 Bug 899347 - [e10s] Make click-to-play work with e10s. Originally written by mbrubeck. r=gfritzsche,felipe,Unfocused.
We now use message passing and content scripts in order to implement click-to-play. This allows
us to use click-to-play in e10s windows.

--HG--
extra : rebase_source : 719afe669c638ba4883f76f18aee38df6b60b4ad
2014-09-15 13:33:50 -04:00
Paul Rouget
e3b0a150ca Backed out changeset a6d02cff43d3 (bug 1037235) for breaking WebIDE (bug 1067331)
--HG--
extra : amend_source : a7bfb1e931122663e7c14a7362a849520388e495
2014-09-15 16:23:04 +02:00
Carsten "Tomcat" Book
f0eebab66f merge fx-team to mozilla-central a=merge 2014-09-15 14:29:01 +02:00
J. Ryan Stinnett
38429300a6 Bug 1065679 - Avoid reloading runtime apps on select. r=paul 2014-09-11 14:38:00 +02:00
Adrian Aichner
81501866d5 Bug 1058183 - Expose code folding as an option for all editor instances. r=bgrins 2014-09-12 13:36:00 +02:00
Bill McCloskey
d0e68a2fb0 Bug 1047076 - Disable e10s on Nightly if Accessibility is enabled (r=felipe) 2014-09-13 11:20:16 -07:00
Phil Ringnalda
9b4aa9966e Merge m-i to m-c, a=merge 2014-09-13 09:28:33 -07:00
Phil Ringnalda
3d59947782 Back out 0529fb43bd5f (bug 1047076) for bustage on a CLOSED TREE 2014-09-12 18:25:35 -07:00
Bill McCloskey
32296fa1e8 Bug 1047076 - Disable e10s if a11y is enabled (r=felipe) 2014-09-12 17:37:11 -07:00
Daniel Holbert
ca7be67db0 Bug 1065518: Remove probably-not-indended-to-land pref-settings that turned on geolocation logging by default in Nightly builds. r=fabrice 2014-09-14 09:34:56 -07:00
Erik Vold
6f40aa53bd Bug 1037235 - toolkit/loader doesn't check module compatibility r=Mossop 2014-09-09 18:33:55 -07:00
Mike Conley
762b880685 Bug 1047603 - [e10s] Follow-up to disable test for Linux until OMTC is enabled by default. rs=dholbert on a CLOSED TREE.
--HG--
extra : rebase_source : 6ff1875d4df4c6451e1aa4fd1205e32cc5e2a64c
extra : histedit_source : a7b120d39b38b936325908b28ac1ea4ea68a15ae
2014-09-12 17:56:06 -04:00
Wes Kocher
c162d16ff6 Merge m-c to fx-team a=merge 2014-09-15 16:49:06 -07:00
Mark Hammond
7985aba238 Bug 1063696 - fix datareporting timeout orange by not closing the prefs tab prematurely. r=gfritzsche 2014-09-16 09:22:55 +10:00
Adam Roach [:abr]
772c1c9de0 Bug 1017257 - Make loop code CSP-friendly (remove all inline script) r=Standard8 2014-09-15 15:39:12 -07:00
Ryan VanderMeulen
a0693c9204 Backed out changeset 5747034f2bcc (bug 899347) for mochitest-bc failures.
CLOSED TREE
2014-09-15 15:30:39 -04:00
Tooru Fujisawa
3df312fc9a Bug 1041426 - Make error message for unexpected token more clear. r=jwalden
--HG--
extra : rebase_source : 1785f67732a81aa29dd81c8be765cf497a9b74c8
2014-09-09 19:08:14 +09:00
Tim Taubert
418a7a34cf Bug 1047469 - Implement search terms hilighting r=dao 2014-09-08 11:54:00 +02:00
Georg Fritzsche
81ec697c37 Bug 1064470 - Increase the experiments forensic log buffer size again. r=bsmedberg 2014-09-15 15:28:33 +02:00
Carsten "Tomcat" Book
a78ddf5c9e Merge m-c to m-i 2014-09-15 14:34:27 +02:00
Bobby Holley
dc68cb8939 Bug 1066340 - Handle null/undefined alternativeURI.host. r=Gijs
Without this, we fail in [1] and friends when we pass the host value to
asyncResolve.

[1] browser/base/content/test/general/browser_keywordSearch.js
2014-09-15 14:17:32 +02:00
Monica Chew
bd333be9e6 Bug 1024555: Cancel gethash requests after 5 seconds if they are still pending 2014-09-08 16:44:08 -07:00
Bill McCloskey
18eb0a7716 Bug 1047751 - Disable HTML-controlled context menu in e10s (r=mconley) 2014-09-12 12:58:23 -07:00
Felipe Gomes
d6a89b304f Bug 1065880 - Measure e10s usage through telemetry. r=bsmedberg,mconley 2014-09-12 16:14:41 -03:00
Carsten "Tomcat" Book
9005131aba merge m-i to m-c a=merge 2014-09-12 15:07:38 +02:00
Matthew Noorenberghe
79c3a9dd94 Bug 1065777 - Store the Hawk Session token after /fxa-oauth/params for the Loop FxA login flow. r=abr,jaws 2014-09-11 23:01:04 -07:00
Mark Hammond
c6644b9e02 Bug 506446 - nsPermissionManager now reads a file with default permissions. r=bsmedberg 2014-09-12 13:24:10 +10:00
Alexandre Lissy
da1c5ff66a Bug 1066044 - Make Mochitest pass on Mulet r=jmaher,ochameau
To get Mochitest green with Mulet, we need to disable a couple more of
tests. We also need to disable the crash on non local connections, as it
is being done for runtestsb2g.
2014-09-11 22:59:00 +02:00
David Rajchenbach-Teller
a4ff6c3616 Bug 918317 - Implementation of nsAsyncShutdown. r=froydnj, r=glandium
--HG--
rename : toolkit/modules/AsyncShutdown.jsm => toolkit/components/asyncshutdown/AsyncShutdown.jsm
rename : toolkit/modules/tests/xpcshell/test_AsyncShutdown.js => toolkit/components/asyncshutdown/tests/xpcshell/test_AsyncShutdown.js
2014-09-11 09:01:00 -04:00
Gijs Kruitbosch
a7dd6eed0a Bug 1052534 - update back/fwd keyhole design on yosemite, r=jaws
--HG--
extra : rebase_source : ff28d1d4a2e55aaead9a9483bced7bc370139853
2014-09-10 21:38:07 +01:00
Ryan VanderMeulen
cbb0660107 Backed out changesets 26b240144648 and a701b0b291a0 (bug 1047146) for linux debug mochitest-bc crashes. 2014-09-11 18:08:56 -04:00
Ryan VanderMeulen
fb43104aaf Backed out changeset 4b5f794b80a8 (bug 956482) for mochitest-bc failures.
CLOSED TREE
2014-09-11 17:43:53 -04:00
Jared Wein
93d400ffe5 Bug 1047146 - Fixed panel_test.js to reference userProfile instead of loggedInToFxa on a CLOSED TREE. r=me
--HG--
extra : rebase_source : 68c527247512356f358568c9154f6e8eab71bd46
2014-09-11 16:54:18 -04:00
Nicolas Perriault
ce441a683d Bug 1062126: Loop panel UI shouldn't be fully reset when reopened, r=mikedeboer. 2014-09-11 20:54:48 +01:00
Daniel
00267b391a Bug 956482 - Rewrite inline script in /browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml (about:privatebrowsing); r=jaws 2014-09-11 15:49:14 -04:00
Jared Wein
00cc827fbf Bug 1047146 - Add current username to the Loop panel footer. r=mattn r=niko
--HG--
extra : rebase_source : 527ccb4541555e10a24b9785620ea805db84aca7
2014-09-11 15:36:14 -04:00
Mike de Boer
ceac35d2fe Bug 1065275: add a TabView component to the panel. r=paolo,Niko. 2014-09-11 19:14:30 +02:00