Commit Graph

181554 Commits

Author SHA1 Message Date
Ben Turner
92f6b6b926 Bug 980549 - Simplify SettingsManager transaction management, r=gwagner.
--HG--
extra : rebase_source : 9378c05ec7a5de6f4f692680f2d4aa08b0d32957
2014-05-06 14:14:23 -07:00
B2G Bumper Bot
cf5fe93fe2 Bumping manifests a=b2g-bump 2014-05-06 14:06:21 -07:00
B2G Bumper Bot
11c172ab59 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 841422 - Follow-up, move contact2vcard_test.js to sharedtest app

========

https://hg.mozilla.org/integration/gaia-central/rev/39bd5f6562e2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 841422 - Follow-up, move additional tests for shared code into sharedtest app r=me
2014-05-06 14:00:56 -07:00
B2G Bumper Bot
55759dd4b0 Bumping manifests a=b2g-bump 2014-05-06 13:54:53 -07:00
B2G Bumper Bot
0b95a09bce Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e3d8d481edae
Author: Michał Budzyński <michal@virtualdesign.pl>
Desc: Merge pull request #18938 from michalbe/Bug969393

Bug 969393 - Import contacts from SD Card

========

https://hg.mozilla.org/integration/gaia-central/rev/c5e6276f2452
Author: Michal Budzynski <michal@virtualdesign.pl>
Desc: Bug 969393 - Import contacts from SD Card When "Default media location" is not 'SD Card'
2014-05-06 13:54:41 -07:00
Ryan VanderMeulen
ccf9abfcf9 Merge m-c to b2g-inbound. 2014-05-06 16:52:22 -04:00
Ryan VanderMeulen
db76fc8941 Merge fx-team to m-c. 2014-05-06 16:50:48 -04:00
Ryan VanderMeulen
45503e160d Merge b2g-inbound to m-c. 2014-05-06 16:31:58 -04:00
Ryan VanderMeulen
2c00c6028e Backed out changeset 7b05ebf0a2d5 (bug 858787) for making bug 970728 nearly perma-fail. 2014-05-06 16:17:36 -04:00
B2G Bumper Bot
550aa45afb Bumping manifests a=b2g-bump 2014-05-06 13:16:38 -07:00
B2G Bumper Bot
2b359b5615 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f939e8c12563
Author: Michał Budzyński <michal@virtualdesign.pl>
Desc: Merge pull request #18986 from michalbe/Bug1003767

Bug 1003767 - Do not share contacts photo via NFC

========

https://hg.mozilla.org/integration/gaia-central/rev/c9b8c932b2d8
Author: Michal Budzynski <michal@virtualdesign.pl>
Desc: Bug 1003767 - Do not share contacts photo via NFC
2014-05-06 13:10:41 -07:00
B2G Bumper Bot
ac3e6d99a6 Bumping manifests a=b2g-bump 2014-05-06 13:01:26 -07:00
B2G Bumper Bot
060fde55dc Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c5637310d63e
Author: Michał Budzyński <michal@virtualdesign.pl>
Desc: Merge pull request #18954 from michalbe/Bug984584

Bug 984584 - Contacts phone numbers highlighted red when missed

========

https://hg.mozilla.org/integration/gaia-central/rev/a0908ee5ac2a
Author: Michal Budzynski <michal@virtualdesign.pl>
Desc: [Bug 984584] - Contacts phone numbers highlighted red when missed
2014-05-06 12:55:50 -07:00
Kevin Grandon
5efb280fbd Bug 999574 - Wait for remote-browser-shown event before dispatching runapp command r=vingtetun
---
 b2g/chrome/content/runapp.js | 92 +++++++++++++++++++++++++++++++-------------
 1 file changed, 65 insertions(+), 27 deletions(-)

DONTBUILD
2014-05-06 10:11:30 -07:00
Ryan VanderMeulen
2686d6a346 Backed out changeset f965ef325903 (bug 999574) for landing with the wrong reviewer in the commit message. 2014-05-06 14:03:46 -04:00
Mike de Boer
dcba54a480 Bug 978861: disable prefillWithSelection on OSX by default, fix its semantics when enabled. r=ehsan 2014-05-06 18:21:16 +02:00
Mike de Boer
a8ca8866ca Backed out changeset df4ae5ba7d6e (bug 978861) due to m-o test failures. 2014-05-06 16:50:04 +02:00
Botond Ballo
98bebf3b13 Bug 1005378 - Have TabChild create a view ID for the document element if one doesn't already exist. r=kats 2014-05-05 15:06:28 -04:00
Richard Marti
bea74141a8 Bug 1005038 - In-content preferences: open the links in a new tab. r=jaws 2014-05-02 17:00:06 +02:00
Mike de Boer
15e4265ceb Bug 978861: disable prefillWithSelection on OSX by default, fix its semantics when enabled. r=ehsan 2014-05-06 12:01:48 +02:00
Carsten "Tomcat" Book
c03fa1bcb3 Merge m-c to fx-team 2014-05-06 14:48:30 +02:00
Carsten "Tomcat" Book
1037ec50fc merge b2g-inbound to mozilla-central 2014-05-06 14:33:21 +02:00
Carsten "Tomcat" Book
b4b2c06d25 merge fx-team to mozilla-central 2014-05-06 14:24:11 +02:00
Carsten "Tomcat" Book
6f2ffd7415 merge mozilla-inbound to mozilla-central 2014-05-06 14:22:56 +02:00
Georg Fritzsche
ec0e0f4b01 Bug 992258 - Trigger a refresh of the experiments view in the addon manager when experiments change. r=irving 2014-05-06 12:18:10 +02:00
B2G Bumper Bot
dc1117d1ec Bumping manifests a=b2g-bump 2014-05-06 02:08:05 -07:00
B2G Bumper Bot
03cdd46932 Bumping gaia.json for 10 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/16395cc21812
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #18945 from crdlc/bug-1005340

Bug 1005340 - [Home2] Offline Icon Handling

========

https://hg.mozilla.org/integration/gaia-central/rev/4a1952552833
Author: crdlc <crdlc@tid.es>
Desc: Bug 1005340 - [Home2] Offline Icon Handling

========

https://hg.mozilla.org/integration/gaia-central/rev/30eebc375f8b
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #18316 from gasolin/issue-968696

Bug 968696 - [settings] add marionette test for Media storage panel, r=arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/c80a241cf3f8
Author: gasolin <gasolin@gmail.com>
Desc: Bug 968696 - [settings] add marionette test for Media storage panel

========

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

Bug 996514 - Don't homescreenWindow.render() twice, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/09d5a55dfe2f
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 996514 - Don't homescreenWindow.render() twice

========

https://hg.mozilla.org/integration/gaia-central/rev/3f7c045a8902
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #18947 from jmcanterafonseca/fix_build

Bug 1005951 - Follow-up bug 1001370 webapp-shared.js in line 167 is brok...

========

https://hg.mozilla.org/integration/gaia-central/rev/bf90c9d39196
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1005951 - Follow-up bug 1001370 webapp-shared.js in line 167 is broken

========

https://hg.mozilla.org/integration/gaia-central/rev/22901490caab
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Merge pull request #18931 from tauzen/Bug1004218

Bug 1004218 - [NFC] Smart Poster Action handling should be removed from NfcManager, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/2d01b36d25e4
Author: Krzysztof Mioduszewski <kmioduszewski@gmail.com>
Desc: Bug 1004218 - [NFC] Smart Poster Action handling should be removed from NfcManager
2014-05-06 02:06:20 -07:00
Asaf Romano
c8c5cf6767 tests-bustage fix for bug 981689 (the code relies on the current-version preference being always set, which isn't true for testing-prefs-branches) 2014-05-06 11:43:59 +03:00
Ed Morley
b83255e4e2 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
d78e31bbd3 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
2bc9e2b0c7 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
06d25b6f49 Bumping manifests a=b2g-bump 2014-05-05 22:51:30 -07:00
B2G Bumper Bot
97b354a8e7 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
f576b638cd Bug 996129 - Don't thumbnail sites with cache control headers set. r=kats 2014-05-05 22:33:29 -07:00
Mark Hammond
922d2b3e35 Bug 966579 - fix intermittent browser_social_chatwindow_resize oranges. r=mixedpuppy 2014-05-06 15:25:58 +10:00
B2G Bumper Bot
f282d23fa6 Bumping manifests a=b2g-bump 2014-05-05 21:56:21 -07:00
B2G Bumper Bot
ddfeb3dbf1 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
bb0a51aa58 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
51b4f13fac Merge m-c to b2g-inbound 2014-05-05 21:19:59 -07:00
Wes Kocher
ad07adf5a3 Merge b2g-inbound to m-c 2014-05-05 21:07:22 -07:00
Wes Kocher
0c56483bed merge fx-team to m-c 2014-05-05 20:52:49 -07:00
Wes Kocher
523e0622db merge inbound to m-c 2014-05-05 20:51:04 -07:00
Jamin Liu
b21925cf86 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
c7be6ddfd8 Backed out changeset 8f05bc23b391 (bug 982779) for b2g mochitest-1 failures 2014-05-05 19:28:37 -07:00
Wes Kocher
a3ec8de2a9 merge inbound to m-c 2014-05-05 19:12:08 -07:00
Sotaro Ikeda
56320456e0 Bug 1000525 - Defer Fence release until IPC delivery complete r=nical 2014-05-05 18:56:40 -07:00
B2G Bumper Bot
29577b2a22 Bumping manifests a=b2g-bump 2014-05-05 18:51:33 -07:00
B2G Bumper Bot
b963e82710 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
b6928dcde3 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
fbf08c0647 Bumping manifests a=b2g-bump 2014-05-05 17:01:22 -07:00