Граф коммитов

396144 Коммитов

Автор SHA1 Сообщение Дата
Shubham Jindal ef7984dc9d Bug 1026679 - Make inContent preferences responsive. r=jaws 2014-12-07 22:12:00 -05:00
Tim Nguyen eebb7eb5c5 Bug 738646 - Show apps button by default on about:home and remove hidden pref related to it. r=jaws 2014-12-05 15:46:00 -05:00
Dan Mosedale 0fd9267ee6 Bug 1107255-Fix tested Loop callers of window.close to use WindowCloseMixin, r=NiKo` 2014-12-09 12:04:25 -08:00
Dan Mosedale 52778dad2c Bug 1107255 - Close panel on call conversation start, r=:NiKo` 2014-12-09 11:22:47 -08:00
Ryan VanderMeulen 32f2a32730 Merge m-c to fx-team. a=merge
CLOSED TREE
2014-12-09 14:19:43 -05:00
Ryan VanderMeulen 4e5dbde020 Merge fx-team to m-c. a=merge
CLOSED TREE
2014-12-09 14:16:03 -05:00
Ryan VanderMeulen 507e950980 Merge b2g-inbound to m-c. a=merge 2014-12-09 14:11:06 -05:00
Ryan VanderMeulen 1bdab6fe7b Backed out changesets fb903f13f215, 9c5c712698e4, and 36d257ead3da (bug 1092835) for causing test_csp_allow_https_schemes.html permafail on Android 2.3.
CLOSED TREE
2014-12-09 14:00:47 -05:00
Richard Newman 833c18887f Bug 1109000 - Split statics out of BrowserLocaleManager. r=nalexander, a=java-only on a CLOSED TREE
--HG--
rename : mobile/android/base/LocaleAware.java => mobile/android/base/Locales.java
2014-12-09 18:07:07 +00:00
Ryan VanderMeulen 131c9d3d17 Bug 1092835 - Bump the nsIWebProgressListener UUID. CLOSED TREE 2014-12-09 12:37:15 -05:00
Ryan VanderMeulen 054f112d6d Backed out changeset a0a2ada42652 (bug 936724) because something in the push made Gij(2) permafail.
CLOSED TREE
2014-12-09 12:09:09 -05:00
Ryan VanderMeulen 9dc33bae19 Backed out 5 changesets (bug 1092888) because something in the push made Gij(2) permafail.
Backed out changeset 0ad25135a27f (bug 1092888)
Backed out changeset 7cd8260bfc16 (bug 1092888)
Backed out changeset 86385291d8c8 (bug 1092888)
Backed out changeset be16d194d5df (bug 1092888)
Backed out changeset daee46827258 (bug 1092888)
2014-12-09 12:08:59 -05:00
Ryan VanderMeulen b2a40f89be Backed out changeset d4dfb076f5f1 (bug 1108714) because something in the push made Gij(2) permafail. 2014-12-09 12:08:45 -05:00
Martyn Haigh cb802d754f Bug 1100464 - Add back button to top left of the tabs panel (r=lucasr) 2014-12-09 17:07:26 +00:00
Richard Newman 56f1111e87 Bug 1108252 - Remove launcher icon for search activity. r=mfinkle 2014-12-09 16:37:58 +00:00
B2G Bumper Bot a931c3928d Bumping manifests a=b2g-bump 2014-12-09 08:26:51 -08:00
B2G Bumper Bot dff1b3b94b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0e1227044422
Author: Mike Habicher <mikeh@mozilla.com>
Desc: Merge pull request #26663 from mikeaich/bug1107284_2

Bug 1107284 - remove callbacks from focus.js as well, r=wilsonpage

========

https://hg.mozilla.org/integration/gaia-central/rev/d943b5d95cc4
Author: Mike Habicher <mikeh@mozilla.com>
Desc: Bug 1107284 - remove callbacks from focus.js as well
2014-12-09 08:17:41 -08:00
B2G Bumper Bot e5c5e9ad86 Bumping manifests a=b2g-bump 2014-12-09 08:11:57 -08:00
B2G Bumper Bot 043460c7fd Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/83fd6aa5185b
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26615 from npark-mozilla/1100390_2ndAttempt

Bug 1100390: Create a new test case for the deletion of video from Preview

========

https://hg.mozilla.org/integration/gaia-central/rev/118ad5d4ee24
Author: No-Jun <npark@mozilla.com>
Desc: Bug 1100390: Create a new test case for the deletion of video from Preview

New wait syntax used
method name changed to is_video_play_button_visible from is_preview_visible

========

https://hg.mozilla.org/integration/gaia-central/rev/7443efe4efdc
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26041 from JohanLorenzo/bug-1093589

Bug 1093589 - [DSDS] Add test to receive phone call on second SIM

========

https://hg.mozilla.org/integration/gaia-central/rev/561842b6cf95
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1093589 - [DSDS] Add test to receive phone call on second SIM
2014-12-09 08:02:17 -08:00
B2G Bumper Bot 82ae9566a1 Bumping manifests a=b2g-bump 2014-12-09 07:52:01 -08:00
B2G Bumper Bot c3e637e3c8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/91b6e108c833
Author: viorelaioia <viorela.ioia@softvision.ro>
Desc: Merge pull request #26639 from bebef1987/fix_cost_control

Bug 1107926 - Update cost_control app object to reflect changes in Bug 1...

========

https://hg.mozilla.org/integration/gaia-central/rev/405143dde9a7
Author: bebef1987 <florin.strugariu@softvision.ro>
Desc: Bug 1107926 - Update cost_control app object to reflect changes in Bug 1089968
2014-12-09 07:47:22 -08:00
B2G Bumper Bot da0a2d4f22 Bumping manifests a=b2g-bump 2014-12-09 07:13:51 -08:00
B2G Bumper Bot 0de209db57 Bumping manifests a=b2g-bump 2014-12-09 06:17:02 -08:00
B2G Bumper Bot d2a387d6a9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1427918430cc
Author: chirarobert <robert.chira@softvision.ro>
Desc: Merge pull request #26657 from JohanLorenzo/bug-1108534

Bug 1108534 - test_delete_call_log should use a hard-coded phone, not re...

========

https://hg.mozilla.org/integration/gaia-central/rev/52da9928def6
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Bug 1108534 - test_delete_call_log should use a hard-coded phone, not remote_phone_number
2014-12-09 06:12:17 -08:00
B2G Bumper Bot 1ed5a94a93 Bumping manifests a=b2g-bump 2014-12-09 06:01:53 -08:00
B2G Bumper Bot 2b6744c4e2 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a4ce4f4bbed5
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 1109002 - Bump gaiatest version to 0.32. r=fstrugariu
2014-12-09 05:57:15 -08:00
Carsten "Tomcat" Book 45230b6414 Merge mozilla-central to b2g-inbound 2014-12-09 13:20:50 +01:00
Carsten "Tomcat" Book c24633af80 merge fx-team to mozilla-central a=merge 2014-12-09 13:08:37 +01:00
Carsten "Tomcat" Book 18858ecfb5 merge mozilla-inbound to mozilla-central a=merge 2014-12-09 12:51:54 +01:00
B2G Bumper Bot 83dd5b546e Bumping manifests a=b2g-bump 2014-12-08 23:22:01 -08:00
B2G Bumper Bot 092429e7ea Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/00c26c7075f1
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1042673 - merge pull request #26653 from julienw:1042673-hysteresis-luminosity-control-v2 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/3b53d202e034
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1042673 - Automatic brightness needs some hysteresis r=timdream
2014-12-08 23:17:23 -08:00
B2G Bumper Bot cf6e0cd698 Bumping manifests a=b2g-bump 2014-12-08 23:07:01 -08:00
B2G Bumper Bot c21e5e12bc Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ab0000d0f6dc
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1101518 - [Build] Don't rewrite "async" scripts, and fix the skipping operation r=rickychien
2014-12-08 23:02:20 -08:00
Phil Ringnalda 95ca321b54 Back out eb203c9db11d (bug 1107541) for e10s dt bustage
CLOSED TREE
2014-12-08 20:24:52 -08:00
Nick Alexander 05762df188 Bug 1084098 - Add Android tools tags to some Remote Tabs home panel views. r=mcomella
These tags are used by Android tools (including IntelliJ) at design-time
to show "sample data".  They're stripped entirely at build time.
2014-12-08 19:32:51 -08:00
Nick Alexander e93eb67e90 Bug 1084098 - Adjust padding/margins of Sync tabs panel items. r=mcomella
Pretty straight-forward implementation of the mock.  The mock shows a
different "bookmark star" icon, with slightly different right-margins,
and implementing that change requires changing the TwoLinePageRow layout
to not use drawableRight for the star.  (Otherwise, the star will not be
vertically centered in the container.)  I don't care to make that change
for this ticket.
2014-12-08 19:32:37 -08:00
Nick Alexander 005f604ab4 Bug 1084098 - Pre: Don't require GeckoApplication in Themed*widgets. r=mcomella
In editors (Eclipse and IntelliJ), Android View sub-classes are created
in a "Bridging" mock context.  There is no ambient GeckoApplication in
this case.  It's already okay for the LWT to be null; let's loosen the
requirement that there be an ambient GeckoApplication to let these View
sub-classes render in editors.
2014-12-08 18:58:37 -08:00
B2G Bumper Bot f47727f716 Bumping manifests a=b2g-bump 2014-12-08 16:01:51 -08:00
B2G Bumper Bot fc8a70c550 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1103087 - Collection offline textContent r=Cwiiis

========

https://hg.mozilla.org/integration/gaia-central/rev/638c5f901643
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1103087 - Collection offline textContent
2014-12-08 15:57:12 -08:00
James Long 7ced063c80 Bug 1107541 - display eval scripts with a sourceURL pragma correctly in the debugger r=fitzgen 2014-12-08 15:49:34 -08:00
Chris Manchester 2f3509ec3d Bug 1108714 - Make marionette's skip_if_b2g run desktop tests. r=mdas 2014-12-08 17:21:59 -05:00
B2G Bumper Bot 4c61d1c564 Bumping manifests a=b2g-bump 2014-12-08 14:01:48 -08:00
B2G Bumper Bot f8f4eb09b7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fc40d72424e2
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #26658 from yzen/bug-1108684

Bug 1108684 - removed <br> from event-multiple-day-duration aria-label

========

https://hg.mozilla.org/integration/gaia-central/rev/546a725cb1d6
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1108684 - removed <br> from event-multiple-day-duration aria-label
2014-12-08 13:52:39 -08:00
Ryan VanderMeulen 529edd40b5 Merge inbound to m-c. a=merge 2014-12-08 15:46:14 -05:00
Ryan VanderMeulen 47e5302790 Merge fx-team to m-c. a=merge 2014-12-08 15:37:46 -05:00
Ryan VanderMeulen 0aae88bf85 Backed out changesets ae63e2dda6e0, a9ca0113db3c, and d0a6757e24bd (bug 1097823) for bustage.
DONTBUILD CLOSED TREE
2014-12-08 15:00:02 -05:00
Bobby Holley 1a45088976 Bug 1097823 - Implement Media Promises. r=cpearce 2014-12-08 11:34:50 -08:00
Bobby Holley 881af4ca94 Bug 1097823 - Implement MediaTaskQueue::ForceDispatch. r=cpearce
This is necessary to have strong guarantees that promises will be resolved.
While we're flushing the task queue, normal dispatch starts to fail,
meaning that we can't dispatch promise resolution. We have 3 options to handle
this:

(A) Never respond to the promise.
(B) Invoke the Resolve/Reject callback synchronously if dispatch fails.
(C) Prevent dispatch from failing.

(C) seems like the option least likely to violate invariants if we can get away
with it. Promise resolution is unlikely to be a heavyweight task in the way that
a decode task might be, so this should hopefully be ok.

Note that this still doesn't help for bonafide task queue shutdown. It's up to
consumers to tear down their MediaPromiseHolders before the task queues are shut
down.
2014-12-08 11:34:50 -08:00
Bobby Holley 7aa1467674 Bug 1097823 - Move NotDecodedReason from RequestSampleCallback to MediaDecoderReader. r=cpearce 2014-12-08 11:34:50 -08:00
Margaret Leibovic 4025761744 Bug 1105290 - Add null check to createEngineFromFileList. r=rnewman
--HG--
extra : rebase_source : 5a02f71a93659a297de3f8b2a8facb7c6a32f37e
extra : amend_source : 9ff1f1b354f6a50d5d49b060d1e1eac118ad712e
2014-12-08 11:12:44 -08:00