Commit Graph

148793 Commits

Author SHA1 Message Date
Wes Kocher
3039134040 Merge b2g-inbound to m-c 2013-09-27 19:35:44 -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
Ryan VanderMeulen
33b027001a Backed out changeset 51a41b139305 (bug 920831) for bustage.
CLOSED TREE
2013-09-27 16:21:06 -04:00
Yuan Xulei
bb7506cb64 Bug 920831 - MozInputMethod's init should only return undefined. r=bz 2013-09-26 15:10:56 +08:00
Martijn Wargers
a0b7efa9b2 Bug 918604 - Remove more enablePrivilege calls. r=jmaher 2013-09-25 19:32:20 +02:00
Ryan VanderMeulen
605ce41d5a Backed out changeset 356ba083bb5f (bug 918604) for frequent OSX test_window_bar.html timeouts.
CLOSED TREE
2013-09-27 18:28:43 -04:00
Ryan VanderMeulen
66d481fff9 Backed out changeset 6d0b41d53c32 (bug 920840) for B2G mochitest-3 timeouts.
CLOSED TREE
2013-09-27 18:00:59 -04:00
Ryan VanderMeulen
fb2d6dc1a4 Backed out 6 changesets (bug 913985) for suspicion of causing intermittent Android crashes on a CLOSED TREE.
Backed out changeset de21920d2b8e (bug 913985)
Backed out changeset f0f5497d65bb (bug 913985)
Backed out changeset 1e16ca4ad801 (bug 913985)
Backed out changeset 9c069a0820ea (bug 913985)
Backed out changeset 274df3abc991 (bug 913985)
Backed out changeset 05fe8b17516a (bug 913985)

--HG--
rename : build/annotationProcessors/AnnotationInfo.java => build/annotationProcessors/MethodWithAnnotationInfo.java
rename : build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java => build/annotationProcessors/utils/AlphabeticMethodComparator.java
rename : build/annotationProcessors/utils/GeneratableElementIterator.java => build/annotationProcessors/utils/GeneratableEntryPointIterator.java
rename : mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java => mobile/android/base/mozglue/GeneratableAndroidBridgeTarget.java
rename : mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java => mobile/android/base/mozglue/OptionalGeneratedParameter.java
2013-09-27 17:02:09 -04:00
Ryan VanderMeulen
a7d395950f Backed out changeset 72a979eba564 (bug 857330) for crashes.
CLOSED TREE
2013-09-27 16:52:35 -04:00
Ryan VanderMeulen
c15f17992c Backed out changeset a77f7d610829 (bug 821474) for leaks.
CLOSED TREE
2013-09-27 16:12:28 -04:00
Wes Kocher
94d42c2a8f Backed out changeset 1b86035e7da0 (bug 916881) for CSP-related test failures on a CLOSED TREE 2013-09-27 12:12:10 -07:00
Dan Gohman
08425d56eb Backed out changeset 8bb615862099 (bug 875656) for introducing a subtle regalloc miscompile. 2013-09-27 11:51:28 -07:00
Tareq Khandaker
b6a77c6054 Bug 869613 - Make mach build some/deeper/path do dependencies for some and
some/deeper. r=jdm
2013-09-27 14:47:37 -04:00
Tareq Khandaker
3a6aecc3dd Bug 857330 - Geolocation uses a wrong default value for maximumAge. r=jdm 2013-09-27 14:47:19 -04:00
Birunthan Mohanathas
540fd83836 Bug 783333 - Use WM_WINDOWPOSCHANGING instead of WM_MOVE to handle window moves in nsWindow. r=jimm 2013-09-27 14:46:59 -04:00
Ehsan Akhgari
6e939e7e7f Merge mozilla-central into mozilla-inbound 2013-09-27 14:33:06 -04:00
Nicolas Silva
96a3ebcd75 Bug 821474 - Add memory reporting for Shmem and Memory texture clients. r=BenWa 2013-09-27 20:17:15 +02:00
Andrew Halberstadt
f1f1e21693 Bug 921029 - mozrunner.wait should return the proc's return code, r=jhammel 2013-09-27 14:00:12 -04:00
Patrick McManus
496d8c380f bug 912550 - remove spdy/2 r=hurley 2013-09-27 13:55:24 -04:00
Mike Hommey
8e885340be Fixup for bug 907365 to clear bustage of windows developer builds after bug 920919. r=ted 2013-09-27 23:43:10 +09:00
Carsten "Tomcat" Book
7ce99c6b53 merge b2g-inbound to mc 2013-09-27 11:33:26 +02:00
Gaia Pushbot
5aa9a7e8ba Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6b82ab58ac7e
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #11952 from rexboy7/fix-bug910185-4

bug 910185 - [Contact] Fix z-index problem when navigating panels.

========

https://hg.mozilla.org/integration/gaia-central/rev/958b0f2edd94
Author: Rex Lee <rexboy@mozilla.com>
Desc: bug 910185 - [Contact] Fix z-index problem when navigating panels.
2013-09-26 20:45:25 -07:00
Gaia Pushbot
459b07e36d Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/045f9ed29f81
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #12483 from snowmantw/issue919854

Bug 919854 - [LockScreen] The icon effects isn't obvious enough

========

https://hg.mozilla.org/integration/gaia-central/rev/4b035f2dbbf6
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 919854 - [LockScreen] The icon effects isn't obvious enough
2013-09-26 20:35:23 -07:00
Gaia Pushbot
0eac4400f9 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/05f14cf07f5b
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12482 from lightsofapollo/921297

Bug 921297 - Enable travis irc notifications r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/322a1a61afb5
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 921297 - Enable travis irc notifications r=me
2013-09-26 20:10:23 -07:00
Gaia Pushbot
84d7a7a978 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/69612b1684ee
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #12291 from snowmantw/issue917689

Bug 917689 - LockScreen won't slide on B2G desktop and Firefox nightly

========

https://hg.mozilla.org/integration/gaia-central/rev/df1f0f0ed60b
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 917689 - LockScreen won't slide on B2G desktop and Firefox nightly
2013-09-26 19:45:23 -07:00
Gaia Pushbot
8574ca7b36 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/131946338361
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12484 from lightsofapollo/revert-xpcshell-nice

Revert "Bug 906316 - Don't download the xulrunner SDK each time we chang...

========

https://hg.mozilla.org/integration/gaia-central/rev/837519b9bf26
Author: James Lal <james@lightsofapollo.com>
Desc: Revert "Bug 906316 - Don't download the xulrunner SDK each time we change a branch if their configuration are different r=yurenju,asuth,ochameau"

This reverts commit 106001c4e0ab9253001bed815c03f46b8dd046f0.

========

https://hg.mozilla.org/integration/gaia-central/rev/f590c3659ec3
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #12465 from steveck-chung/bug-919898

Bug 919898 - [B2G][Helix][Date]The SMS is wrong when the time is set to old time. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/b7756926909f
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 919898 - [B2G][Helix][Date]The SMS is wrong when the time is set to old time
2013-09-26 19:35:23 -07:00
Ryan VanderMeulen
d005ec67ff Merge m-c to b2g-inbound. 2013-09-26 21:38:57 -04:00
Ryan VanderMeulen
8a632ce880 Merge fx-team to m-c. 2013-09-26 21:36:35 -04:00
Gaia Pushbot
82a2cb3787 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/029673339a4b
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #12199 from jrburke/bug915639-email-notify-tests

Bug 915639 email notification tests r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/5fd4e056555f
Author: jrburke <jrburke@gmail.com>
Desc: Bug 915639 - [Email] Complete integration tests for notifications
2013-09-26 18:35:23 -07: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
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
acf5ea2df8 bug 803531: renew authenticode certificates in september 2013 - update authenticode issuer in tree. r=rstrong 2013-09-26 13:44:27 -04: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
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