Commit Graph

214222 Commits

Author SHA1 Message Date
Gregory Szorc
55e15e2b74 Bug 1094302 - Remove unused EXTRA_JS_MODULES rule from rules.mk; r=glandium
The installation rule for EXTRA_JS_MODULES and EXTRA_PP_JS_MODULES
became unused after b961ba8f0892 (bug 1044162). We remove the dead code.

--HG--
extra : rebase_source : 40adf7514d15ae4ba5bbfe3ac101061657aac841
2014-11-05 09:39:13 -08:00
Wes Kocher
c1aacfb986 Merge m-c to inbound a=merge 2014-11-06 19:08:13 -08:00
Wes Kocher
e9ba7b69a1 Merge b-i to m-c a=merge 2014-11-06 18:54:43 -08:00
Wes Kocher
7ec75772bd Merge fx-team to m-c a=merge 2014-11-06 18:26:36 -08:00
Wes Kocher
1646689f2b Merge inbound to m-c a=merge 2014-11-06 18:24:57 -08:00
Matthew Noorenberghe
1e9261c833 Bug 1095234 - Clobber for bug 1091260 which stopped packaging a devtools file with EXTRA_JS_MODULES while making it require pre-processing. DONTBUILD a=CLOBBER 2014-11-06 18:12:14 -08:00
Seth Fowler
ccab9ea666 Bug 1084136 (Part 11) - Don't treat FLAG_REQUEST_STARTED specially. r=tn,a=kwierso
--HG--
extra : rebase_source : 6dcf827fcd14d0310222dad8403d73704c7dcde2
extra : amend_source : 22dfb613487919c715b720c45e8a6779c33a341d
2014-11-06 17:34:01 -08:00
Seth Fowler
095424a834 Bug 1084136 (Part 10) - Materialize image status from image state when needed. r=tn
--HG--
extra : rebase_source : d401de894d19c6f2b74faa2c26a2422cfbac0a6d
2014-11-06 17:34:00 -08:00
Seth Fowler
f8366bef6a Bug 1084136 (Part 9) - Don't track whether we've ever been decoded separately. r=tn
--HG--
extra : rebase_source : 6a6708f9b6524b152204fccf96922e17eccbd6b3
2014-11-06 17:34:00 -08:00
Seth Fowler
a704eb8e0a Bug 1084136 (Part 8) - Treat receiving the last part of a multipart image as an image state. r=tn
--HG--
extra : rebase_source : 136af95415b6756b9d4c5c667d2287da77557a23
2014-11-06 17:33:59 -08:00
Seth Fowler
a2b91e8274 Bug 1084136 (Part 7) - Treat being multipart as an image state. r=tn
--HG--
extra : rebase_source : 2026ffd7698abe21f15dbc52cbf318b52e329129
2014-11-06 17:33:59 -08:00
Seth Fowler
ffe50e3c56 Bug 1084136 (Part 6) - Don't reset any imgStatusTracker state when discarding. r=tn
--HG--
extra : rebase_source : 48b0bb6827f6b8121f662bab4dcfb823fa8fe870
2014-11-06 17:33:59 -08:00
Seth Fowler
4bb8da9c27 Bug 1084136 (Part 5) - Don't reset STATUS_DECODE_STARTED when decoding finishes. r=tn
--HG--
extra : rebase_source : d60164094c0dc0d7fbc4f47980f8b2d9df0b9deb
2014-11-06 17:33:58 -08:00
Seth Fowler
483bb40bfa Bug 1084136 (Part 4) - Record STATUS_DECODE_COMPLETE even if there's an error. r=tn
--HG--
extra : rebase_source : 9d5ba3964faf1fe2d28020050a0d89fa5cbc5bb0
2014-11-06 17:33:58 -08:00
Seth Fowler
8de98648d8 Bug 1084136 (Part 3) - Don't reset image status flags on error. r=tn
--HG--
extra : rebase_source : a14a69a7f8a000be8c66008edf99c6d08a755325
2014-11-06 17:33:57 -08:00
Seth Fowler
955fd6a1eb Bug 1084136 (Part 2) - Add FLAG_UNBLOCK_ONLOAD and never unset FLAG_BLOCK_ONLOAD. r=tn
--HG--
extra : rebase_source : 1658f334021b19c15e55fc838276a2d7903e5bca
2014-11-06 17:33:57 -08:00
Seth Fowler
072f743299 Bug 1084136 (Part 1) - Clean up image state flags. r=tn
--HG--
extra : rebase_source : e91a0adca1f47e1f430c9120f86a903c374c29dc
2014-11-06 17:33:57 -08:00
Seth Fowler
acd76aecf8 Bug 1087615 - Always use an uncached image in test_bug347174_write.html. r=mounir
--HG--
extra : rebase_source : c80a5d271c145892e3b55be26b4aa8952ce8eeb9
2014-11-06 17:33:56 -08:00
B2G Bumper Bot
94b9f3c9c9 Bumping manifests a=b2g-bump 2014-11-06 16:07:13 -08:00
B2G Bumper Bot
c62e6362a3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1095057 - Intermittent sharedtest/test/unit/option_menu_test.js | OptionMenu Display style doesn't affect confirm dialogs - done() called multiple times

========

https://hg.mozilla.org/integration/gaia-central/rev/cfd80d80a2c6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1095057 - Intermittent sharedtest/test/unit/option_menu_test.js | OptionMenu Display style doesn't affect confirm dialogs - done() called multiple times r=kgrandon
2014-11-06 16:00:49 -08:00
B2G Bumper Bot
eea1f59c13 Bumping manifests a=b2g-bump 2014-11-06 15:37:14 -08:00
B2G Bumper Bot
bd12e545dd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/81652ec33eb5
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #25892 from davidflanagan/revert-bug1079519

Revert "Merge pull request #25627 from russnicoletti/bug-1079519"

========

https://hg.mozilla.org/integration/gaia-central/rev/78887f9281c0
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Revert "Merge pull request #25627 from russnicoletti/bug-1079519"

This reverts commit 7bac3bc2379453196a95117e72670009a4d856e0, reversing
changes made to 1f621c11282161cc47870ab2c8d046103270dc71.
2014-11-06 15:30:52 -08:00
B2G Bumper Bot
e19c0bfaa2 Bumping manifests a=b2g-bump 2014-11-06 15:02:15 -08:00
B2G Bumper Bot
e67b1eed6f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d29b9e448c52
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #25903 from asutherland/modifyaccount-syncrange

Bug 946101 - update syncRange when account updated, tests for it. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/edc342ebc9ed
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 946101 - update syncRange when account updated, tests for it. r=jrburke

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/349
To make sure we update syncRange in the front-end objects so the UI updates
without requiring the user to close the settings UI and reopen it.
2014-11-06 14:55:51 -08:00
B2G Bumper Bot
d7525907ae Bumping manifests a=b2g-bump 2014-11-06 14:47:21 -08:00
B2G Bumper Bot
a4af001e74 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a662535a103e
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #25884 from millermedeiros/1089589-remind-dupe

Bug 1089589 - [Calendar] Existing remind me option can be set again when adding new event. r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/999fdac0ab1e
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 1089589 - [Calendar]Existing remind me option can be set again when adding new event.
2014-11-06 14:40:50 -08:00
Margaret Leibovic
9fa33ee381 Bug 1094485 - Properly handle exceptions in readerWorker.js. r=bnicholson, a=metered 2014-11-06 14:07:55 -08:00
B2G Bumper Bot
44570aff0d Bumping manifests a=b2g-bump 2014-11-06 13:42:57 -08:00
B2G Bumper Bot
6ef4977d42 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b089cffa3672
Author: Malini Das <thehyperballad@gmail.com>
Desc: Merge pull request #25898 from malini/uifix

Bug 1095053 - remove --ui when invoking marionette-mocha, r=eperelman

========

https://hg.mozilla.org/integration/gaia-central/rev/5d65e3227766
Author: Malini Das <mdas@mozilla.com>
Desc: Bug 1095053 - remove --ui when invoking marionette-mocha
2014-11-06 13:40:51 -08:00
vivek
0d2042cb67 Bug 1093119: about:feedback page is aligned to left. r=margaret 2014-11-06 13:24:08 -08:00
B2G Bumper Bot
51ccb9c2fa Bumping manifests a=b2g-bump 2014-11-06 13:13:15 -08:00
B2G Bumper Bot
b766b171e5 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e9f23d196a51
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #25633 from gaye/bug-1088813

Bug 1088813 - Calendar sending notifications with 'null' as body r=millermedeiros

========

https://hg.mozilla.org/integration/gaia-central/rev/4c089b2951ff
Author: gaye <gaye@mozilla.com>
Desc: 1088813 - Calendar sending notifications with 'null' as body

========

https://hg.mozilla.org/integration/gaia-central/rev/14506fa13fdc
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #25893 from wilsonpage/1090501

Bug 1090501 - Remove 'busy'/'ready' event firing from previewStateChange event

========

https://hg.mozilla.org/integration/gaia-central/rev/7885f3ffcbfb
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1090501 - Remove 'busy'/'ready' event firing from previewStateChange event
2014-11-06 13:10:48 -08:00
B2G Bumper Bot
3c37425af6 Bumping manifests a=b2g-bump 2014-11-06 13:02:15 -08:00
B2G Bumper Bot
c7f93ad150 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9e900ea5ab33
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24791 from rjmackay/bug-1062798-settings-app-json-loading

Bug 1062798 - Replace custom JSON loaders with LazyLoader.getJSON in Settings App

========

https://hg.mozilla.org/integration/gaia-central/rev/29e1ba8d5c8d
Author: Robbie Mackay <rm@robbiemackay.com>
Desc: Bug 1062798 - Replace custom JSON loaders with LazyLoader.getJSON in SettingsApp

Replace various custom JSON loaders in SettingsApp with LazyLoader.getJSON.
Refactor code to handle promises where needed, and update tests to match.
2014-11-06 12:50:51 -08:00
B2G Bumper Bot
fc613add2f Bumping manifests a=b2g-bump 2014-11-06 12:44:22 -08:00
B2G Bumper Bot
fe5390a98a Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f873a6c302e4
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #24825 from gtorodelvalle/callscreen-bug-977056-participant-leaving-conference

Bug 977056 - [Dialer] Visual discrepancies: Call ended view under conference call participants list

========

https://hg.mozilla.org/integration/gaia-central/rev/0df4167a2978
Author: German Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 977056 - [Dialer] Visual discrepancies: Call ended view under conference call participants list

========

https://hg.mozilla.org/integration/gaia-central/rev/90ded75718f2
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #25671 from DouglasSherk/1045820-sim-picker-dialer

Bug 1045820 - Port SimPicker implementation in MSAB and comms apps to GaiaSimPicker. r=gtorodelvalle, r=julienw, r=jmcf, r=rickychien

========

https://hg.mozilla.org/integration/gaia-central/rev/6292b6cf5de3
Author: Doug Sherk <github@sherk.me>
Desc: Bug 1045820 - Port SimPicker implementation in MSAB and comms apps to GaiaSimPicker. r=gtorodelvalle, r=julienw, r=jmcf, r=rickychien
2014-11-06 12:44:08 -08:00
Ryan VanderMeulen
7abf6d3353 Merge m-c to inbound. a=merge
CLOSED TREE
2014-11-06 15:25:21 -05:00
Felipe Gomes
42dcb3e98c Bug 1093691 - Enable e10s by default on Nightly (not riding trains), and activate infobar notice. r=gavin a=RyanVM on a CLOSED TREE 2014-11-06 17:58:40 -02:00
Dave Townsend
3a30dbe4a5 Bug 1093161: Fix load flags for new loads when transitioning from non-remote to remote processes. r=ttaubert 2014-11-06 11:04:59 -08:00
Dave Townsend
9f50e135a8 Bug 1095024: Port bug 987849 to mochitest-jetpack. r=jmaher 2014-11-06 12:16:15 -08:00
Mark Banner
aa3a4e072d Bustage fix from bug 1074688 part 3, conflicting with another patch. Fix the mocking of the tests to fix stubbing. rs+a=bustage-fix 2014-11-06 21:41:47 +00:00
B2G Bumper Bot
426b005bab Bumping manifests a=b2g-bump 2014-11-06 10:48:13 -08:00
B2G Bumper Bot
079025ba3d Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1380aa2d9459
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 1094904 - Bump gaiatest version to 0.30. r=dhunt
2014-11-06 10:45:57 -08:00
B2G Bumper Bot
50c9ae92fd Bumping manifests a=b2g-bump 2014-11-06 08:15:48 -08:00
B2G Bumper Bot
764773e2f7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a8ff22af3eec
Author: viorelaioia <viorela.ioia@softvision.ro>
Desc: Merge pull request #25765 from viorelaioia/bug_1090281

Bug 1090281 - Investigate failure in test_setup_and_send_imap_email.py

========

https://hg.mozilla.org/integration/gaia-central/rev/0f71ac393416
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1090281 - Investigate failure in test_setup_and_send_imap_email.py
2014-11-06 08:13:31 -08:00
Gavin Sharp
c1fa8f2552 Bug 1094409 - Explain in the preferences UI the reason when e10s is disabled. r=felipe 2014-11-05 17:01:25 -08:00
Felipe Gomes
dc0ba561b6 Bug 1093689 - Update text for e10s notification. r=gavin 2014-11-06 17:23:43 -02:00
Nicolas Silva
282ae257f6 Bug 1089183 - Blacklist D2D on a range of ATI drivers that don't handle dxgi keyed mutex properly. r=bjacob
CLOSED TREE
2014-11-06 10:33:00 -05:00
Stephen Pohl
2d7c6afe31 Bug 1091109: Followup to avoid intermittent test failures on a CLOSED TREE. r=myk a=lmandel,RyanVM 2014-11-06 11:57:22 -05:00
Boris Zbarsky
476420891a Bug 1084439 followup. Remove now-unsed enum. 2014-11-06 10:55:19 -05:00