Commit Graph

162235 Commits

Author SHA1 Message Date
Honza Bambas
562003b94a Bug 942835 - HTTP cache v2: Better CacheEntry purge prevention, r=michal 2014-01-06 21:24:41 +01:00
Honza Bambas
3981323a1c Bug 937601 - HTTP cache v2: onCacheEntryCheck not called for R/O callbacks, r=michal 2014-01-08 20:36:57 +01:00
Nick Alexander
e40661b7ee Merge m-c to s-c 2014-01-08 10:06:43 -08:00
Carsten "Tomcat" Book
bf625cfaf0 merge b2g-inbound to mozilla-central 2014-01-08 13:17:30 +01:00
Carsten "Tomcat" Book
94733cdce0 merge fx-team to mozilla-central 2014-01-08 13:12:38 +01:00
Carsten "Tomcat" Book
eed2784c94 merge mozilla-inbound to mozilla-central 2014-01-08 13:10:57 +01:00
Mark Capella
675b316be1 Bug 957259 - Error: "TypeError: caretPos is null" in SelectionHandler.js @ line: 585, r=margaret 2014-01-08 02:59:08 -05:00
Phil Ringnalda
509824ae8c Merge m-c to b2g-inbound
CLOSED TREE
2014-01-07 22:25:11 -08:00
Phil Ringnalda
42a92e2637 Merge m-c to fx-team
CLOSED TREE
2014-01-07 22:19:30 -08:00
Boris Zbarsky
8e8524c8b2 Bug 932837 followup. Don't use AutoJSContext in JSStackFrame, since we use that code on workers too. r=bholley pending, but landing now to fix the CLOSED TREE. 2014-01-08 01:00:57 -05:00
Phil Ringnalda
b1d0a82ada Back out 2e7e2de7b13e (bug 948574) for b2g mochitest crashes
CLOSED TREE
2014-01-07 21:10:23 -08:00
Phil Ringnalda
d451b46f71 Back out f122349d9fbd (bug 941725) for debug and ASan bc timeouts in browser_codemirror.js
CLOSED TREE
2014-01-07 20:48:34 -08:00
Nick Alexander
78568ed450 Bug 955808 - Follow-up: Fix bustage. r=me 2014-01-07 20:29:18 -08:00
Gaia Pushbot
138dc65bcc Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/65400ea2bb3e
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #15076 from gurumukhi/patch-5

Bug 892950 - error-network message can use better English, r=johnhu

========

https://hg.mozilla.org/integration/gaia-central/rev/3862f66d8eb9
Author: Ram Dayal Vaishnav <vaishnav.rd@gmail.com>
Desc: Bug 892950 - error-network message can use better English
2014-01-07 20:06:56 -08:00
Gaia Pushbot
faf7419d67 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/53a930e0a23a
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #14731 from qdot/950876-support-contacts-test

Bug 950876: Fix Support Contacts unit test to use Support Contacts customizer

========

https://hg.mozilla.org/integration/gaia-central/rev/a9e2e0d1cbc5
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 950876: Fix Support Contacts unit test to use Support Contacts customizer
2014-01-07 20:04:42 -08:00
Ehsan Akhgari
309feacc21 Backed out changeset 07a4682a75f2 (bug 956507) because it has bitrotten
Landed on a CLOSED TREE
2014-01-07 23:02:23 -05:00
Gene Lian
fb7958062f Bug 956322 - Trying to download an MMS fails with 'Missing SIM card'. r=vicamo f=gaston a=v1.3+,approval-mozilla-b2g28+ 2014-01-08 11:29:40 +08:00
Ehsan Akhgari
cdb329adca Bug 956507 - Remove the PRUnichar typedef from Char16.h; r=jcranmer 2014-01-07 22:16:17 -05:00
Gaia Pushbot
cc20200665 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/376444b1a858
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #15079 from gaye/bug-952719

Bug 952719 - Reenable notification click message reader test

========

https://hg.mozilla.org/integration/gaia-central/rev/7d7a5621b6b3
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 952719 - Reenable notification click message reader test
2014-01-07 18:31:50 -08:00
Gaia Pushbot
5e26b7c3ec Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3c31ce933f48
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14912 from davidflanagan/bug939679

Bug 939679: compute the right camera preview size on HD devices r=dmarcos

========

https://hg.mozilla.org/integration/gaia-central/rev/f1092ff15f42
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 939679: compute the right camera preview size on HD devices

========

https://hg.mozilla.org/integration/gaia-central/rev/84146f63920f
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #15051 from davidflanagan/bug939962

Bug 939962: set the willReadFrequently flag when creating the 2D context... r=snorp

========

https://hg.mozilla.org/integration/gaia-central/rev/4452a66717b2
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 939962: set the willReadFrequently flag when creating the 2D context for saving an edited image
2014-01-07 18:31:29 -08:00
Wes Kocher
3a48f68e50 Merge m-c to fx-team 2014-01-07 18:29:54 -08:00
Wes Kocher
79287b6a67 Merge m-c to b2g-inbound 2014-01-07 18:29:03 -08:00
Wes Kocher
5d7abac824 Merge m-c to inbound 2014-01-07 18:28:12 -08:00
Nick Alexander
0f43b8d63f Bug 955808 - Implement Android Firefox Account client that speaks "onepw" protocol. r=rnewman 2014-01-07 18:27:47 -08:00
Nick Alexander
5153580c03 Bug 956816 - Implement (de)serializing Android BrowserIDKeyPair instances. r=rnewman 2014-01-07 18:27:45 -08:00
Wes Kocher
96414ab45e Merge fx-team to m-c 2014-01-07 18:16:39 -08:00
Nick Alexander
9bc5ad14e9 Bug 956935 - Follow-up: Fix bustage. r=me 2014-01-07 18:07:44 -08:00
Wes Kocher
7cc692f709 Merge b2g-inbound to m-c 2014-01-07 18:02:10 -08:00
Gaia Pushbot
4106561a31 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/53a930e0a23a
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #14731 from qdot/950876-support-contacts-test

Bug 950876: Fix Support Contacts unit test to use Support Contacts customizer

========

https://hg.mozilla.org/integration/gaia-central/rev/a9e2e0d1cbc5
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 950876: Fix Support Contacts unit test to use Support Contacts customizer
2014-01-07 17:55:22 -08:00
Wes Kocher
d9e5d5acf3 Merge inbound to m-c 2014-01-07 17:54:21 -08:00
Andrew McCreight
e776222be7 Bug 957370 - Make 'total time' measure total time actually running the CC. r=smaug 2014-01-07 17:33:47 -08:00
Andrew McCreight
1aa561ef0f Bug 956080 - Rename BeginCycleCollection to TraverseRoots. r=smaug 2014-01-07 17:33:47 -08:00
Nicholas Cameron
8afa9f73d5 Fix bustage from bug 933549 because I am an idiot who forgot to qref, on a CLOSED TREE 2014-01-08 14:21:56 +13:00
Shane Caraveo
14600a386f bug 956910 Australis fix gear icon in social sidebar for win/lin, r=markh 2014-01-07 16:06:56 -08:00
Mark Finkle
440052463b Bug 957037 - Pull in Android's ProxySelectorImpl code so we can bypass creating Uri objects r=blassey 2014-01-07 18:46:44 -05:00
Shane Caraveo
16fb4fff2a bug 956956 fix permissions anchor for social sidebar, r=markh 2014-01-07 15:40:46 -08:00
Richard Newman
d4d51fed98 Bug 956935 - Include supported Sync protocol versions in Android client records. r=nalexander
--HG--
extra : amend_source : 67f9f5156f6e7a39a056cd5ef145a4fd10ec0b74
2014-01-07 15:24:36 -08:00
Nick Alexander
41530762ce Merge m-c to s-c 2014-01-07 15:22:58 -08:00
Gaia Pushbot
420ea17f4b Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/78ad2c5d6d67
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #15087 from eeejay/bug-957252

Bug 957252 - Update Screen Reader Simulator URL. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/41ba0a639993
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 957252 - Update Screen Reader Simulator URL.
2014-01-07 15:04:32 -08:00
Anton Kovalyov
5f800bb280 Bug 941725 - Add emacs and vim key bindings to source editor. r=harth r=benvie r=msucan 2014-01-07 15:02:01 -08:00
Wes Kocher
d8d0ddae62 Backed out changeset 194f941f2064 (bug 809056) for mochitest-bc bustage 2014-01-07 14:53:04 -08:00
Michael Comella
4ebef1ce81 Bug 946656: Increase state change timeout duration. r=margaret 2014-01-07 14:39:58 -08:00
Gaia Pushbot
5acdfddef1 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/376444b1a858
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #15079 from gaye/bug-952719

Bug 952719 - Reenable notification click message reader test

========

https://hg.mozilla.org/integration/gaia-central/rev/7d7a5621b6b3
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 952719 - Reenable notification click message reader test
2014-01-07 14:25:25 -08:00
Gaia Pushbot
19b6dd0b10 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3c31ce933f48
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14912 from davidflanagan/bug939679

Bug 939679: compute the right camera preview size on HD devices r=dmarcos

========

https://hg.mozilla.org/integration/gaia-central/rev/f1092ff15f42
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 939679: compute the right camera preview size on HD devices

========

https://hg.mozilla.org/integration/gaia-central/rev/84146f63920f
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #15051 from davidflanagan/bug939962

Bug 939962: set the willReadFrequently flag when creating the 2D context... r=snorp

========

https://hg.mozilla.org/integration/gaia-central/rev/4452a66717b2
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 939962: set the willReadFrequently flag when creating the 2D context for saving an edited image
2014-01-07 14:15:35 -08:00
Margaret Leibovic
1ba1ae0cc2 Bug 921557 - (Part 2) Update other deprecated BitmapDrawable constructor usage. r=wesj 2014-01-07 14:12:04 -08:00
Margaret Leibovic
a41e37e7aa Bug 921668 - Use correct BitmapDrawable constructor to ensure correct density is set. r=wesj 2014-01-07 14:12:01 -08:00
Margaret Leibovic
b9c2e2b445 Bug 950719 - Update Bing search icon to 32x32. r=mfinkle 2014-01-07 14:11:59 -08:00
Ryan VanderMeulen
d8aefe0eec Merge m-c to fx-team. 2014-01-07 16:31:30 -05:00
Ryan VanderMeulen
44a998fea6 Merge m-c to b2g-inbound. 2014-01-07 16:30:09 -05:00
Ryan VanderMeulen
113812c92f Merge b2g-inbound to m-c. 2014-01-07 16:29:13 -05:00