Gijs Kruitbosch
aa719d2b2d
Merge mozilla-central and ux
2013-09-28 09:59:15 +02:00
Wes Kocher
03ca5a1de6
Merge fx-team to m-c
2013-09-27 20:32:24 -07:00
Wes Kocher
49f462c0ee
Backed out changeset 5a520e97e6a5 (bug 911574) under suspicion of causing robocop1-1 orange.
2013-09-27 20:12:59 -07:00
Wes Kocher
e972a82318
Backed out changeset cfb6cd8accc3 (bug 911152)
2013-09-27 20:12:09 -07:00
Wes Kocher
3039134040
Merge b2g-inbound to m-c
2013-09-27 19:35:44 -07:00
Robert Strong
28fbe36fb6
Backed out changeset d3c5c7c61894
2013-09-27 17:19:09 -07:00
Robert Strong
fd11286001
Turn on app update mochitest-chrome debug logging to try to figure out Bug 918029 - Intermittent TEST-UNEXPECTED-FAIL | test_0017_check_staging_basic.xul | Test timed out. Maximum time allowed is 90 seconds | Checking if TESTS[3] test was performed... callback function name = defaultCallback, pageid = finished |and more updater failures. r=bbondy
2013-09-27 15:47:17 -07:00
Gaia Pushbot
ea58de8b7a
Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e836e146aa9b
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #12515 from julienw/913994-conversation-not-shown-after-sending-sometimes
Bug 913994 - [Messages] When sending SMS to a number included in a SMS, ...
========
https://hg.mozilla.org/integration/gaia-central/rev/3313fb5d45f2
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 913994 - [Messages] When sending SMS to a number included in a SMS, we should load the thread after clicking on send r=gnarf
The problem was simple: we were not resetting inThread when handling the #new
hash.
========
https://hg.mozilla.org/integration/gaia-central/rev/b6b5d914d230
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #12514 from julienw/919962-dont-show-sms-conversion-banner-after-send
Bug 919962 - [MMS] Converting to text layout when sending a MMS r=gnarf
========
https://hg.mozilla.org/integration/gaia-central/rev/3bb63873c053
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 919962 - [MMS] Converting to text layout when sending a MMS r=gnarf
We now display the banner in an asynchronous way therefore the previous way to
hide the banner synchronously didn't work.
This patch changes the logic then: instead of hiding the banner after displaying
it, it now prevents the banner from being displayed at all.
2013-09-27 15:00:23 -07:00
Mark Capella
5628f20963
Bug 472963 - TableExists and IndexExists does not work for temporary tables, r=mak
2013-09-27 17:04:17 -04:00
Mark Capella
183bab5e57
Bug 921117 - Enhanced Robocop screenshots, r=jmaher
2013-09-27 17:04:16 -04:00
Ryan VanderMeulen
33b027001a
Backed out changeset 51a41b139305 (bug 920831) for bustage.
...
CLOSED TREE
2013-09-27 16:21:06 -04:00
Kartikaya Gupta
de4063844e
Bug 918682 - Fix the check for finding the root content document's root scroll frame. r=tn
2013-09-27 15:15:57 -04:00
Paul Rouget
f093655541
Bug 920509 - [app manager] Don't use hiddenDOMWindow in styles.js. r=dcamp
2013-09-27 14:41:30 -04:00
Michael Ratcliffe
2e516934a6
Bug 913983 - Split browser_telemetry_buttonsandsidebar.js into 5 tests due to timeouts. r=jwalker
2013-09-27 17:48:37 +01:00
Gijs Kruitbosch
2780a0f874
Merge mozilla-central and ux
2013-09-27 10:35:54 +02:00
Ryan VanderMeulen
8a632ce880
Merge fx-team to m-c.
2013-09-26 21:36:35 -04:00
Ryan VanderMeulen
4daff368b0
Merge b2g-inbound to m-c.
2013-09-26 21:32:43 -04:00
Ryan VanderMeulen
a759e3fa7b
Merge inbound to m-c.
2013-09-26 21:29:08 -04:00
Brian Nicholson
a21e0dcb79
Bug 917538 - Fix Fennec Restarter flags and remove System.exit(0). r=blassey
2013-09-26 16:34:38 -07:00
Sriram Ramasubramanian
fa3ab59494
Bug 920317: Banner cuts off TopSitesPage. [r=margaret]
...
--HG--
rename : b2g/config/emulator-ics/config.json => b2g/config/emulator/config.json
rename : b2g/config/emulator-ics/releng-emulator-ics.tt => b2g/config/emulator/releng-emulator.tt
extra : rebase_source : cdbc79b907ad0d90ff315966e645535ffb4a39b9
2013-09-26 15:39:36 -07:00
Kartikaya Gupta
11d3827466
Bug 921477 - Fix typo causing certificate usage failure. rs=wesj
2013-09-27 14:06:14 -04:00
Kartikaya Gupta
e2c5a16656
Bug 911152 - Don't reprocess the same metadata over and over. r=wesj
2013-09-27 13:57:54 -04:00
Kartikaya Gupta
f8a2c4f10b
Bug 911574 - Allow subframe panning on the body. r=wesj
2013-09-27 13:57:45 -04:00
Michael Comella
f89e59dbb5
Bug 915355 - Part 3: Update default search engine comment to be more descriptive. r=rnewman
2013-09-27 09:38:25 -07:00
Michael Comella
2d3e9e297c
Bug 915355 - Part 2: Add clarifying comments on keyword-search to Android code. r=rnewman
2013-09-27 09:38:25 -07:00
Michael Comella
023676024d
Bug 915355 - Part 1: Add comment clarifying a keyword-search event. r=gavin
2013-09-27 09:38:25 -07:00
Raymond Lee
105a55451f
Bug 875731 - Replace callers of nsIDownloadManager.usersDownloadsDirectory with Downloads.getUserDownloadsDirectory mobile/andriod/. r=mfinkle
2013-09-27 07:05:46 +08:00
Gregory Szorc
261e4c161f
Bug 921198 - Increase pymake recursion limit (again); r=glandium
2013-09-26 14:43:45 -07:00
Ehsan Akhgari
7b5f2c53b1
Bug 915735 - Part 2: Tickle stdout when linking the PGOed xul.dll; r=ted
2013-09-26 16:54:48 -04:00
Wes Kocher
5b7c6d0a03
Backed out changeset 96974bd168a5 (bug 920831). Test mentioning MozInputMethod failed.
2013-09-26 13:53:54 -07:00
Gaia Pushbot
538ee95e3b
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c9f88878f616
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #12458 from eeejay/bug-920796
Bug 920796 - Add menu roles to sleep menu. r=vingtetun
========
https://hg.mozilla.org/integration/gaia-central/rev/5f9ff6d7dd34
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 920796 - Add menu roles to sleep menu
2013-09-26 13:00:27 -07:00
Gaia Pushbot
8f661ca93d
Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/43f89977f3a5
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 920037 - [Messages] In participant option menu, overlay display should only dislay unknown number/email once r=julienw
https://bugzilla.mozilla.org/show_bug.cgi?id=920037
- Re-organize the assignment of OptionMenu params
- Always set params.section. If the participant is an known contact participant a node will be rendered, otherwise the content will be an empty string
- Limit calls to renderContact for those participants that are known contacts
- Update tests
- assert content of params.header value
- assert that params.section is an empty string for unknown participants
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-09-26 12:50:23 -07:00
Gaia Pushbot
63a989c555
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/77926589c07c
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #12478 from gaye/bug-902124
Bug 902124 - Followup to fix passing NPM_REGISTRY to gaia-marionette
========
https://hg.mozilla.org/integration/gaia-central/rev/63253f9fd46f
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 902124 - Followup to fix passing NPM_REGISTRY to gaia-marionette
2013-09-26 12:36:24 -07:00
Ryan VanderMeulen
cba819222d
Bug 921071 - Add in-tree configs for B2G emulator-ics. r=aki
...
--HG--
rename : b2g/config/emulator/config.json => b2g/config/emulator-ics/config.json
rename : b2g/config/emulator/releng-emulator.tt => b2g/config/emulator-ics/releng-emulator-ics.tt
2013-09-26 15:06:35 -04:00
Ben Hearsum
0380ccdcf8
bug 803531: renew authenticode certificates in september 2013 - update authenticode issuer in tree. r=rstrong, a=lsblakk
2013-09-26 13:44:37 -04:00
Ben Hearsum
acf5ea2df8
bug 803531: renew authenticode certificates in september 2013 - update authenticode issuer in tree. r=rstrong
2013-09-26 13:44:27 -04:00
Gijs Kruitbosch
9e33d5ecaa
Merge mozilla-central and ux
2013-09-26 14:48:36 +02:00
Carsten "Tomcat" Book
dc6420d31c
merge fx-team to mc
2013-09-26 14:14:13 +02:00
Carsten "Tomcat" Book
57fbf69f1c
merge b2g-inbound to mc
2013-09-26 13:32:33 +02:00
Gijs Kruitbosch
8f5a18566f
Backed out changeset a257f4a1591a (bug 920224) for mochitest-bc orange because of my being blind
2013-09-26 11:59:12 +02:00
Gijs Kruitbosch
495e7495d1
Merge mozilla-central and ux
2013-09-26 10:26:16 +02:00
Yuan Xulei
bb7506cb64
Bug 920831 - MozInputMethod's init should only return undefined. r=bz
2013-09-26 15:10:56 +08:00
Yuan Xulei
47024e5bf7
Bug 920831 - MozInputMethod's init should only return undefined. r=bz
2013-09-26 15:10:56 +08:00
Gaia Pushbot
d8d3f31e43
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/01a6fb085eb8
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #12476 from teodosia/fix-unlock-to-homescreen
Bug 921053 - Fix failing lockscreen/test_lockscreen_unlock_to_homescreen.py on master r=zac
========
https://hg.mozilla.org/integration/gaia-central/rev/d511a8385989
Author: Teodosia Pop <teodosia.pop@gmail.com>
Desc: Bug 921053 - Fix failing lockscreen/test_lockscreen_unlock_to_homescreen.py on master
2013-09-26 10:00:26 -07:00
Gaia Pushbot
943a247997
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f96c71f7ec88
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #12445 from Rik/incoming-tap-screen-901168
Bug 901168 - Tapping the center of the screen while receiving a call lea... r=etienne
========
https://hg.mozilla.org/integration/gaia-central/rev/35c74712ccf2
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 901168 - Tapping the center of the screen while receiving a call leaves the call in an unanswerable state
2013-09-26 09:36:26 -07:00
Gaia Pushbot
d8d6c6704e
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0c4b87f3bee9
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12469 from crdlc/bug-920948
Bug 920948 - [Bug] Sometimes drag&drop is not working fine with collections
========
https://hg.mozilla.org/integration/gaia-central/rev/1f54f42eea24
Author: crdlc <crdlc@tid.es>
Desc: Bug 920948 - [Bug] Sometimes drag&drop is not working fine with collections
2013-09-26 08:15:24 -07:00
Andrew Halberstadt
b150c38ee9
Bug 920718 - Update b2g desktop mochitests for bug 746243, r=jhammel
2013-09-26 09:58:08 -04:00
Carsten "Tomcat" Book
e787c4d87b
Merge m-c to b2g-inbound
2013-09-26 15:53:39 +02:00
Eric Chou
5da8be45bb
Bug 919853 - Add mimetype and extension mapping of vCard, r=bz, r=arcturus
2013-09-26 14:25:50 +08:00
Gaia Pushbot
6b1dada0b4
Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/43bc58df001f
Author: GaryChen(pychen) <mmm198219@gmail.com>
Desc: Revert "Merge pull request #12420 from mpizza/Bug_920394_buidTime_keyboard"
This reverts commit 4bbd1850a60925fc6ae7aa7a14b9b634a8187607, reversing
changes made to d90878009b4d864e690b0d382f33a781f1ed0bc1.
Revert "Merge pull request #12005 from mcirlanaru/bug_913782"
This reverts commit 51eb595572dfde7e3af451a9b30b3e22db1fdab2, reversing
changes made to b3d003e1c92f6bd685be275b57f17d186ffcaaa7.
bug 920588 : backout above commit on master
2013-09-25 22:15:24 -07:00