Commit Graph

186670 Commits

Author SHA1 Message Date
B2G Bumper Bot
ee213b7396 Bumping manifests a=b2g-bump 2014-06-03 19:26:34 -07:00
B2G Bumper Bot
5d2c80d12c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1fed63dea282
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #19964 from jimporter/ringtones-share-audio-channel

Bug 1019967 - [ringtones] Fix pausing the music app during the share rington...

========

https://hg.mozilla.org/integration/gaia-central/rev/082f54572a2b
Author: Jim Porter <jporter@mozilla.com>
Desc: Bug 1019967 - [ringtones] Fix pausing the music app during the share ringtone activity; r=djf
2014-06-03 19:21:09 -07:00
B2G Bumper Bot
7aeee9ca7e Bumping manifests a=b2g-bump 2014-06-03 19:16:34 -07:00
B2G Bumper Bot
6015079b55 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a5d8735a5c6b
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #19920 from dmarcos/bug998362

Bug 998362 - First integration test using marionette js

========

https://hg.mozilla.org/integration/gaia-central/rev/a8d5735cf323
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 998362 - First integration test using marionette js
2014-06-03 19:11:10 -07:00
B2G Bumper Bot
843968235b Bumping manifests a=b2g-bump 2014-06-03 19:01:19 -07:00
B2G Bumper Bot
b39dd8e49f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0634398cdbe6
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #19962 from jimporter/ringtone-share-default-text-wrap

Bug 1018322 - Checkbox "Use as default ringtone" looks bad when translat...

========

https://hg.mozilla.org/integration/gaia-central/rev/e099802866ee
Author: Jim Porter <jporter@mozilla.com>
Desc: Bug 1018322 - Checkbox "Use as default ringtone" looks bad when translation spans on multiple lines
2014-06-03 18:56:24 -07:00
B2G Bumper Bot
4f2e9e8e51 Bumping manifests a=b2g-bump 2014-06-03 17:51:12 -07:00
B2G Bumper Bot
280c8a5d67 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1019745 - [Search] Remove dragdrop feature from gaia-grid

========

https://hg.mozilla.org/integration/gaia-central/rev/ce566d8a0c98
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1019745 - [Search] Remove dragdrop feature from gaia-grid r=daleharvey
2014-06-03 17:46:14 -07:00
Ryan VanderMeulen
45c82a15b3 Merge m-c to fx-team. 2014-06-03 17:50:44 -04:00
B2G Bumper Bot
fdaf45be3e Bumping manifests a=b2g-bump 2014-06-03 14:38:02 -07:00
Chris Manchester
8022fa1470 Bug 1019883 - Don't populate expected field in log messages for skipped tests. r=jgraham 2014-06-03 16:08:53 -04:00
Olli Pettay
cb55b3b096 Bug 1003046 - ContentChild::RecvPBrowserConstructor should not call SendGetProcessAttributes(), r=fabrice,khuey 2014-06-04 00:15:27 +03:00
B2G Bumper Bot
3c482f8855 Bumping manifests a=b2g-bump 2014-06-03 12:33:22 -07:00
B2G Bumper Bot
127e0dd1d4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Revert "Bug 1019243 - use a depth of 1 for shallow clones of Gaia"

========

https://hg.mozilla.org/integration/gaia-central/rev/4c14c9b29429
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1019243 - use a depth of 1 for shallow clones of Gaia"

This reverts commit 805a1af97c46d2b26fed9461b37450634401d093.
2014-06-03 12:33:11 -07:00
Ryan VanderMeulen
da7b6b04ae Merge m-c to b2g-inbound. a=merge
--HG--
rename : dom/telephony/gonk/TelephonyProvider.js => dom/telephony/gonk/TelephonyService.js
2014-06-03 15:22:54 -04:00
Ryan VanderMeulen
133d8d7389 Merge inbound to m-c. 2014-06-03 15:21:43 -04:00
Ryan VanderMeulen
bd588d085b Backed out changeset a0b233afc099 (bug 1011084) for causing bug 1019827. a=me 2014-06-03 15:17:04 -04:00
Ryan VanderMeulen
9305d5716f Merge fx-team to m-c. 2014-06-03 14:41:54 -04:00
Ryan VanderMeulen
5ea0d12f0d Backed out 4 changesets (bug 993282) for bringing back bug 1008357 on a CLOSED TREE.
Backed out changeset b67f3001c73d (bug 993282)
Backed out changeset b9ca30286579 (bug 993282)
Backed out changeset 41fe339ca4ea (bug 993282)
Backed out changeset 2a6184672f1e (bug 993282)
2014-06-03 14:32:10 -04:00
Ryan VanderMeulen
d221f7e847 Backed out changesets 6d1c36585219 and bd403a727849 (bug 1016560) for mochitest-other failures.
CLOSED TREE
2014-06-03 13:48:49 -04:00
B2G Bumper Bot
4700531fc8 Bumping manifests a=b2g-bump 2014-06-03 10:41:39 -07:00
B2G Bumper Bot
bb2ef920d5 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3c1ff0ed875b
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #19921 from rnowm/1019401

Bug 1019401 - [Contacts] Change import footer buttons to mach visual design r=jmcf

========

https://hg.mozilla.org/integration/gaia-central/rev/cfbf6ccc671f
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 1019401 - [Contacts] Change import footer buttons to mach visual design

========

https://hg.mozilla.org/integration/gaia-central/rev/274ad649711b
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1014590 - Unxfail test_lockscreen_unlock_to_camera a=testonly

========

https://hg.mozilla.org/integration/gaia-central/rev/ebe6c3631036
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1018515 - Follow-up, adjust font size to match homescreen sizing r=me
2014-06-03 10:36:07 -07:00
B2G Bumper Bot
fca31a918d Bumping manifests a=b2g-bump 2014-06-03 10:26:21 -07:00
B2G Bumper Bot
7e8d0d0de0 Bumping gaia.json for 10 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/22a497a21c75
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #19846 from jrburke/bug1016503-email-privileged

Bug 1016503 - [email] move sound preference into app, allowing email to be privileged r=asuth,arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/bfe481059d9c
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1016503 - [email] move sound preference into app, allowing email to be a privileged app

========

https://hg.mozilla.org/integration/gaia-central/rev/52a6d97b2991
Author: Andrew Halberstadt <halbersa@gmail.com>
Desc: Merge pull request #19937 from ahal/gaia_unit_mozrunner

Bug 1019011 - Update gaia unit tests to work with new mozrunner, r=jgrif...

========

https://hg.mozilla.org/integration/gaia-central/rev/e14ae79dfca0
Author: Andrew Halberstadt <halbersa@gmail.com>
Desc: Bug 1019011 - Update gaia unit tests to work with new mozrunner, r=jgriffin

========

https://hg.mozilla.org/integration/gaia-central/rev/09ef3aded55b
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 993236 - Resolve syntax error in manifest file a=testonly r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/4ca112111ba4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #19941 from crdlc/bug-1019423

Bug 1019423 - Edge Swipe Gesture - Status Bar Transition Issue

========

https://hg.mozilla.org/integration/gaia-central/rev/09fd4759d641
Author: crdlc <crdlc@tid.es>
Desc: Bug 1019423 - Edge Swipe Gesture - Status Bar Transition Issue

========

https://hg.mozilla.org/integration/gaia-central/rev/cdc825dbde2b
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #19852 from hfiguiere/jshint

Bug 1017347 - Make test files pass jshint. r=eli

========

https://hg.mozilla.org/integration/gaia-central/rev/5d1b5a74699c
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1017347 - Make test files pass jshint.

========

https://hg.mozilla.org/integration/gaia-central/rev/437f2afa629e
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Revert "Merge pull request #19627 from cctuan/987487-2"

This broke the Dialer and Usage app.

This reverts commit d5c9689b19d8871bc8e03d959db4959a90041460, reversing
changes made to a10f4f3f30e7d9e460d2702395bbc09976a42b60.
2014-06-03 10:25:12 -07:00
Ehsan Akhgari
33ff563880 Typo fix, no bug, DONTBUILD, CLOSED TREE 2014-06-03 12:44:48 -04:00
Ehsan Akhgari
a65b9a8893 Add some documentation for ShimInterfaceInfo, no bug, DONTBUILD, CLOSED TREE 2014-06-03 12:37:08 -04:00
Cosmin Malutan
fa309172e1 Bug 1009004 - Re-implement INSTALL.sh script as a python script. r=hskupin DONTBUILD 2014-06-03 18:10:01 +02:00
Boris Zbarsky
47afef3760 Bug 1016560 followup. Fix a new Promise::MaybeReject callsite that was introduced. r=build-bustage 2014-06-03 12:03:16 -04:00
Kartikaya Gupta
c274d44dab Bug 1004266 - Guard against a possible null outerWindow. rs=smaug 2014-06-03 11:59:53 -04:00
Boris Zbarsky
253e2d6c68 Bug 1016560. Remove the footgun of rejecting promises with arbitrary objects. r=khuey 2014-06-03 11:38:38 -04:00
Daniel Holbert
9424c286ad Bug 1020643: Annotate COMPILE_ASSERT's typedef as permissibly unused, to fix GCC 4.8 build warning. r=Waldo 2014-06-04 18:13:02 -07:00
Wes Kocher
40a1340af8 Merge m-c to inbound on a CLOSED TREE 2014-06-04 18:48:20 -07:00
Wes Kocher
b1ee36d440 Backed out changeset f644eda342c2 (bug 1000640) for various gl-based failures on a CLOSED TREE 2014-06-04 18:29:21 -07:00
Wes Kocher
7f0d583dfb Backed out changeset 9d1dd5a9be4f (bug 1000640) 2014-06-04 18:27:41 -07:00
Wes Kocher
2486c8c21e Backed out changeset cb1ea8162165 (bug 1000640) 2014-06-04 18:27:31 -07:00
Wes Kocher
3729ad76bc Backed out changeset 3a764e34c366 (bug 1000640) 2014-06-04 18:27:22 -07:00
Wes Kocher
0dfb1e3737 Backed out changeset fa44003a4040 (bug 1000640) for various gl-based failures on a CLOSED TREE 2014-06-04 18:27:08 -07:00
Wes Kocher
91e16b9ffc Backed out changeset 5be1a688e645 (bug 1000640) 2014-06-04 18:26:27 -07:00
Garrett Robinson
d6f6702922 Backed out changeset d9a7b9a18ab4 (Bug 988616) on a CLOSED TREE
--HG--
rename : content/base/test/xcsp/file_CSP_bug916446.html => content/base/test/csp/file_CSP_bug916446.html
rename : content/base/test/xcsp/file_CSP_bug916446.html^headers^ => content/base/test/csp/file_CSP_bug916446.html^headers^
rename : content/base/test/xcsp/file_CSP_evalscript_main.html => content/base/test/csp/file_CSP_evalscript_main.html
rename : content/base/test/xcsp/file_CSP_evalscript_main.html^headers^ => content/base/test/csp/file_CSP_evalscript_main.html^headers^
rename : content/base/test/xcsp/file_CSP_frameancestors.sjs => content/base/test/csp/file_CSP_frameancestors.sjs
rename : content/base/test/xcsp/file_CSP_frameancestors_main.html => content/base/test/csp/file_CSP_frameancestors_main.html
rename : content/base/test/xcsp/file_CSP_frameancestors_main.js => content/base/test/csp/file_CSP_frameancestors_main.js
rename : content/base/test/xcsp/file_CSP_inlinescript_main.html => content/base/test/csp/file_CSP_inlinescript_main.html
rename : content/base/test/xcsp/file_CSP_inlinescript_main.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main.html^headers^
rename : content/base/test/xcsp/file_CSP_inlinestyle_main.html => content/base/test/csp/file_CSP_inlinestyle_main.html
rename : content/base/test/xcsp/file_CSP_inlinestyle_main.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main.html^headers^
rename : content/base/test/xcsp/file_CSP_main.html => content/base/test/csp/file_CSP_main.html
rename : content/base/test/xcsp/file_CSP_main.html^headers^ => content/base/test/csp/file_CSP_main.html^headers^
rename : content/base/test/xcsp/file_CSP_main.js => content/base/test/csp/file_CSP_main.js
rename : content/base/test/xcsp/file_bothCSPheaders.html => content/base/test/csp/file_bothCSPheaders.html
rename : content/base/test/xcsp/file_bothCSPheaders.html^headers^ => content/base/test/csp/file_bothCSPheaders.html^headers^
rename : content/base/test/xcsp/file_dual_headers_warning.html => content/base/test/csp/file_dual_headers_warning.html
rename : content/base/test/xcsp/file_dual_headers_warning.html^headers^ => content/base/test/csp/file_dual_headers_warning.html^headers^
rename : content/base/test/xcsp/file_policyuri_async_fetch.html => content/base/test/csp/file_policyuri_async_fetch.html
rename : content/base/test/xcsp/file_policyuri_async_fetch.html^headers^ => content/base/test/csp/file_policyuri_async_fetch.html^headers^
rename : content/base/test/xcsp/test_CSP_bug916446.html => content/base/test/csp/test_CSP_bug916446.html
rename : content/base/test/xcsp/test_bothCSPheaders.html => content/base/test/csp/test_bothCSPheaders.html
rename : content/base/test/xcsp/test_dual_headers_warning.html => content/base/test/csp/test_dual_headers_warning.html
rename : content/base/test/xcsp/test_policyuri_async_fetch.html => content/base/test/csp/test_policyuri_async_fetch.html
2014-06-04 17:53:58 -07:00
Garrett Robinson
5aa4d0d515 Backed out changeset f3e45719fda7 (bug 988616) on a CLOSED TREE 2014-06-04 17:53:14 -07:00
Garrett Robinson
059110c4f8 Backed out changeset bf40eebc6543 (bug 988616) on a CLOSED TREE 2014-06-04 17:52:35 -07:00
Garrett Robinson
e22445f31e Backed out changeset 1be4b6552473 (bug 988616) on a CLOSED TREE
--HG--
rename : content/base/test/csp/file_CSP_evalscript_main.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html
rename : content/base/test/csp/file_CSP_evalscript_main.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html^headers^
rename : content/base/test/csp/file_CSP_evalscript_main_allowed.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html
rename : content/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^
rename : content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html
rename : content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^
rename : content/base/test/csp/file_CSP_frameancestors_main.html => content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.html
rename : content/base/test/csp/file_CSP_frameancestors_main.js => content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.js
rename : content/base/test/csp/file_CSP_frameancestors.sjs => content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs
rename : content/base/test/csp/file_CSP_inlinescript_main.html => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html
rename : content/base/test/csp/file_CSP_inlinescript_main.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html^headers^
rename : content/base/test/csp/file_CSP_inlinescript_main_allowed.html => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html
rename : content/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^
rename : content/base/test/csp/file_CSP_inlinestyle_main.html => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html
rename : content/base/test/csp/file_CSP_inlinestyle_main.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html^headers^
rename : content/base/test/csp/file_CSP_inlinestyle_main_allowed.html => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html
rename : content/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^
rename : content/base/test/csp/file_CSP_main.html => content/base/test/csp/file_CSP_main_spec_compliant.html
rename : content/base/test/csp/file_CSP_main.html^headers^ => content/base/test/csp/file_CSP_main_spec_compliant.html^headers^
rename : content/base/test/csp/file_CSP_main.js => content/base/test/csp/file_CSP_main_spec_compliant.js
2014-06-04 17:51:55 -07:00
Garrett Robinson
9ee2bde87c Backed out changeset 948a658c002b (bug 988616) on a CLOSED TREE 2014-06-04 17:51:08 -07:00
Wes Kocher
1637596c04 Backed out changeset c9a08c041519 (bug 1020396) for Gu bustage on a CLOSED TREE 2014-06-04 16:59:54 -07:00
Jeff Gilbert
0f858dd76d Bug 1000640 - Mark C/A 1.0/0.5 non-premult test as random, since it passes on Win7 Ru. - r=mattwoodrow CLOSED TREE 2014-06-04 16:54:51 -07:00
Jonathan Griffin
e24f10fe60 Bug 1020396 - Bump marionette-transport to 0.2, r=mdas 2014-06-04 13:38:33 -07:00
William Chen
8ddf869770 Bug 1011831 - Support <template> element in XHTML parser. r=hsivonen 2014-06-04 15:21:23 -07:00
Garrett Robinson
5fb45a2838 Bug 988616 - Remove refs to "spec compliant" from split CSP tests r=sstamm r=ckerschb 2014-06-04 15:24:40 -07:00
Garrett Robinson
63f9d07906 Bug 988616 - Rename CSP test files to remove unnecessary "spec_compliant" refs r=sstamm r=ckerschb
--HG--
rename : content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html => content/base/test/csp/file_CSP_evalscript_main.html
rename : content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_evalscript_main.html^headers^
rename : content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html => content/base/test/csp/file_CSP_evalscript_main_allowed.html
rename : content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^
rename : content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html => content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.html
rename : content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.html^headers^
rename : content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs => content/base/test/csp/file_CSP_frameancestors.sjs
rename : content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.html => content/base/test/csp/file_CSP_frameancestors_main.html
rename : content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.js => content/base/test/csp/file_CSP_frameancestors_main.js
rename : content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html => content/base/test/csp/file_CSP_inlinescript_main.html
rename : content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main.html^headers^
rename : content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html => content/base/test/csp/file_CSP_inlinescript_main_allowed.html
rename : content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^
rename : content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html => content/base/test/csp/file_CSP_inlinestyle_main.html
rename : content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main.html^headers^
rename : content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html => content/base/test/csp/file_CSP_inlinestyle_main_allowed.html
rename : content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^
rename : content/base/test/csp/file_CSP_main_spec_compliant.html => content/base/test/csp/file_CSP_main.html
rename : content/base/test/csp/file_CSP_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_main.html^headers^
rename : content/base/test/csp/file_CSP_main_spec_compliant.js => content/base/test/csp/file_CSP_main.js
2014-06-04 15:24:39 -07:00
Garrett Robinson
d80b11ef83 Bug 988616 - Split CSP tests for CSP (1.0) and X-CSP, and update build system files r=sstamm r=ckerschb 2014-06-04 15:24:38 -07:00