Commit Graph

205643 Commits

Author SHA1 Message Date
Ryan VanderMeulen
0c7c2906aa Merge inbound to m-c. a=merge
CLOSED TREE
2014-09-17 22:10:31 -04:00
Ryan VanderMeulen
bf19e9f57d Merge fx-team to m-c. a=merge 2014-09-17 21:59:14 -04:00
Ryan VanderMeulen
d1ce28d88f Backed out 5 changesets (bug 1068388) for robocop failures.
Backed out changeset 099d0ec27cd9 (bug 1068388)
Backed out changeset 29d39909222d (bug 1068388)
Backed out changeset e85caca8529f (bug 1068388)
Backed out changeset cf6f1223b6b7 (bug 1068388)
Backed out changeset 920b201d30e9 (bug 1068388)

CLOSED TREE
2014-09-17 21:47:20 -04:00
Ryan VanderMeulen
1d1ce80554 No bug - Touch CLOBBER.
CLOSED TREE
2014-09-17 21:44:44 -04:00
Nick Alexander
c1b63a1e81 Bug 1068388 - Follow-up: Update Robocop test. a=bustage
CLOSED TREE

--HG--
extra : amend_source : 8352390d15245ff94a16dab773b583f8d5da5161
2014-09-17 17:32:44 -07:00
Ben Turner
26edfb8667 Backout bug 994190 and merge over some stuff that landed afterwards on a CLOSED TREE. 2014-09-17 19:36:01 -04:00
Ryan VanderMeulen
6763d0eb04 Backed out changeset 0cc9fcdca191 (bug 1068195) for Windows crashtest asserts.
CLOSED TREE
2014-09-17 20:47:35 -04:00
Bas Schouten
0fb1d83b18 Bug 1068613 - Addendum 4: Fix bustage due to stray character. r=bustage on a CLOSED TREE 2014-09-18 01:40:13 +02:00
B2G Bumper Bot
ed00f98ee3 Bumping manifests a=b2g-bump 2014-09-17 16:32:07 -07:00
B2G Bumper Bot
16f99c23c7 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7075f5263087
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #24129 from davidflanagan/bug1065877

Bug 1065877: prevent OOMs when editing, picking and sharing large images r=russnicoletti

========

https://hg.mozilla.org/integration/gaia-central/rev/fad560ead475
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1065877: prevent OOMs when editing, picking and sharing large images

address review comments

========

https://hg.mozilla.org/integration/gaia-central/rev/e1c762dc4bce
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #23878 from mikehenrty/bug-1062998-fix-connectivity

Bug 1062998 - Update signal icons when showing SIM Manager

========

https://hg.mozilla.org/integration/gaia-central/rev/c927b8a65d43
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1062998 - Update signal icons when showing SIM Manager
2014-09-17 16:25:47 -07:00
Bas Schouten
50ffbf0899 Bug 1068613 - Addendum 3: Fix bustage due to stray character. r=bustage on a CLOSED TREE 2014-09-18 01:04:07 +02:00
Bas Schouten
9bd3f60f10 Bug 1068613 - Addendum 2: Fix bustage due to stray character. r=bustage on a CLOSED TREE 2014-09-18 00:35:48 +02:00
Ehsan Akhgari
6be7b691a0 Bug 1067340 follow-up: null check the inner window r=bustage
Landed on a CLOSED TREE
2014-09-17 18:31:26 -04:00
Bas Schouten
2e768633ad Bug 1068613 - Addendum: Fix bustage in ASAN builds. r=bustage on a CLOSED TREE 2014-09-18 00:25:23 +02:00
Ehsan Akhgari
8273a526d3 Bug 1067340 - Don't use nsIDOMWindowUtils in the CSP code, because it's not meant to be used from C++; r=geekboy 2014-09-17 17:55:43 -04:00
Ehsan Akhgari
6c76365ab1 Bug 1068193 - Use the correct return type for Factory::CreateWrappingDataSourceSurface; r=jrmuizel 2014-09-17 17:55:17 -04:00
Ehsan Akhgari
3e481f2909 Bug 1068195 - Fix an invalid MOZ_ASSERT in moz2d code, asserting the value of a constant string pointer; r=jrmuizel 2014-09-17 17:54:43 -04:00
Ehsan Akhgari
28bba4a48e Bug 1068022 - Fix more bad implicit constructors in gfx; r=jrmuizel 2014-09-17 17:54:13 -04:00
Ehsan Akhgari
d31e4c0d28 Bug 1068020 - Fix more bad implicit constructors in DOM; r=baku 2014-09-17 17:53:42 -04:00
Ryan VanderMeulen
affaabfc58 Merge m-c to b2g-inbound on a CLOSED TREE. 2014-09-17 16:37:02 -04:00
Jim Mathies
c921a61d36 Follow up for back out of bug 1047603, disable browser_social_flyout.js test that's failing in e10s. a=RyanVM CLOSED TREE 2014-09-17 15:28:36 -05:00
B2G Bumper Bot
1b30936758 Bumping manifests a=b2g-bump 2014-09-17 12:31:58 -07:00
B2G Bumper Bot
cf860add5f Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/be9a28d6fb25
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #24118 from zbraniecki/1048411-remove-inline-locales

Bug 1048411 - Remove GAIA_INLINE_LOCALES optimization. r=stas

========

https://hg.mozilla.org/integration/gaia-central/rev/6235c489c597
Author: Zbigniew Braniecki <gandalf@mozilla.com>
Desc: Bug 1048411 - Remove GAIA_INLINE_LOCALES optimization. r=stas

========

https://hg.mozilla.org/integration/gaia-central/rev/fef7f4b23c21
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Revert "Merge pull request #20619 from gmarty/Bug-1007948-no-multiple-calls"

This reverts commit 8ccac0744848bd3ceaa6aa1c972ae0eb1e9ddc1e, reversing
changes made to c2c92e7be95dd0b65ee44113e1d17592dd0e20c6.
2014-09-17 12:25:47 -07:00
Ryan VanderMeulen
e705136564 Merge m-c to b2g-inbound. a=merge 2014-09-17 14:44:59 -04:00
Ryan VanderMeulen
4db5b69b68 Backed out changesets a68c9d18ffa5 and 750e7aaf09cb (bug 1067414) for causing bug 1068658. a=me 2014-09-17 14:39:17 -04:00
Ryan VanderMeulen
39d4036b5e Merge inbound to m-c. a=merge 2014-09-17 14:38:33 -04:00
B2G Bumper Bot
cfec30e3d7 Bumping manifests a=b2g-bump 2014-09-17 11:26:57 -07:00
Ryan VanderMeulen
eb3f6a8f62 Merge b2g-inbound to m-c. a=merge 2014-09-17 14:22:12 -04:00
B2G Bumper Bot
3cf8204c8e Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

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

Bug 1061679 - [Browser Chrome] Press states of back, refresh, cancel and overflow menu using the wrong icons

========

https://hg.mozilla.org/integration/gaia-central/rev/c410af57ea99
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1061679 - [Browser Chrome] Press states of back, refresh, cancel and overflow menu using the wrong icons r=epang

========

https://hg.mozilla.org/integration/gaia-central/rev/0f477342ef17
Author: Eli Perelman <eli@eliperelman.com>
Desc: Fixing SHB visibility in app landscape mode r=kgrandon
2014-09-17 11:20:47 -07:00
Ryan VanderMeulen
a631440dac Backed out changesets 1e0e069b5cc7 and dc6a44c16a37 (bug 1047603) for causing bug 1067164. a=me 2014-09-17 14:19:58 -04:00
Ryan VanderMeulen
62fbe0393e Merge fx-team to m-c. a=merge 2014-09-17 14:17:08 -04:00
B2G Bumper Bot
37febe52e9 Bumping manifests a=b2g-bump 2014-09-17 09:36:56 -07:00
Ed Morley
cea5a26d63 Backed out changeset bea8bb703913 (bug 650161) for rooting hazzard failures 2014-09-17 17:34:20 +01:00
Ed Morley
d6c3849d1b Backed out changeset 6f0a56999e9b (bug 650161) 2014-09-17 17:33:58 +01:00
Ed Morley
11e28ca411 Backed out changeset 512ef66a96b8 (bug 650161) 2014-09-17 17:33:54 +01:00
B2G Bumper Bot
53d128f1b1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9fffcfaa0e10
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #24119 from eliperelman/bug-1067441

Bug 1067441 - Enable SHB on secured lockscreen apps

========

https://hg.mozilla.org/integration/gaia-central/rev/7e021b57410a
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1067441 - Enable SHB on secured lockscreen apps
2014-09-17 09:30:46 -07:00
Daniel Holbert
392a8ec031 Bug 1065766 followup: add whitespace between @supports and open-paren, to address review comment. DONTBUILD because whitespace-only 2014-09-17 09:26:22 -07:00
Richard Newman
5d4e5b3c71 Bug 1057247 - Increase favicon refetch time to four hours. r=mfinkle 2014-09-17 09:22:11 -07:00
B2G Bumper Bot
0378bd0c89 Bumping manifests a=b2g-bump 2014-09-17 09:21:57 -07:00
Drew Willcoxon
0f8ba4b0fd Bug 1060888 - Autocomplete drop down list item should not be copied to the search fields when mouse over the list item. r=MattN 2014-09-17 09:11:06 -07:00
Drew Willcoxon
dbd5920388 Bug 1066794 - Make the search suggestions popup on about:home/about:newtab more consistent with the main search bar's popup. r=MattN 2014-09-17 09:11:04 -07:00
B2G Bumper Bot
9c71b4593d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/21716026341b
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #24097 from empoalp/bug_1054818_2

Bug 1054818 - [Sora][Call][Settings]The call time display abnormal after...

========

https://hg.mozilla.org/integration/gaia-central/rev/938cffa2f7eb
Author: David Garcia <davidg@tid.es>
Desc: Bug 1054818 - [Sora][Call][Settings]The call time display abnormal after user change the system time.
2014-09-17 09:10:47 -07:00
B2G Bumper Bot
62cb0b7c6b Bumping manifests a=b2g-bump 2014-09-17 08:31:56 -07:00
B2G Bumper Bot
f0aaf357d7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/44368e32adb4
Author: chirarobert <robert.chira@softvision.ro>
Desc: Merge pull request #23814 from qdot/1064228-settings-test-race

Bug 1064228 - Make settings api test functions wait on transaction

========

https://hg.mozilla.org/integration/gaia-central/rev/9c614a8ae0b9
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 1064228 - Make settings api test functions wait on transaction
2014-09-17 08:25:45 -07:00
B2G Bumper Bot
a356e493b2 Bumping manifests a=b2g-bump 2014-09-17 08:17:01 -07:00
B2G Bumper Bot
198ab54099 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/600645ecdf69
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #24081 from viorelaioia/bug_1053793

Bug 1053793 - Investigate if asserts in everything.me tests are reliable...

========

https://hg.mozilla.org/integration/gaia-central/rev/9dfd1c2f81e0
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1053793 - Investigate if asserts in everything.me tests are reliable/correct
2014-09-17 08:10:46 -07:00
B2G Bumper Bot
2039c69c8f Bumping manifests a=b2g-bump 2014-09-17 07:47:20 -07:00
B2G Bumper Bot
1745f1c5c3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8a07660865f6
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #23798 from mancas/bug1025331

Bug 1025331 - [FTE] Change the "Next" button to "Skip" on the Firefox Ac...

========

https://hg.mozilla.org/integration/gaia-central/rev/dbee0919f109
Author: Manuel Casas Barrado <manuel.casasbarrado@telefonica.com>
Desc: Bug 1025331 - [FTE] Change the "Next" button to "Skip" on the Firefox Accounts screen during FTE
2014-09-17 07:40:35 -07:00
B2G Bumper Bot
6fe55fd3cc Bumping manifests a=b2g-bump 2014-09-17 07:31:55 -07:00
B2G Bumper Bot
8f2661cdf6 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f76614c49e29
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #24140 from bebef1987/xfail_ftu

xfail test_ftu_skip_tour because Bug 1068616 - Date&Time settings screen...

========

https://hg.mozilla.org/integration/gaia-central/rev/1a7cb84fb28b
Author: Bebe <bebe@mozilla.ro>
Desc: xfail test_ftu_skip_tour because Bug 1068616 - Date&Time settings screen not skipped when data connection is available

========

https://hg.mozilla.org/integration/gaia-central/rev/b9cc546060b0
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #24101 from zacc/bug_1060381

Bug 1060381 - test_gallery_crop_photo is failing - refactor to reference...

========

https://hg.mozilla.org/integration/gaia-central/rev/da46174fba9a
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1060381 - test_gallery_crop_photo is failing - refactor to reference image metadata
2014-09-17 07:25:46 -07:00