Commit Graph

237018 Commits

Author SHA1 Message Date
Mike de Boer
5a916a6421 Bug 1142532: add invitation email subject and body text used when a context is added to a Loop conversation. r=Standard8 2015-03-29 14:57:29 +02:00
Mike de Boer
45579c3f44 Bug 1142532: add invitation email subject and body text used when a context is added to a Loop conversation. r=Standard8, a=Tomcat 2015-03-29 14:57:29 +02:00
Mike de Boer
cc929e7124 Bug 1142515: add label and placeholder caption for the context edit form inside a Loop conversation. r=gavin 2015-03-29 14:57:26 +02:00
Mike de Boer
b9ec6e5346 Bug 1142515: add label and placeholder caption for the context edit form inside a Loop conversation. r=gavin, a=Tomcat 2015-03-29 14:57:26 +02:00
Mike de Boer
5d1cd3b137 Bug 1142514: Part 2 - add label caption for context information in a Loop room. r=Standard8 2015-03-29 14:57:24 +02:00
Mike de Boer
93d901274b Bug 1142514: Part 2 - add label caption for context information in a Loop room. r=Standard8, a=Tomcat 2015-03-29 14:57:24 +02:00
Mike de Boer
b248d1ee2e Bug 1142514: Part 1 - update Loop localization notes to not contain URLs to the obsolete UX specification anymore. r=gavin 2015-03-29 14:57:21 +02:00
Carsten "Tomcat" Book
4acfcdfc47 Merge mozilla-central to fx-team 2015-03-30 12:18:27 +02:00
Carsten "Tomcat" Book
8892ab9cb7 merge mozilla-inbound to mozilla-central a=merge 2015-03-30 11:59:17 +02:00
Martyn Haigh
519700f411 Bug 1146589 - Ensure that tab opened with "open now" action is selected and visible when fennec loads (r=mcomella) 2015-03-30 10:45:03 +01:00
Martyn Haigh
5e872e15e3 Bug 1148007 - Show Queue Tab toast only if Tab Queue preference is enabled (r=mcomella) 2015-03-30 10:21:06 +01:00
J. Ryan Stinnett
44991005ca Bug 1146542 - Restore tab list changes for non-sidebar case. r=ochameau 2015-03-29 23:18:42 -05:00
J. Ryan Stinnett
44fd197f1b Bug 1146542 - Clean up and describe app-manager events. r=ochameau 2015-03-29 23:18:42 -05:00
Makoto Kato
ddeadbc3f8 Bug 1147722 - Part 2. Remove keyboardMayHaveIME method. r=wmccloskey 2015-03-30 11:58:32 +09:00
Makoto Kato
ba25ba2fed Bug 1147722 - Part 1. Turn off TSF when e10s auto start is enabled. r=masayuki,wmccloskey 2015-03-30 11:58:03 +09:00
Edwin Flores
b913a19340 Bug 1142835 - Null check mPlugin on GMPAudioDecoderParent shutdown - r=cpearce 2015-03-30 14:58:19 +13:00
John Daggett
0250d6859b Bug 1094571 - add unicode-range load tests. r=heycam 2015-03-30 10:05:32 +09:00
John Daggett
c490ab2f99 Bug 1094571 - add woff versions of markA, markB, etc. fonts. r=heycam 2015-03-30 10:05:12 +09:00
Seth Fowler
a21bc7a1df Bug 1148682 - Handle content length correctly for moz-icon channels. r=tn 2015-03-29 17:47:49 -07:00
Phil Ringnalda
fa7e5419f9 Merge m-i to m-c, a=merge 2015-03-29 17:20:48 -07:00
Phil Ringnalda
57b9648d9a Merge f-t to m-c, a=merge 2015-03-29 16:30:56 -07:00
Phil Ringnalda
a5476594ba Backed out 5 changesets (bug 866846, bug 1131776, bug 1131766, bug 1144806, bug 1112702) on suspicion of causing Windows debug devtools-4 storage crashes
CLOSED TREE

Backed out changeset 142d9ae5826c (bug 1131776)
Backed out changeset 0b4de21b759f (bug 1112702)
Backed out changeset 1b4ead852ae0 (bug 1131766)
Backed out changeset cbd862dd036f (bug 866846)
Backed out changeset 178412a2fe8b (bug 1144806)
2015-03-29 12:55:11 -07:00
Jan-Ivar Bruaroey
064f411cf8 Bug 1046245 - IO on STS thread + cleanup BackgroundChild on shutdown. r=jesup 2015-03-29 13:43:43 -04:00
Nicolas Silva
e140a853f2 Bug 1132854 - Remove useless ThebesIntSize conversion helper. r=Bas 2015-03-29 16:59:15 +02:00
Nicolas Silva
eae4d10b4d Bug 1132854 - Make nsIntSize a typedef of gfx::IntSize. r=Bas, roc 2015-03-29 16:59:08 +02:00
Andrew McCreight
4b767927e9 Bug 1148070 - Change nsIClassInfo::getHelperForLanguage() to getScriptableHelper(). r=bholley 2015-03-29 07:52:54 -07:00
Andrew McCreight
12bf4e0709 Bug 1147967 - Remove CreateStackFrameLocation. r=bholley
This method is defined on nsIXPConnect and StackFrame, but is not used.

Also the non-default constructor that for StackFrame that is no longer used.
2015-03-29 07:52:53 -07:00
Szu-Yu Chen [:aknow]
963a083f73 Bug 1147842 - Fix defect of setting call started time. r=hsinyi 2015-03-29 21:54:57 +08:00
Mike de Boer
ca3713616d Bug 1142514: Part 1 - update Loop localization notes to not contain URLs to the obsolete UX specification anymore. r=gavin, a=Tomcat 2015-03-29 14:57:21 +02:00
Mark Capella
ba0d62aa2f Bug 1134446 - Automatically open the ReadingList sidebar the first time ReaderMode is used, r=unfocused 2015-03-29 08:35:23 -04:00
B2G Bumper Bot
69b993afba Bumping manifests a=b2g-bump 2015-03-29 04:27:43 -07:00
B2G Bumper Bot
07c4c1e526 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1b729ede1a2a
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 994357 - merge pull request #28784 from stasm:994357-dom-overlays to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/05c729084227
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 994357 - Use DOM overlays for safely setting node content. r=gandalf
2015-03-29 04:25:09 -07:00
Blake Winton
45430ae4d3 Bug 1147889 - Transition background and text color in Reading Mode. ui-r=mmaslaney, r=Unfocused 2015-03-28 22:10:54 -07:00
Matthew Noorenberghe
714a641e18 Bug 1124472 - Add telemetry for the Saved Passwords dialog. r=dolske 2015-03-28 21:50:40 -07:00
Phil Ringnalda
3ee5876e7c Merge f-t to m-c, a=merge 2015-03-28 21:33:32 -07:00
Mark Hammond
2b31c4b0c2 Bug 1148724 - reading list scheduler gets a back-off strategy on errors. r=adw 2015-03-29 11:18:25 +11:00
Jan de Mooij
353df38b83 Bug 1144366 - Switch SpiderMonkey and XPConnect style from |T *t| to |T* t|. r=jorendorff 2015-03-28 23:22:11 +01:00
Mats Palmgren
e57b30ccac Bug 1144905 - Clean up SortByZOrder code and comments since it now assumes the list is already in content document order. r=roc 2015-03-28 20:50:35 +00:00
Mats Palmgren
d4fbb714d4 Bug 1148104 - Enable fragmentation of floats in column layout in RELEASE builds. r=roc 2015-03-28 20:50:35 +00:00
Justin Dolske
bbb8154754 Bustage fix for bug 1146065. 2015-03-28 13:49:50 -07:00
Ehsan Akhgari
a7d9fd0ad6 Bug 1147996 - Enable interception of CSP reports through service workers; r=nsm
Currently when sending a CSP report, HttpBaseChannel::ShouldIntercept tries to
get access to the nsINetworkInterceptController interface through the channel's
notification callbacks, but in this case the notification callback is the
CSPReportRedirectSink object (thanks to nsCORSListenerProxy::Init).

This patch extends CSPReportRedirectSink to make it aware of
nsINetworkInterceptController, and have it route the request for
nsINetworkInterceptController correctly to the docshell without the need to
mess with the notification callbacks.

This will be tested in bug 1147699.
2015-03-28 16:28:40 -04:00
Ehsan Akhgari
6e0c11b80e Bug 1147695 - Enable interception of beacons through service workers; r=nsm
Currently when sending a beacon, HttpBaseChannel::ShouldIntercept tries
to get access to the nsINetworkInterceptController interface through the
channel's notification callbacks, but in this case the notification
callback is the nsCORSListenerProxy object (thanks to
nsCORSListenerProxy::Init).

nsCORSListenerProxy already knows how to forward calls to
nsIInterfaceRequestor::GetInterface to mOuterNotificationCallbacks, and
ShouldIntercept calls GetInterfce.  But mOuterNotificationCallbacks is
set by default to the callbacks of the channel at the time
nsCORSListenerProxy is called, and the callbacks on this channel is
intentionally null, so ShouldIntercept bails out and the beacon never
gets intercepted.

This patch extends nsCORSListenerProxy to make it aware of
nsINetworkInterceptController, and have it route the request for
nsINetworkInterceptController correctly to the docshell without the need
to mess with the notification callbacks.

This will be tested in bug 1147699.
2015-03-28 16:28:37 -04:00
Ryan VanderMeulen
4da777479a Backed out 6 changesets (bug 1046245) for bustage on a CLOSED TREE.
Backed out changeset 222c2f9e3bc9 (bug 1046245)
Backed out changeset 4251eef464a2 (bug 1046245)
Backed out changeset 592f4cc23197 (bug 1046245)
Backed out changeset 5bfb9a1c0550 (bug 1046245)
Backed out changeset e966a5df87b6 (bug 1046245)
Backed out changeset 609f3ca64004 (bug 1046245)
2015-03-28 16:24:25 -04:00
Phil Ringnalda
f5b19ec4f5 Merge m-c to f-t 2015-03-28 12:43:56 -07:00
Justin Dolske
8e0f5fde73 Bug 1146065 - Logins captured but not filled on discover.com. r=mattn 2015-03-28 12:13:17 -07:00
Phil Ringnalda
56e0234826 Merge m-c to f-t 2015-03-28 12:02:32 -07:00
Phil Ringnalda
e44e211365 Merge b-i to m-c, a=merge 2015-03-28 11:47:50 -07:00
Phil Ringnalda
ea054eea04 Merge m-c to m-i to m-c merge, a=mergemerge 2015-03-28 11:45:00 -07:00
Phil Ringnalda
870ac05194 Merge m-i to m-c, a=merge 2015-03-28 11:44:16 -07:00
Nick Alexander
3a8b8aed19 Merge fx-team to m-c. a=merge 2015-03-28 11:31:47 -07:00