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

453398 Коммитов

Автор SHA1 Сообщение Дата
Wes Kocher 13dbbc1cfc Merge b2ginbound to central, a=merge
--HG--
extra : commitid : HXlqlrbW6rE
2015-12-03 15:44:46 -08:00
B2G Bumper Bot e7a07471ca Bumping manifests a=b2g-bump 2015-12-03 14:45:59 -08:00
B2G Bumper Bot e482da9da3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f8b0a6383f64
Author: Sam Foster <sfoster@mozilla.com>
Desc: Merge pull request #33476 from sfoster/ftu-late-customization-gij-bug-1215219

Bug 1215219 - Integration tests for Late Customization.

========

https://hg.mozilla.org/integration/gaia-central/rev/c69974389469
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1215219 - Integration tests for Late Customization. r=arcturus
2015-12-03 14:44:34 -08:00
Chris Pearce ff1b756ddd Bug 1230026 - Add test for 'webm' initDataType for ClearKey initData. r=gerald
--HG--
rename : dom/media/test/test_eme_key_ids_initdata.html => dom/media/test/test_eme_initDataTypes.html
2015-12-04 07:24:32 +13:00
Chris Pearce 9654972991 Bug 1230026 - Support 'webm' initDataType format for MP4 ClearKey initData. r=gerald 2015-12-04 07:24:11 +13:00
B2G Bumper Bot 3bb48b3744 Bumping manifests a=b2g-bump 2015-12-03 09:39:58 -08:00
B2G Bumper Bot 8d27d87204 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1a71a5a82809
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #33498 from ferjm/bug1230142.asyncStorage.switch.accounts

Bug 1230142 - asyncStorage not defined when switching accounts. r=mic…

========

https://hg.mozilla.org/integration/gaia-central/rev/694d8bfd0e65
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1230142 - asyncStorage not defined when switching accounts. r=michielbdejong
2015-12-03 09:38:34 -08:00
Gregor Wagner 03c5c2e7d0 Bug 1215494 - Don't set b2g.safe_mode pref in child process. r=fabrice 2015-12-03 18:23:22 +01:00
Fabrice Desré 73cba43755 Bug 1229620 - Replace #ifdefs in b2g/ code by AppConstants r=timdream 2015-12-03 09:14:07 -08:00
B2G Bumper Bot e20ba29a1c Bumping manifests a=b2g-bump 2015-12-03 07:16:36 -08:00
B2G Bumper Bot 4f29e9e6c0 Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/519a0bca45fa
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Revert "Bug 1224203 - Update Kinto.js to version 6ea1cf5 (1 Dec), r=ferjm"

This reverts commit 2fa6b60d2e42cf7e202497dc72882aca5d4725fa.

========

https://hg.mozilla.org/integration/gaia-central/rev/6d2bd78e65f9
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #33468 from azasypkin/bug-1229372-update-libs

Bug 1229372 - [Messages][NG] Update tools/update_nga_libs.sh script to work with new fxos-components repository. r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/c6bec3afc105
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1229372 - [Messages][NG] Update tools/update_nga_libs.sh script to work with new fxos-components repository. r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/d72a203016e8
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #33460 from albertopq/1228600-migrate-sim

Bug 1228600 - Migrate SimLockSystemDialog to a WebComponent r=mhenretty

========

https://hg.mozilla.org/integration/gaia-central/rev/6ca318dd371d
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1228600 - Migrate SimLockSystemDialog to a WebComponent r=mhenretty
2015-12-03 07:15:13 -08:00
Brian Grinstead 54cb6670fc Bug 1220011 - Yield on 'console close' command in test (fixes permafail with bug 1224294 applied); r=jwalker
--HG--
extra : commitid : 8bpM49oABkB
2015-12-03 10:02:37 -05:00
Maja Frydrychowicz ec0bb89f43 Bug 1230079 - Update media-test revisions to use latest Marionette; r=me
--HG--
extra : commitid : BqIIREstHOS
extra : rebase_source : feb069bfc578a2453a88ca43f182520d7c87a844
2015-12-03 10:01:44 -05:00
Olli Pettay c1987714e7 Bug 1229760 - CustomElement registry keeps strong reference to the unresolved elements, r=wchen 2015-12-03 18:21:04 +02:00
Geoff Brown 6dcf945cd4 Bug 1201018 - Catch exception in PersistTabsRunnable; r=rnewman 2015-12-03 09:10:46 -07:00
B2G Bumper Bot 5dc5eb9d71 Bumping manifests a=b2g-bump 2015-12-03 06:45:51 -08:00
B2G Bumper Bot 14015104eb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/df2a4e911824
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #33496 from arcturus/bug-1146265

Bug 1146265 - [Aries][Nexus 5][Contacts] Creating new contact page do…

========

https://hg.mozilla.org/integration/gaia-central/rev/9cdd5bc45efc
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1146265 - [Aries][Nexus 5][Contacts] Creating new contact page does not fit the screen width. r=ferjm
2015-12-03 06:44:28 -08:00
Carsten "Tomcat" Book 4f04da8f11 Merge mozilla-central to b2g-inbound 2015-12-03 12:11:24 +01:00
Carsten "Tomcat" Book df451fe7b0 merge mozilla-inbound to mozilla-central a=merge 2015-12-03 12:00:42 +01:00
Carsten "Tomcat" Book 4e9e4bed5a merge fx-team to mozilla-central a=merge 2015-12-03 11:58:40 +01:00
Carsten "Tomcat" Book 31f667fc7e merge b2g-inbound to mozilla-central a=merge 2015-12-03 11:57:06 +01:00
B2G Bumper Bot bc529ded47 Bumping manifests a=b2g-bump 2015-12-03 02:55:10 -08:00
B2G Bumper Bot 3740264ca5 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f4183136380d
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #32561 from gabrielesvelto/bug-1199773-callscreen-lockscreen-state-fix

Bug 1199773 - Make the callscreen state coherent with the lockscreen state. r=thills

========

https://hg.mozilla.org/integration/gaia-central/rev/f73a610ef448
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1199773 - Make the callscreen state coherent with the lockscreen state. r=drs
2015-12-03 02:53:47 -08:00
B2G Bumper Bot 5e61dbff6a Bumping manifests a=b2g-bump 2015-12-03 02:00:07 -08:00
B2G Bumper Bot ff2a270fcf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b6c6ab0cf0ca
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #32927 from timdream/tz_select

Bug 1218677 - Don't rely on incorrect <select> behavior, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/7e757128c3e6
Author: Mats Palmgren <mats@mozilla.com>
Desc: Bug 1218677 - Don't rely on incorrect <select> behavior
2015-12-03 01:58:45 -08:00
B2G Bumper Bot 7b5285603c Bumping manifests a=b2g-bump 2015-12-03 01:09:54 -08:00
B2G Bumper Bot a6759e5d74 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/23255b236be2
Author: isabelrios <isabelrios@gmail.com>
Desc: Merge pull request #33485 from isabelrios/Duplicate_phone_number_final

Bug 1228294 - Verify that the duplicates found screen is shown

========

https://hg.mozilla.org/integration/gaia-central/rev/e7fb57c514a2
Author: Isabel Rios Escobar <irios@MacBook-Pro-de-Isabel.local>
Desc: Bug 1228294 - Verify that the duplicates found screen is shown

deleting one line

========

https://hg.mozilla.org/integration/gaia-central/rev/0476046e5aff
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #33492 from ferjm/bug1229920.sync.production

Bug 1229920 - Sync stuck at signing in. r=fabrice

========

https://hg.mozilla.org/integration/gaia-central/rev/a9ec2e0a6090
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1229920 - Sync stuck at signing in. r=fabrice
2015-12-03 01:08:32 -08:00
Botond Ballo 79efe79201 Bug 1069417 - Fix an error introduced when rebasing across bug 1021845 to reopen a CLOSED TREE. r=bustage 2015-12-03 02:20:35 -05:00
Nicholas Nethercote 82700fe5f9 Bug 1230047 (part 2) - Make several PaintWindow() functions use LayoutDevice coordinates. r=kats.
Specifically, the PaintWindow() functions in the following classes:
- nsIWidgetListener, and its subclasses nsView and nsWebBrowser;
- nsChildView;
- nsWindow (the one in widget/uikit/);
- nsViewManager.

--HG--
extra : rebase_source : e5e0af18c57f1c44995832b403edc7eee939dc31
2015-12-02 21:45:41 -08:00
Nicholas Nethercote 53b8d741ea Bug 1230047 (part 1) - Make SynthesizeNativeTouch{Point,Tap}() take ScreenIntPoints. r=kats.
--HG--
extra : rebase_source : f9a4490edf840b0b506d33076d1b4738bb705fd5
2015-12-02 21:45:38 -08:00
Jonas Sicking 0bb4231605 Bug 1216687: Add nsILoadInfo flags for cookie policies. r=ckerschb 2015-12-06 18:33:15 -05:00
Jonas Sicking f7193fdf30 Bug 1226909 part 4: Make AsyncOpen2 set taining information on channels. Use this information in XHR and fetch(). r=bkelly 2015-12-06 18:33:15 -05:00
Jonas Sicking 28de02f687 Bug 1226909 part 3: Move logic of when to initiate CORS preflight into channels. Allow CORS preflight to happen when doing a same-origin to cross-origin redirect. r=ckerschb 2015-12-06 18:33:14 -05:00
Jonas Sicking 0e0c8c52ea Bug 1226909 part 2: Let CORS preflight logic grab information from nsILoadInfo rather than duplicate it. r=ckerschb 2015-12-06 18:33:14 -05:00
Jonas Sicking 6cc5074df0 Bug 1226909 part 1: Do security checks in a redirect handler rather than when opening the redirected channel. r=ckerschb 2015-12-06 18:33:14 -05:00
L. David Baron 5d4db53387 Merge mozilla-central to mozilla-inbound. 2015-12-06 16:08:06 -05:00
Bill McCloskey 18a0bcc6d7 Bug 1208257 - [webext] Fix failing test 2015-12-06 11:01:20 -08:00
Bill McCloskey 6e0bf624bf Bug 1208257 - [webext] tabs.json (r=kmag) 2015-12-06 08:50:24 -08:00
Bill McCloskey 505a9bb407 Bug 1208257 - [webext] windows.json (r=kmag) 2015-12-06 08:50:24 -08:00
Bill McCloskey 7e37c83d7b Bug 1208257 - [webext] web_navigation.json (r=kmag) 2015-12-06 08:50:24 -08:00
Bill McCloskey a8890fbf4f Bug 1208257 - [webext] WebNavigation test (r=kmag) 2015-12-06 08:50:24 -08:00
Bill McCloskey d85785380e Bug 1208257 - [webext] web_request.json (r=kmag) 2015-12-06 08:50:24 -08:00
Bill McCloskey 0c3e71a155 Bug 1208257 - [webext] Extension.jsm support for schemas (r=kmag) 2015-12-06 08:50:24 -08:00
Bill McCloskey 28f4ce315b Bug 1208257 - [webext] Add basic schema support (r=kmag) 2015-12-06 08:50:24 -08:00
Francois Marier aacefe1c5c Bug 1217236 - Block trackers loaded by Flash movies. r=gcp 2015-12-06 01:20:56 -08:00
Sebastian Hengst 134244b2ae Backed out 2 changesets (bug 1229604) for Spidermonkey bustage on Windows and static failures. r=backout
Backed out changeset 0cb584405271 (bug 1229604)
Backed out changeset d4053d8be57b (bug 1229604)
2015-12-05 22:33:18 +01:00
Phil Ringnalda d594b09fdc Backed out 7 changesets (bug 1209967) for making Android Talos hang
CLOSED TREE

Backed out changeset e78763a5c2c3 (bug 1209967)
Backed out changeset cdd9b2d4b72a (bug 1209967)
Backed out changeset ced2c85d9f09 (bug 1209967)
Backed out changeset d458396e6f06 (bug 1209967)
Backed out changeset 5cea26659e0d (bug 1209967)
Backed out changeset 035f6f5db4fe (bug 1209967)
Backed out changeset 7942bfbde7f2 (bug 1209967)

--HG--
rename : mobile/android/base/resources/drawable-hdpi-v11/ic_menu_back.png => mobile/android/base/resources/drawable-hdpi/ic_menu_back.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_back.png => mobile/android/base/resources/drawable-xhdpi/ic_menu_back.png
2015-12-02 20:45:26 -08:00
Jared Wein a982a98c40 Bug 1227711 - Add a box-shadow to the XUL alerts. ui-r=shorlander r=MattN
--HG--
extra : rebase_source : f9caae3660dea17cfacb607608914fb5ab6900cb
2015-12-02 22:21:20 -05:00
Kris Maglione b729a30707 Bug 1229874: Part 3 - Enable ESLint in WebExtension code. r=billm
The base .eslintrc is essentially a merge of the root Toolkit .eslintrc and
the devtools .eslintrc, with some minor changes to match our prevalent style.

For the most enforces the coding styles that we've been using most
consistently. There are a couple of significant differences, though:

 * The rule for opening brace alignment can only be applied globally, and
   doesn't make exceptions for top-level functions. I chose to turn it on, and
   change the brace style of existing top-level functions that violated it,
   since the rule seemed worth using, and that's the direction most Toolkit JS
   code has been headed anyway.

 * The rule for switch/case statements requires an added indentation level for
   case statements. Most of our switch statements did not use an extra level
   of indentation, and I initially wrote the rule to enforce that style, until
   I came across case statements that used blocks, and required the extra
   indentation level for sanity.

--HG--
rename : devtools/.eslintrc => toolkit/components/extensions/.eslintrc
extra : commitid : 4aDZOi5MNPc
extra : rebase_source : f34ba43aeb8046a0c971cb76b76410497bd12b42
extra : source : 2a7eb4ef7b375e5fd52d843ca206a071367a6475
2015-12-02 16:58:53 -08:00
Kris Maglione 62d3c9701a Bug 1229874: Part 2 - Fix the major errors detected by ESLint. r=billm
--HG--
extra : commitid : 8MfFtdlzGEG
extra : rebase_source : 744d65868d5a3d217bd5f6428a3486e95fa14716
extra : source : 880fc261adae00a344e227ea2fa246b771cd57a6
2015-12-02 16:58:24 -08:00