Commit Graph

359401 Commits

Author SHA1 Message Date
Ed Morley
cf9791d39b Fix incorrect resolution of merge conflicts between bug 995730 and bug 1001542 (no bug; CLOSED TREE)
--HG--
extra : amend_source : 5b90e13f8f3a7419e26acee6e483855bdd8c3558
2014-05-06 09:00:06 +01:00
Asaf Romano
64ea68b6be Bug 981689 - Show a notice to beta users when we turn telemetry on by default on the beta channel - Firefox Desktop (very final fix). r=bsmedberg. 2014-05-06 10:15:20 +03:00
Henrik Skupin
3ac253f345 Bug 1006298 - TPS fails to download virtualenv due to the redirect. r=glob DONTBUILD 2014-05-06 08:12:37 +02:00
B2G Bumper Bot
97716d5f02 Bumping manifests a=b2g-bump 2014-05-05 22:51:30 -07:00
B2G Bumper Bot
b1006799f8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/962718c0f5aa
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #18924 from gasolin/issue-1003736

Bug 1003736 - [Settings] Two column not right displayed, r=arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/f1be2a2a8772
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1003736 - [Settings] Two column not right displayed
2014-05-05 22:46:11 -07:00
Wes Johnston
217586bb12 Bug 996129 - Don't thumbnail sites with cache control headers set. r=kats 2014-05-05 22:33:29 -07:00
Mark Hammond
90cc4b622e Bug 966579 - fix intermittent browser_social_chatwindow_resize oranges. r=mixedpuppy 2014-05-06 15:25:58 +10:00
B2G Bumper Bot
2ebd91f06f Bumping manifests a=b2g-bump 2014-05-05 21:56:21 -07:00
B2G Bumper Bot
a0d0edc237 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1006236 - Whitelist phone production apps

========

https://hg.mozilla.org/integration/gaia-central/rev/0f3ead637607
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1006236 - Whitelist phone production apps r=yuren
2014-05-05 21:50:53 -07:00
Drew Willcoxon
b539145099 Bug 1002077 - Content pref service shouldn't use nsIFrameMessageListener and doesn't need to electrolify itself. r=mak 2014-05-05 21:28:59 -07:00
Wes Kocher
f0482d7b52 Merge m-c to b2g-inbound 2014-05-05 21:19:59 -07:00
Wes Kocher
aba70549a9 Merge b2g-inbound to m-c 2014-05-05 21:07:22 -07:00
Wes Kocher
514ce002bc merge fx-team to m-c 2014-05-05 20:52:49 -07:00
Wes Kocher
8b0c7f588b merge inbound to m-c 2014-05-05 20:51:04 -07:00
Jamin Liu
74cef88c2b Bug 1003657 - Don't keep reference in GetDefaultAdapterPathInternal() to avoid memory leak. r=echou, f=shuang 2014-05-06 11:45:51 +08:00
Wes Kocher
9830484b06 Backed out changeset 8f05bc23b391 (bug 982779) for b2g mochitest-1 failures 2014-05-05 19:28:37 -07:00
Wes Kocher
ddbfc4c66b merge inbound to m-c 2014-05-05 19:12:08 -07:00
Sotaro Ikeda
e4e2cb245d Bug 1000525 - Defer Fence release until IPC delivery complete r=nical 2014-05-05 18:56:40 -07:00
B2G Bumper Bot
b50f9d36cb Bumping manifests a=b2g-bump 2014-05-05 18:51:33 -07:00
B2G Bumper Bot
9351c7f251 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/62115b0e70ad
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 841422 - Move unit tests for shared code out of gallery r=lightsofapollo"

This reverts commit 09411b0bc84f9e5e30e410b1fbb2612872a0f55e.
2014-05-05 18:46:16 -07:00
Wes Kocher
97b797a3cc Backed out 2 changesets (bug 1000695) for introducing a near permafail on linux bc3
Backed out changeset 43306fac27e1 (bug 1000695)
Backed out changeset fcf5abdf9706 (bug 1000695)
2014-05-05 17:54:22 -07:00
B2G Bumper Bot
79ec287740 Bumping manifests a=b2g-bump 2014-05-05 17:01:22 -07:00
Honza Bambas
2ef5893c1f Bug 1006197 - End second HTTP cache v2 trial on desktop Firefox r=jduell 2014-05-05 16:56:59 -07:00
B2G Bumper Bot
8a8e1f51a0 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 841422 - Move unit tests for shared code out of gallery

========

https://hg.mozilla.org/integration/gaia-central/rev/f633dde17d98
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 841422 - Move unit tests for shared code out of gallery r=lightsofapollo
2014-05-05 16:55:57 -07:00
Wes Johnston
4a48e3b766 Bug 854040 - Re-enable mini-app mode on Samsung phones. r=blassey 2014-05-05 16:30:30 -07:00
Jared Wein
6741fed037 Bug 1004576 - Background tabs are unreadable when the Color Intensity of the window frame is at or near its lowest point (white text on light-grey window frame). r=Gijs
--HG--
extra : rebase_source : 2fb257c889c8613aba6f488f5a4c867a34f85944
2014-05-05 18:41:40 -04:00
Ben Turner
12d3c57cc5 Bug 1006139 - Fix contacts getAll caching, r=gwagner. 2014-05-05 14:25:44 -07:00
Henrik Skupin
675a7f9b6d Bug 1003250 - Disable automatic sync for TPS tests. r=rnewman DONTBUILD 2014-05-05 23:07:52 +02:00
Sushil Chauhan
81ee78d45e Bug 999699 - Use GPU Composition when a frame needs intermediate surface. r=dwilson 2014-05-05 13:26:51 -07:00
B2G Bumper Bot
9e929a5555 Bumping manifests a=b2g-bump 2014-05-05 13:41:11 -07:00
B2G Bumper Bot
7ab4d9bb91 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d390f67c5661
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #18507 from svic/Bug_970148

Bug 970148 - Support for simple pairing record

========

https://hg.mozilla.org/integration/gaia-central/rev/5dbd7c2ddd33
Author: Arno Puder <arno@puder.org>
Desc: Bug 970148 - Support for simple pairing record. r=alive
2014-05-05 13:35:42 -07:00
Tetsuharu OHZEKI
0b2ab77a19 Bug 1005868 - Remove the needless migration code for 'browser.tabs.onTop'. r=dao 2014-05-06 05:17:20 +09:00
B2G Bumper Bot
8391a98a80 Bumping manifests a=b2g-bump 2014-05-05 11:51:25 -07:00
B2G Bumper Bot
a7e6c3b0bf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1005330 - JSHint fixes for shared/js/download/ r=aus

========

https://hg.mozilla.org/integration/gaia-central/rev/3fe3d7de0380
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1005330 - JSHint fixes for shared/js/download/ r=aus
2014-05-05 11:46:00 -07:00
B2G Bumper Bot
3b2df91fec Bumping manifests a=b2g-bump 2014-05-05 11:36:21 -07:00
B2G Bumper Bot
958d37fe13 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d5db104074da
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #18900 from tauzen/Bug1000981

Bug 1000981 - [NFC] NfcManager handleNdefMessage tests, NfcUtils tests moved to separate file, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/0b9cd698f317
Author: Krzysztof Mioduszewski <kmioduszewski@gmail.com>
Desc: Bug 1000981 - [NFC] NfcManager handleNdefMessage tests, NfcUtils tests moved to separate file
2014-05-05 11:30:56 -07:00
Honza Bambas
77b3fc0b0b Bug 1005475 - Remove lock acquire from CacheEntry::IsFileDoomed() and bellow, r=michal 2014-05-05 19:25:59 +02:00
Honza Bambas
2a1a5368c6 Bug 1005079 - Move index check from CacheFile to CacheEntry to speed up, r=michal 2014-05-05 19:25:58 +02:00
Ryan VanderMeulen
2b7d069140 Merge fx-team to m-c. 2014-05-05 13:22:22 -04:00
Carsten "Tomcat" Book
0f82c9229c Backed out changeset 290f4be587a1 (bug 983489) for suspicion that this caused the m8 and m10 on ics debug on a CLOSED TREE 2014-05-05 16:19:22 +02:00
Michal Novotny
919d02722d Bug 1003208 - HTTP cache v2: CacheFileHandle::mHash is accessed after the memory is freed, r=honzab 2014-05-05 15:11:39 +02:00
Ehsan Akhgari
7062b539f3 Bug 999341 - Null check the observer service in nsDocument::OnPageHide; r=smaug 2014-05-05 09:06:49 -04:00
Michal Novotny
64dcad7bee Bug 1003091 - HTTP cache v2: Remove temporary fix in CacheFileContextEvictor::GetContextFile() due to CacheFileUtils::ParseKey() limitation, r=honzab 2014-05-05 15:04:09 +02:00
Boris Zbarsky
f2cd90aa43 Bug 1005590. MNot can also end up with a known-not-object type even while we think it might emulate undefined. Guard against that. r=jandem 2014-05-05 08:46:55 -04:00
Carsten "Tomcat" Book
b8a131b3a0 Merge m-c to mozilla-inbound 2014-05-05 14:25:22 +02:00
Carsten "Tomcat" Book
ac37b1a082 merge b2g-inbound to mozilla-central 2014-05-05 14:23:27 +02:00
Carsten "Tomcat" Book
9514141279 merge fx-team to mozilla-central 2014-05-05 14:22:03 +02:00
Jan de Mooij
f5c42eb4b8 Bug 1004923 part 12 - Use GetSystemTimePreciseAsFileTime if available (Windows 8). r=njn 2014-05-05 13:12:11 +02:00
Jan de Mooij
e99d1dfc18 Bug 1004923 part 11 - Remove slow and bogus GetSystemTimeAdjustment call. r=njn 2014-05-05 13:12:09 +02:00
Olli Pettay
6ab5466290 Bug 1005089, let touch.target be null, r=bz 2014-05-05 13:48:50 +03:00