ecb8f8af70
Merge mozilla-central to mozilla-inbound
2015-06-03 13:54:38 +02:00
8e2e7660ae
merge mozilla-inbound to mozilla-central a=merge
2015-06-03 13:49:47 +02:00
94b457497a
merge fx-team to mozilla-central a=merge
2015-06-03 13:11:13 +02:00
2173a3713f
Bug 1160101 - Disable Adobe EME by default; enable only in Mozilla builds - r=glandium
2015-06-03 22:44:55 +12:00
7b0cb6283f
Backed out changeset 2901436c9047 (bug 1141865) for e10-s asan m4 test failures on a CLOSED TREE
2015-06-03 12:46:33 +02:00
916a61c26f
Backed out changeset d038c5da19b0 (bug 1141865)
2015-06-03 12:44:59 +02:00
3dede416d6
Backed out changeset 8f94d0d72a21 (bug 1141865)
2015-06-03 12:42:45 +02:00
c06710b638
Backed out changeset 6031f4ce0f9c (bug 1141865)
2015-06-03 12:42:16 +02:00
2eae096d54
Backed out changeset 24403e652d6d (bug 1141865)
2015-06-03 12:42:03 +02:00
3a80a55abd
Backed out changeset 0f963fbdc918 (bug 1141865)
2015-06-03 12:41:48 +02:00
e1180d592e
Backed out changeset 213b09228bdf (bug 1141865)
2015-06-03 12:41:25 +02:00
8b2e5a46d4
Bug 1163238 - Reftest for auto margins on orthogonal flow.
2015-06-03 11:17:27 +01:00
0dce4f8719
Bug 1163238 - Don't set available block-size to unconstrained for orthogonal-block reflow state until after InitConstraints etc. r=dholbert
2015-06-03 11:17:24 +01:00
7b1fb1fb5c
Backed out changeset dd25b4d148af (bug 1139641) for bustage on a CLOSED TREE
2015-06-03 08:51:36 +02:00
69e89d53b1
Backed out changeset 8e4fdb45e6a8 (bug 1169439) for e10s dt test failures
2015-06-03 08:42:17 +02:00
58544b3813
Bug 1139641 - Return more information from SurfaceCache::Lookup and SurfaceCache::LookupBestMatch. r=dholbert
2015-06-02 23:30:14 -07:00
6b47e51226
Bug 1170877 - Track how many times the SurfaceCache has overflowed and report it in about:memory. r=dholbert
2015-06-02 23:30:11 -07:00
958ac585d4
Bumping manifests a=b2g-bump
2015-06-02 20:02:24 -07:00
19325d7963
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/5bab67b888d1
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #30378 from asutherland/email-bleach-comments
Bug 1170473 - Accept zero-length HTML comments for the sake of content. r=jrburke
========
https://hg.mozilla.org/integration/gaia-central/rev/7a85027c5cbc
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 1170473 - Accept zero-length HTML comments for the sake of content.
2015-06-02 20:00:26 -07:00
e26c2dcac6
Merge m-c to b2ginbound, a=merge
2015-06-02 18:43:50 -07:00
afcb980583
Merge b2ginbound to central, a=merge
2015-06-02 18:34:21 -07:00
d80ffbf1c9
Merge inbound to central, a=merge
2015-06-02 18:20:12 -07:00
a0dee102b6
Bumping manifests a=b2g-bump
2015-06-02 18:17:11 -07:00
4597d9ee1f
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/2cde57100c35
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #30376 from gaye/bug-1170120-again
Bug 1170120 - Dependencies should be declared by the package that uses them
========
https://hg.mozilla.org/integration/gaia-central/rev/6981fb5ec04d
Author: gaye <gaye@mozilla.com>
Desc: Bug 1170120 - Dependencies should be declared by the package that uses them
2015-06-02 18:15:16 -07:00
08171608d2
Bumping manifests a=b2g-bump
2015-06-02 17:03:19 -07:00
c65af32437
Bumping manifests a=b2g-bump
2015-06-02 15:47:14 -07:00
413e463fe5
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9351ee7e1708
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #30333 from mwargers/1170006
Bug 1170006 - Intermittent failure in test_privileged_app_audio_capture_prompt.py at user_media.tap_audio1_button()
========
https://hg.mozilla.org/integration/gaia-central/rev/905a140df9ea
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1170006 - Intermittent failure in test_privileged_app_audio_capture_prompt.py at user_media.tap_audio1_button()
2015-06-02 15:45:17 -07:00
20b578b55b
Bumping manifests a=b2g-bump
2015-06-02 13:17:20 -07:00
aff6e96fb0
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d5e509fd9697
Author: gaye <gaye@mozilla.com>
Desc: Revert "Merge pull request #30367 from gaye/bug-1170120"
This reverts commit 2fbadd586461010cabc2f08191f62090172b127e, reversing
changes made to 4f23badde371569716cbc209d2227ab2006fd096.
2015-06-02 13:15:21 -07:00
dcf4ded0cb
Backed out changeset 5f2e8622f945 (bug 1139376) for causing frequent Win8 w-p-t timeouts.
2015-06-02 16:05:41 -04:00
1feb4346f0
Bug 1170669 - Fix intermittent browser_514751.js crashes by not loading mozilla.org r=mconley
2015-06-02 21:18:31 +02:00
1b843a765f
Bug 1163540 - make sure the debugger treats XBL inline sources correctly r=Gijs
2015-06-02 15:41:09 -04:00
fd56094179
Bug 1107652 - Make cmd/ctrl + zoom in Scratchpad. r=past
2015-06-02 22:32:32 +03:00
e807306135
Bug 1168489 - Combine XPCSHELL_TESTS_MANIFESTS entries in moz.build. r=spohl
2015-06-02 12:17:45 -07:00
1e9ebc9199
Bumping manifests a=b2g-bump
2015-06-02 11:52:26 -07:00
3a7211b0bb
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f80611cfeb39
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #30321 from KevinGrandon/bug_1169785_calendar_gaia_switch
Bug 1169785 - [Calendar] Convert switches to gaia-switch component
========
https://hg.mozilla.org/integration/gaia-central/rev/5696ea590dea
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1169785 - [Calendar] Convert switches to gaia-switch component r=mmedeiros
2015-06-02 11:50:29 -07:00
391d13f887
Bumping manifests a=b2g-bump
2015-06-02 11:37:23 -07:00
129013d093
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4f0ae2cade95
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #30367 from gaye/bug-1170120
Bug 1170120 - Move dependency declarations from jsmarionette packages which landed in gaia to their appropriate fs location
========
https://hg.mozilla.org/integration/gaia-central/rev/2e71b1a9939d
Author: gaye <gaye@mozilla.com>
Desc: Revert "Revert "Bug 1170120 - Move dependency decls from jsm pkgs to appropriate manifests""
This reverts commit 6d477a7884273886605049b20f60af5c1583a150.
Conflicts:
package.json
========
https://hg.mozilla.org/integration/gaia-central/rev/1bf1636c105c
Author: gaye <gaye@mozilla.com>
Desc: Bug 1170120 - Rebuild local in-tree modules when using npm-cache r=nullaus
2015-06-02 11:35:25 -07:00
465a1f9b25
Bumping manifests a=b2g-bump
2015-06-02 11:22:27 -07:00
140addb29a
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/74fae3d5a5fc
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #30258 from KevinGrandon/bug_1168860_settings_display_panel_gaia_switch
Bug 1168860 - [Settings] Initial usage of gaia-switch in the display panel
========
https://hg.mozilla.org/integration/gaia-central/rev/98d22318e507
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1168860 - [Settings] Initial usage of gaia-switch in the display panel r=arthurcc
2015-06-02 11:20:23 -07:00
58b071fe20
Bumping manifests a=b2g-bump
2015-06-02 10:58:24 -07:00
fbe09e7c48
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/746a0e67279e
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #30246 from yzen/bug-1167344
Bug 1167344 - added support for filtering add-on's based on the app.
========
https://hg.mozilla.org/integration/gaia-central/rev/ee0a7881a4b1
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1167344 - added support for filtering add-on's based on the app. r=arthurcc
Change-Id: I6858ec3823d495aa1898596aa327a27d67e92e6e
========
https://hg.mozilla.org/integration/gaia-central/rev/6f42cad84533
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #30369 from eliperelman/bug-1170533
Bug 1170533 - Fixing entry race condition and bad memory parsing
========
https://hg.mozilla.org/integration/gaia-central/rev/f51dd7409bec
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1170533 - Fixing entry race condition and bad memory parsing
2015-06-02 10:56:24 -07:00
cc29c61382
Bumping manifests a=b2g-bump
2015-06-02 09:32:23 -07:00
1189448c8f
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/fc09df812d2a
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #30318 from hfiguiere/bug1169363-test-fixes
Bug 1169363 - Check promise rejection. r=arthur
========
https://hg.mozilla.org/integration/gaia-central/rev/56f3ccd9be0d
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1169363 - Check promise rejection.
Also fix test:
- bind saveConfig callback the the right object.
- fake XHR send() reponse now properly handled.
- fix usage of sinon.
- set the right theme for the wallpaper test.
- use valid manifest URLs
- enableSelection() is never called on saveConfig
2015-06-02 09:30:27 -07:00
34cb792267
Bumping manifests a=b2g-bump
2015-06-02 07:58:15 -07:00
036809fc02
Bumping manifests a=b2g-bump
2015-06-02 07:33:19 -07:00
2de7b2105b
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/75794fa0bcea
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #30314 from sousmangoosta/v3.0
Bug 1157609 - If user taps enter key in add contact page, device will add phone field automatically. Depends on Bug 809452 R=francisco
========
https://hg.mozilla.org/integration/gaia-central/rev/c69117533d09
Author: Ronald Claveau <sousmangoosta@ovh.fr>
Desc: Bug 1157609 - If user taps enter key in add contact page, device will add phone field automatically. Depends on Bug 809452 R=francisco
2015-06-02 07:31:24 -07:00
c5b71cee3b
Bumping manifests a=b2g-bump
2015-06-02 05:37:22 -07:00
d1f34f943e
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6913ca7d53a9
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #30329 from atiqueahmedziad/019921
Bug 1127559 - [Dialer] End call button gets wider when putting a call on hold r=gsvelto
========
https://hg.mozilla.org/integration/gaia-central/rev/335367e9eb28
Author: Atique Ahmed Ziad <softfilebd@gmail.com>
Desc: Bug 1127559 - [Dialer] End call button gets wider when putting a call on hold
Now the End call button doesn't get wider after putting a call on hold
2015-06-02 05:35:26 -07:00
410ad20779
Bumping manifests a=b2g-bump
2015-06-02 05:02:28 -07:00
Carsten "Tomcat" Book
Edwin Flores
Jonathan Kew
Seth Fowler
B2G Bumper Bot
Wes Kocher
Ryan VanderMeulen
Tim Taubert
James Long
Sunny
Robert Strong