Commit Graph

396746 Commits

Author SHA1 Message Date
Wes Kocher
58cb48da88 Merge fx-team to m-c a=merge 2014-12-12 17:18:42 -08:00
Wes Kocher
e4ad7391ee Merge b2g-inbound to m-c a=merge 2014-12-12 16:43:37 -08:00
B2G Bumper Bot
9af7dc723c Bumping manifests a=b2g-bump 2014-12-12 13:56:51 -08:00
B2G Bumper Bot
d8c7b40336 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f741dca42f03
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #26630 from sfoster/ftu-rtl-nav-bug-1037755

Bug 1037755 dont flip FTU nav buttons in RTL. r=fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/80f980cfb0b8
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1037755 dont flip nav buttons in RTL. r=fcampo
2014-12-12 13:52:12 -08:00
Dan Mosedale
3c36af6c35 Bug 1111011-loop panel should close on 'Start a Conversation' click, r=MattN 2014-12-12 13:30:20 -08:00
B2G Bumper Bot
7661eb6acc Bumping manifests a=b2g-bump 2014-12-12 13:23:54 -08:00
B2G Bumper Bot
679c018647 Bumping manifests a=b2g-bump 2014-12-12 12:34:15 -08:00
B2G Bumper Bot
18433f24bc Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ffc4fd1b37f0
Author: punamdahiya <punamdahiya@yahoo.com>
Desc: Merge pull request #26698 from punamdahiya/Bug1106877

Bug1106877 - [Gallery] - Fix of grey bars and cannot tap in thumbnails for images smaller than thumbnail container r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/e2624551c3ec
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug1106877 - [Gallery] - Fix of grey bars and cannot tap in thumbnails for images smaller than thumbnail container div r=djf
2014-12-12 12:32:38 -08:00
B2G Bumper Bot
cd60dd3389 Bumping manifests a=b2g-bump 2014-12-12 12:12:00 -08:00
B2G Bumper Bot
616c68efbf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/365f8ff80c0b
Author: punamdahiya <punamdahiya@yahoo.com>
Desc: Merge pull request #26581 from punamdahiya/Bug1088413

Bug1088413-[Gallery][RTL]-Icons in the fullscreen and edit toolbar should stay LTR r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/125b03eca8e1
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug1088413-[Gallery][RTL]-Icons in the fullscreen and edit toolbar should stay LTR r=djf
2014-12-12 12:02:20 -08:00
B2G Bumper Bot
90f9237db3 Bumping manifests a=b2g-bump 2014-12-12 11:33:57 -08:00
B2G Bumper Bot
59389b765b Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6041f05d17a9
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #26703 from KevinGrandon/bug_1109920_remove_ftu_migration

Bug 1109920 - Remove collection migration code from FTU

========

https://hg.mozilla.org/integration/gaia-central/rev/aab1b7ed1124
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1109920 - Remove collection migration code from FTU r=sfoster

========

https://hg.mozilla.org/integration/gaia-central/rev/9227cfe6c5df
Author: Russ Nicoletti <rnicoletti@mozilla.com>
Desc: Merge pull request #26456 from russnicoletti/bug-1095826

Bug 1095826 - [RTL][Video] Thumbnail images do not appear r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/a487a1ffdf26
Author: Russ Nicoletti <rnicoletti@mozilla.com>
Desc: Bug 1095826 - [RTL][Video] Thumbnail images do not appear
2014-12-12 11:32:20 -08:00
Ankit Goyal
8e700c9dee Bug 1110069 - Replace getBrowser() with gBrowser in /browser. r=dao 2014-12-11 21:48:00 -05:00
Ehsan Akhgari
09a262787c Bug 649012 - Fail mochitest-plains which use flaky timeouts (setTimeout(x) for x > 0); r=ted
We are white-listing the existing set of tests that use setTimeout
like this.  Hopefully these tests will be investigated and fixed
in the future, so that we can narrow down the white-list.

This check is only turned on for mochitest-plain for now.
2014-12-11 13:34:40 -05:00
Ehsan Akhgari
eb2d17cdf6 Backed out 2 changesets (bug 1101337) because of ASAN bustage landed on a CLOSED TREE
Backed out changeset ffef93ec94aa (bug 1101337)
Backed out changeset 2954a37bc2df (bug 1101337)
2014-12-12 13:04:44 -05:00
Ehsan Akhgari
169d700dd5 Bug 1101337 follow-up: Move the Segment class to nsTString_CharT in order to satisfy older gcc's used on b2g, landed on a CLOSED TREE to fix build bustage 2014-12-12 12:43:04 -05:00
Brian Hackett
500b00a58c Bug 1107145 - Allow typed objects with the same prototype to have different descriptors, r=nmatsakis. 2014-12-12 10:24:41 -07:00
Christoph Kerschbaumer
8cb0969fc2 Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - docshell/ changes (r=smaug) 2014-12-12 09:09:24 -08:00
Christoph Kerschbaumer
2c114871ef Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - browser/ changes (r=sicking) 2014-12-12 09:08:27 -08:00
Christoph Kerschbaumer
f84bc01c05 Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - widget/ changes (r=blassey) 2014-12-12 09:08:14 -08:00
Christoph Kerschbaumer
ad23c605d2 Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - uriloader/ changes (r=smaug,sicking) 2014-12-12 09:08:01 -08:00
Christoph Kerschbaumer
0a11a9252b Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - toolkit/ changes (r=gcp) 2014-12-12 09:07:48 -08:00
Christoph Kerschbaumer
5bc71528dc Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - netwerk/ changes (r=sworkman,sicking) 2014-12-12 09:07:36 -08:00
Christoph Kerschbaumer
1e54ee4250 Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - modules/ changes (r=mwu) 2014-12-12 09:07:23 -08:00
Christoph Kerschbaumer
b3d1653ff6 Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - image/ changes (r=seth) 2014-12-12 09:06:54 -08:00
Christoph Kerschbaumer
85302dc6bc Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - extensions/ changes (r=karlt) 2014-12-12 09:06:42 -08:00
Christoph Kerschbaumer
a4375f9cf0 Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - dom/ changes (r=sicking) 2014-12-12 09:06:09 -08:00
Christoph Kerschbaumer
35fd1192e7 Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - chrome/ changes (r=sicking) 2014-12-12 09:05:34 -08:00
Christoph Kerschbaumer
09b44e1b01 Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - ioservice/ changes (r=sicking,sworkman) 2014-12-12 09:05:21 -08:00
Christoph Kerschbaumer
d1614ac429 Bug 1087442 - Attach LoadInfo inside each individual ProtocolHandler - netUtil changes (r=sicking,sworkman) 2014-12-12 09:05:09 -08:00
Christoph Kerschbaumer
97e4b52984 Bug 1110615 - Fix inheriting problem for blobs (r=sicking) 2014-12-12 09:03:47 -08:00
Monica Chew
63de38c180 Bug 1101969: Disable pinning on media.mozilla.com (r=keeler) 2014-12-12 09:10:57 -08:00
Monica Chew
04d69a9f5b Bug 1004781: Enable pinning for facebook in production mode (r=keeler) 2014-12-12 09:10:53 -08:00
Chris Manchester
a641e6246c Bug 1099331 - Allow navigation resulting in about:blocked or about:error pages when explicitly requested without returning an error from the marionette server.;r=automatedtester
This allows navigation resulting in a blocked or error page without returning an error to the client. If an error page is reached, an error is returned in cases this was not specifically requested in the client: client.navigate("about:neterror") will navigate to this page and return to the client without an error, but client.navigate("does.not.exist.") will return to the client with an error as it has previously.
2014-12-12 12:08:32 -05:00
Chris Manchester
11a1ff5261 Bug 1055765 - Implement log buffering as a handler in mozlog.;r=jgraham 2014-12-12 12:08:31 -05:00
Chris Manchester
c3c9e22175 Bug 941749 - Add support for returning both known tabs and chrome windows from the marionette server.;r=automatedtester
This splits the api for getWindowHandles and getChromeWindowHandles for those
managing windows and tabs separately in tests. getWindowHandles is
re-implemented to return tabs when appropriate, and getChromeWindowHandles is
added to correspond to individual os windows (the prior behavior of
getWindowHandles). current_window_handle now corresponds to a tab on desktop,
while chrome_window_handle is provided for the current OS window.
switch_to_window will accept either a chrome window handle or tab handle.
In the case of a tab, switching will select the tab. In the
case of a chrome window handle, the prior behavior is retained.
2014-12-12 12:08:31 -05:00
Chris Manchester
bb8ca43969 Bug 941749 - A test managing open windows and tabs with marionette.;r=automatedtester 2014-12-12 12:08:31 -05:00
Patrick McManus
9aa9696cc0 bug 865314 - backout 61ee2e053920 due to crashes 1089638 r=backout
--HG--
extra : rebase_source : a402ff7ab1f653320ac577807fbe85143d945af8
2014-12-12 11:48:02 -05:00
Ehsan Akhgari
2b3c79836e Bug 1101337 - Make the ReplaceSubstring() XPCOM string API linear; r=froydnj
ReplaceSubstring() is an O(n*m) algorithm (n being the length of the
string and m being the number of occurrences of aTarget) because we have
to move the remainder of the string, search it again and potentially
memmove most of it again as we find more matches.  This patch rewrites
that function to make it O(n+m).

Note that we currently don't build TestStrings.cpp, so the test case in
this patch is not run automatically, but the test case has been verified
to pass separately by moving the test function into Gecko and calling it
during startup and stepping through it in the debugger.

--HG--
extra : rebase_source : 0330c130520802392b92bd094dde85f57cfe6420
2014-12-12 11:47:55 -05:00
Nathan Froyd
941541fed4 Backout bbcf9c812bb5:388e4a23e7fb (bug 1090636), for bustage on a CLOSED TREE 2014-12-12 11:49:15 -05:00
Fayolle Florent
ac08f68a13 Bug 1108212 - In the DevTools Inspector tree, pressing delete should move to the next element. r=bgrins 2014-12-07 14:54:00 -05:00
Tom Tromey
18bb6d0861 Bug 1050770 - Add paint details to timeline. r=smaug, r=mattwoodrow 2014-12-11 10:40:00 -05:00
Margaret Leibovic
c599adcd28 Bug 1107133 - Expose tracking protection in Fennec privacy preferences. r=liuche
--HG--
extra : rebase_source : c871a80ba90ed7f5b4d626d4d04f64a7e6e74a4c
2014-12-08 15:17:32 -08:00
Jared Wein
bff21aff10 Bug 1008172 - Scrolling when focused on the tabbox should not change the selected tab for the in-content preferences. r=Gijs 2014-12-12 14:15:13 -05:00
Dan Mosedale
6cd223b667 Bug 1101378 - self-image can be cropped, meaning the user doesn't see the entire sent images, r=NiKo` 2014-12-12 11:01:27 -08:00
Mike de Boer
8635e10457 Bug 1109511: listen for the 'delete' event to update the toolbar icon when a room is deleted. r=Niko 2014-12-12 16:39:17 +01:00
Romain Gauthier
1186e7affc Bug 1106991 - Added missing icon for Hello's "tour". r=nperriault 2014-12-12 15:43:01 +01:00
Carsten "Tomcat" Book
e6e5152ba8 Merge mozilla-central to fx-team 2014-12-12 13:58:40 +01:00
Carsten "Tomcat" Book
c06036beba merge mozilla-inbound to mozilla-central a=merge 2014-12-12 13:51:14 +01:00
Carsten "Tomcat" Book
2f22b1bd1f merge fx-team to mozilla-central a=merge 2014-12-12 13:17:55 +01:00