Commit Graph

329165 Commits

Author SHA1 Message Date
Phil Ringnalda
4333f208f4 Merge m-c to f-t 2013-10-22 20:07:57 -07:00
Gaia Pushbot
40dc820ad1 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/22f08f35e21e
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #13009 from comoyo/close-lockscreen-spans

Bug 929479 - Close 'span' elements in lockscreen passcode pad, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/a86162e89beb
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Bug 929479 - Close 'span' elements in lockscreen passcode pad
2013-10-22 19:35:24 -07:00
Rodrigo Silveira
fe065daf83 Bug 918225 - Right-click drop down options are offset r=mbrubeck,jimm 2013-10-22 17:30:19 -07:00
Nicholas Nethercote
eba1059de2 Bug 929791 - Fix invalid JSON generation when dumping memory reports to file after viewing about:memory in the presence of child processes. r=mccr8. 2013-10-22 16:58:33 -07:00
Aaron Klotz
4ff2db0e59 Bug 929763: Don't call TickSample::PopulateContext unless native stack walking is enabled; r=BenWa 2013-10-22 21:56:50 -07:00
Phil Ringnalda
bf9a6e83f1 Bug 918207 followup, touch CLOBBER so the test doesn't fail
CLOSED TREE
2013-10-22 21:05:35 -07:00
Geoff Brown
a1b1616df5 Bug 927476 - Remove extra pref quoting in runtestsremote.py; r=jmaher 2013-10-22 20:34:03 -06:00
Matt Brubeck
f5bae2e96f Back out 1ae5d58532ad (bug 928370) for breaking Tp5 measurement 2013-10-22 16:35:56 -07:00
Sam Foster
91ee7b07ac Bug 897113 - add noContext/contextmenu toggle for richgrid, disable selection for snapped view and awesomebar results. New selectNone richgrid method. r=rsilveira 2013-10-22 16:32:42 -07:00
Kyle Huey
9ab68d6b69 Bug 915757: Split GetListenerManager into two functions for more const-correctness. r=smaug 2013-10-23 07:32:04 +08:00
Steve Fink
8d3ec131cc Bug 929151 - JS_ASSERT(good), not JS_ASSERT(bad). r=bustage
--HG--
extra : rebase_source : dea0a9dfc214449e56d6e69defb4f80ca5ebecc9
2013-10-22 16:24:42 -07:00
Wes Kocher
0762cb2e2f Merge m-c to b2g-inbound 2013-10-22 18:49:44 -04:00
Wes Kocher
8bf62f38fe Merge m-c to fxteam 2013-10-22 18:48:02 -04:00
Wes Kocher
480a2f383f Merge m-c to fxteam 2013-10-22 18:46:56 -04:00
Mark Capella
98a86d973c Bug 912983 - Text selection "cursor" persists on blur, r=margaret 2013-10-22 18:46:43 -04:00
Mark Capella
ffe96c09df Bug 928163 - Allow or disallow proper text selection caret display based on HTML <input> type, r=margaret 2013-10-22 18:46:43 -04:00
Brian Nicholson
87cdb639f2 Backout cf634a1ac73e for robo failures
--HG--
rename : build/mobile/robocop/Actions.java => build/mobile/robocop/Actions.java.in
rename : build/mobile/robocop/Assert.java => build/mobile/robocop/Assert.java.in
rename : build/mobile/robocop/Driver.java => build/mobile/robocop/Driver.java.in
rename : build/mobile/robocop/Element.java => build/mobile/robocop/Element.java.in
rename : build/mobile/robocop/FennecInstrumentationTestRunner.java => build/mobile/robocop/FennecInstrumentationTestRunner.java.in
rename : build/mobile/robocop/FennecMochitestAssert.java => build/mobile/robocop/FennecMochitestAssert.java.in
rename : build/mobile/robocop/FennecNativeActions.java => build/mobile/robocop/FennecNativeActions.java.in
rename : build/mobile/robocop/FennecNativeDriver.java => build/mobile/robocop/FennecNativeDriver.java.in
rename : build/mobile/robocop/FennecNativeElement.java => build/mobile/robocop/FennecNativeElement.java.in
rename : build/mobile/robocop/FennecTalosAssert.java => build/mobile/robocop/FennecTalosAssert.java.in
rename : build/mobile/robocop/PaintedSurface.java => build/mobile/robocop/PaintedSurface.java.in
rename : build/mobile/robocop/RoboCopException.java => build/mobile/robocop/RoboCopException.java.in
rename : build/mobile/robocop/RobocopUtils.java => build/mobile/robocop/RobocopUtils.java.in
rename : mobile/android/base/tests/AboutHomeTest.java => mobile/android/base/tests/AboutHomeTest.java.in
rename : mobile/android/base/tests/BaseTest.java => mobile/android/base/tests/BaseTest.java.in
rename : mobile/android/base/tests/ContentContextMenuTest.java => mobile/android/base/tests/ContentContextMenuTest.java.in
rename : mobile/android/base/tests/ContentProviderTest.java => mobile/android/base/tests/ContentProviderTest.java.in
rename : mobile/android/base/tests/DatabaseHelper.java => mobile/android/base/tests/DatabaseHelper.java.in
rename : mobile/android/base/tests/JavascriptTest.java => mobile/android/base/tests/JavascriptTest.java.in
rename : mobile/android/base/tests/MotionEventHelper.java => mobile/android/base/tests/MotionEventHelper.java.in
rename : mobile/android/base/tests/MotionEventReplayer.java => mobile/android/base/tests/MotionEventReplayer.java.in
rename : mobile/android/base/tests/PixelTest.java => mobile/android/base/tests/PixelTest.java.in
rename : mobile/android/base/tests/StringHelper.java => mobile/android/base/tests/StringHelper.java.in
rename : mobile/android/base/tests/testAboutPage.java => mobile/android/base/tests/testAboutPage.java.in
rename : mobile/android/base/tests/testAddSearchEngine.java => mobile/android/base/tests/testAddSearchEngine.java.in
rename : mobile/android/base/tests/testAddonManager.java => mobile/android/base/tests/testAddonManager.java.in
rename : mobile/android/base/tests/testAwesomebar.java => mobile/android/base/tests/testAwesomebar.java.in
rename : mobile/android/base/tests/testAwesomebarSwipes.java => mobile/android/base/tests/testAwesomebarSwipes.java.in
rename : mobile/android/base/tests/testAxisLocking.java => mobile/android/base/tests/testAxisLocking.java.in
rename : mobile/android/base/tests/testBookmark.java => mobile/android/base/tests/testBookmark.java.in
rename : mobile/android/base/tests/testBookmarkKeyword.java => mobile/android/base/tests/testBookmarkKeyword.java.in
rename : mobile/android/base/tests/testBookmarklets.java => mobile/android/base/tests/testBookmarklets.java.in
rename : mobile/android/base/tests/testBrowserProvider.java => mobile/android/base/tests/testBrowserProvider.java.in
rename : mobile/android/base/tests/testBrowserProviderPerf.java => mobile/android/base/tests/testBrowserProviderPerf.java.in
rename : mobile/android/base/tests/testBrowserSearchVisibility.java => mobile/android/base/tests/testBrowserSearchVisibility.java.in
rename : mobile/android/base/tests/testCheck.java => mobile/android/base/tests/testCheck.java.in
rename : mobile/android/base/tests/testCheck2.java => mobile/android/base/tests/testCheck2.java.in
rename : mobile/android/base/tests/testClearPrivateData.java => mobile/android/base/tests/testClearPrivateData.java.in
rename : mobile/android/base/tests/testDeviceSearchEngine.java => mobile/android/base/tests/testDeviceSearchEngine.java.in
rename : mobile/android/base/tests/testDistribution.java => mobile/android/base/tests/testDistribution.java.in
rename : mobile/android/base/tests/testDoorHanger.java => mobile/android/base/tests/testDoorHanger.java.in
rename : mobile/android/base/tests/testFindInPage.java => mobile/android/base/tests/testFindInPage.java.in
rename : mobile/android/base/tests/testFlingCorrectness.java => mobile/android/base/tests/testFlingCorrectness.java.in
rename : mobile/android/base/tests/testFormHistory.java => mobile/android/base/tests/testFormHistory.java.in
rename : mobile/android/base/tests/testHistory.java => mobile/android/base/tests/testHistory.java.in
rename : mobile/android/base/tests/testImportFromAndroid.java => mobile/android/base/tests/testImportFromAndroid.java.in
rename : mobile/android/base/tests/testInputUrlBar.java => mobile/android/base/tests/testInputUrlBar.java.in
rename : mobile/android/base/tests/testJNI.java => mobile/android/base/tests/testJNI.java.in
rename : mobile/android/base/tests/testJarReader.java => mobile/android/base/tests/testJarReader.java.in
rename : mobile/android/base/tests/testLinkContextMenu.java => mobile/android/base/tests/testLinkContextMenu.java.in
rename : mobile/android/base/tests/testLoad.java => mobile/android/base/tests/testLoad.java.in
rename : mobile/android/base/tests/testMailToContextMenu.java => mobile/android/base/tests/testMailToContextMenu.java.in
rename : mobile/android/base/tests/testMasterPassword.java => mobile/android/base/tests/testMasterPassword.java.in
rename : mobile/android/base/tests/testNewTab.java => mobile/android/base/tests/testNewTab.java.in
rename : mobile/android/base/tests/testOrderedBroadcast.java => mobile/android/base/tests/testOrderedBroadcast.java.in
rename : mobile/android/base/tests/testOverscroll.java => mobile/android/base/tests/testOverscroll.java.in
rename : mobile/android/base/tests/testPan.java => mobile/android/base/tests/testPan.java.in
rename : mobile/android/base/tests/testPanCorrectness.java => mobile/android/base/tests/testPanCorrectness.java.in
rename : mobile/android/base/tests/testPasswordEncrypt.java => mobile/android/base/tests/testPasswordEncrypt.java.in
rename : mobile/android/base/tests/testPasswordProvider.java => mobile/android/base/tests/testPasswordProvider.java.in
rename : mobile/android/base/tests/testPermissions.java => mobile/android/base/tests/testPermissions.java.in
rename : mobile/android/base/tests/testPictureLinkContextMenu.java => mobile/android/base/tests/testPictureLinkContextMenu.java.in
rename : mobile/android/base/tests/testPrefsObserver.java => mobile/android/base/tests/testPrefsObserver.java.in
rename : mobile/android/base/tests/testPrivateBrowsing.java => mobile/android/base/tests/testPrivateBrowsing.java.in
rename : mobile/android/base/tests/testPromptGridInput.java => mobile/android/base/tests/testPromptGridInput.java.in
rename : mobile/android/base/tests/testReaderMode.java => mobile/android/base/tests/testReaderMode.java.in
rename : mobile/android/base/tests/testSearchSuggestions.java => mobile/android/base/tests/testSearchSuggestions.java.in
rename : mobile/android/base/tests/testSettingsMenuItems.java => mobile/android/base/tests/testSettingsMenuItems.java.in
rename : mobile/android/base/tests/testShareLink.java => mobile/android/base/tests/testShareLink.java.in
rename : mobile/android/base/tests/testSharedPreferences.java => mobile/android/base/tests/testSharedPreferences.java.in
rename : mobile/android/base/tests/testSystemPages.java => mobile/android/base/tests/testSystemPages.java.in
rename : mobile/android/base/tests/testTabHistory.java => mobile/android/base/tests/testTabHistory.java.in
rename : mobile/android/base/tests/testThumbnails.java => mobile/android/base/tests/testThumbnails.java.in
rename : mobile/android/base/tests/testVkbOverlap.java => mobile/android/base/tests/testVkbOverlap.java.in
rename : mobile/android/base/tests/test_bug720538.java => mobile/android/base/tests/test_bug720538.java.in
2013-10-22 15:17:28 -07:00
Wes Kocher
16d6e76b4e Merge inbound to m-c 2013-10-22 18:11:06 -04:00
Wes Kocher
b1e7c3445b Merge b2g-inbound to m-c 2013-10-22 17:59:54 -04:00
Brian Nicholson
282dae1ab8 Bug 905703 - Remove preprocessing from robocop harness and tests. r=nalexander
--HG--
rename : build/mobile/robocop/Actions.java.in => build/mobile/robocop/Actions.java
rename : build/mobile/robocop/Assert.java.in => build/mobile/robocop/Assert.java
rename : build/mobile/robocop/Driver.java.in => build/mobile/robocop/Driver.java
rename : build/mobile/robocop/Element.java.in => build/mobile/robocop/Element.java
rename : build/mobile/robocop/FennecInstrumentationTestRunner.java.in => build/mobile/robocop/FennecInstrumentationTestRunner.java
rename : build/mobile/robocop/FennecMochitestAssert.java.in => build/mobile/robocop/FennecMochitestAssert.java
rename : build/mobile/robocop/FennecNativeActions.java.in => build/mobile/robocop/FennecNativeActions.java
rename : build/mobile/robocop/FennecNativeDriver.java.in => build/mobile/robocop/FennecNativeDriver.java
rename : build/mobile/robocop/FennecNativeElement.java.in => build/mobile/robocop/FennecNativeElement.java
rename : build/mobile/robocop/FennecTalosAssert.java.in => build/mobile/robocop/FennecTalosAssert.java
rename : build/mobile/robocop/PaintedSurface.java.in => build/mobile/robocop/PaintedSurface.java
rename : build/mobile/robocop/RoboCopException.java.in => build/mobile/robocop/RoboCopException.java
rename : build/mobile/robocop/RobocopUtils.java.in => build/mobile/robocop/RobocopUtils.java
rename : mobile/android/base/tests/AboutHomeTest.java.in => mobile/android/base/tests/AboutHomeTest.java
rename : mobile/android/base/tests/BaseTest.java.in => mobile/android/base/tests/BaseTest.java
rename : mobile/android/base/tests/ContentContextMenuTest.java.in => mobile/android/base/tests/ContentContextMenuTest.java
rename : mobile/android/base/tests/ContentProviderTest.java.in => mobile/android/base/tests/ContentProviderTest.java
rename : mobile/android/base/tests/DatabaseHelper.java.in => mobile/android/base/tests/DatabaseHelper.java
rename : mobile/android/base/tests/JavascriptTest.java.in => mobile/android/base/tests/JavascriptTest.java
rename : mobile/android/base/tests/MotionEventHelper.java.in => mobile/android/base/tests/MotionEventHelper.java
rename : mobile/android/base/tests/MotionEventReplayer.java.in => mobile/android/base/tests/MotionEventReplayer.java
rename : mobile/android/base/tests/PixelTest.java.in => mobile/android/base/tests/PixelTest.java
rename : mobile/android/base/tests/StringHelper.java.in => mobile/android/base/tests/StringHelper.java
rename : mobile/android/base/tests/testAboutPage.java.in => mobile/android/base/tests/testAboutPage.java
rename : mobile/android/base/tests/testAddSearchEngine.java.in => mobile/android/base/tests/testAddSearchEngine.java
rename : mobile/android/base/tests/testAddonManager.java.in => mobile/android/base/tests/testAddonManager.java
rename : mobile/android/base/tests/testAwesomebar.java.in => mobile/android/base/tests/testAwesomebar.java
rename : mobile/android/base/tests/testAwesomebarSwipes.java.in => mobile/android/base/tests/testAwesomebarSwipes.java
rename : mobile/android/base/tests/testAxisLocking.java.in => mobile/android/base/tests/testAxisLocking.java
rename : mobile/android/base/tests/testBookmark.java.in => mobile/android/base/tests/testBookmark.java
rename : mobile/android/base/tests/testBookmarkKeyword.java.in => mobile/android/base/tests/testBookmarkKeyword.java
rename : mobile/android/base/tests/testBookmarklets.java.in => mobile/android/base/tests/testBookmarklets.java
rename : mobile/android/base/tests/testBrowserProvider.java.in => mobile/android/base/tests/testBrowserProvider.java
rename : mobile/android/base/tests/testBrowserProviderPerf.java.in => mobile/android/base/tests/testBrowserProviderPerf.java
rename : mobile/android/base/tests/testBrowserSearchVisibility.java.in => mobile/android/base/tests/testBrowserSearchVisibility.java
rename : mobile/android/base/tests/testCheck.java.in => mobile/android/base/tests/testCheck.java
rename : mobile/android/base/tests/testCheck2.java.in => mobile/android/base/tests/testCheck2.java
rename : mobile/android/base/tests/testClearPrivateData.java.in => mobile/android/base/tests/testClearPrivateData.java
rename : mobile/android/base/tests/testDeviceSearchEngine.java.in => mobile/android/base/tests/testDeviceSearchEngine.java
rename : mobile/android/base/tests/testDistribution.java.in => mobile/android/base/tests/testDistribution.java
rename : mobile/android/base/tests/testDoorHanger.java.in => mobile/android/base/tests/testDoorHanger.java
rename : mobile/android/base/tests/testFindInPage.java.in => mobile/android/base/tests/testFindInPage.java
rename : mobile/android/base/tests/testFlingCorrectness.java.in => mobile/android/base/tests/testFlingCorrectness.java
rename : mobile/android/base/tests/testFormHistory.java.in => mobile/android/base/tests/testFormHistory.java
rename : mobile/android/base/tests/testHistory.java.in => mobile/android/base/tests/testHistory.java
rename : mobile/android/base/tests/testImportFromAndroid.java.in => mobile/android/base/tests/testImportFromAndroid.java
rename : mobile/android/base/tests/testInputUrlBar.java.in => mobile/android/base/tests/testInputUrlBar.java
rename : mobile/android/base/tests/testJNI.java.in => mobile/android/base/tests/testJNI.java
rename : mobile/android/base/tests/testJarReader.java.in => mobile/android/base/tests/testJarReader.java
rename : mobile/android/base/tests/testLinkContextMenu.java.in => mobile/android/base/tests/testLinkContextMenu.java
rename : mobile/android/base/tests/testLoad.java.in => mobile/android/base/tests/testLoad.java
rename : mobile/android/base/tests/testMailToContextMenu.java.in => mobile/android/base/tests/testMailToContextMenu.java
rename : mobile/android/base/tests/testMasterPassword.java.in => mobile/android/base/tests/testMasterPassword.java
rename : mobile/android/base/tests/testNewTab.java.in => mobile/android/base/tests/testNewTab.java
rename : mobile/android/base/tests/testOrderedBroadcast.java.in => mobile/android/base/tests/testOrderedBroadcast.java
rename : mobile/android/base/tests/testOverscroll.java.in => mobile/android/base/tests/testOverscroll.java
rename : mobile/android/base/tests/testPan.java.in => mobile/android/base/tests/testPan.java
rename : mobile/android/base/tests/testPanCorrectness.java.in => mobile/android/base/tests/testPanCorrectness.java
rename : mobile/android/base/tests/testPasswordEncrypt.java.in => mobile/android/base/tests/testPasswordEncrypt.java
rename : mobile/android/base/tests/testPasswordProvider.java.in => mobile/android/base/tests/testPasswordProvider.java
rename : mobile/android/base/tests/testPermissions.java.in => mobile/android/base/tests/testPermissions.java
rename : mobile/android/base/tests/testPictureLinkContextMenu.java.in => mobile/android/base/tests/testPictureLinkContextMenu.java
rename : mobile/android/base/tests/testPrefsObserver.java.in => mobile/android/base/tests/testPrefsObserver.java
rename : mobile/android/base/tests/testPrivateBrowsing.java.in => mobile/android/base/tests/testPrivateBrowsing.java
rename : mobile/android/base/tests/testPromptGridInput.java.in => mobile/android/base/tests/testPromptGridInput.java
rename : mobile/android/base/tests/testReaderMode.java.in => mobile/android/base/tests/testReaderMode.java
rename : mobile/android/base/tests/testSearchSuggestions.java.in => mobile/android/base/tests/testSearchSuggestions.java
rename : mobile/android/base/tests/testSettingsMenuItems.java.in => mobile/android/base/tests/testSettingsMenuItems.java
rename : mobile/android/base/tests/testShareLink.java.in => mobile/android/base/tests/testShareLink.java
rename : mobile/android/base/tests/testSharedPreferences.java.in => mobile/android/base/tests/testSharedPreferences.java
rename : mobile/android/base/tests/testSystemPages.java.in => mobile/android/base/tests/testSystemPages.java
rename : mobile/android/base/tests/testTabHistory.java.in => mobile/android/base/tests/testTabHistory.java
rename : mobile/android/base/tests/testThumbnails.java.in => mobile/android/base/tests/testThumbnails.java
rename : mobile/android/base/tests/testVkbOverlap.java.in => mobile/android/base/tests/testVkbOverlap.java
rename : mobile/android/base/tests/test_bug720538.java.in => mobile/android/base/tests/test_bug720538.java
extra : rebase_source : ce4905c426eaf5cd47b7b1457ddbd6d3d5b55c00
2013-10-22 13:54:39 -07:00
Anton Kovalyov
de1f0214e6 Bug 919709 - Make Debugger use CodeMirror. r=vporof 2013-10-22 13:53:53 -07:00
Ethan Hugg
2570f19e4d Bug 925896 - Signaling - Addref when adding sessiondata_t to hash r=abr 2013-10-22 13:14:43 -07:00
Gregory Szorc
3ca24c9bd5 Bug 920849 - Part 1: Write metadata for every test file; r=ted 2013-10-22 15:51:49 -07:00
Wes Kocher
78ccbd3d24 Merge m-c to inbound 2013-10-22 18:44:41 -04:00
Wes Kocher
3d55f8e6de Merge m-c to inbound 2013-10-22 18:43:11 -04:00
Jonathan Griffin
55412b9c2e Bug 917750 - mirror several mozbase packages, r=ahal 2013-10-22 15:42:05 -07:00
Panos Astithas
2dc4ce8e39 Include the browser console command line handler in the browser packaging (bug 929540). r=bsmedberg 2013-10-22 23:01:34 +03:00
Gaia Pushbot
dbafec7f4e Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/bf639f09c3f0
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Merge pull request #12936 from gitmai/bug-928283-back-sim-pin

Bug 928283- Added button back (r=fcampo)

========

https://hg.mozilla.org/integration/gaia-central/rev/bd7ae70a5cce
Author: mai <mri@tid.es>
Desc: Bug 928283- Added button back
2013-10-22 10:05:25 -07:00
Wes Kocher
988ebab006 Merge m-c to b2g-inbound 2013-10-22 11:19:19 -04:00
Jim Chen
be39a4d86c Bug 927429 - Set UA override update URL for B2G; r=fabrice 2013-10-22 11:15:38 -04:00
Karl Dubost
0ae2c1828a Bug 911260 - Remove UA override for domains starting 2013-08-30; r=lmandel 2013-10-22 11:11:42 -04:00
Gaia Pushbot
477e1cb396 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ef355aa8244d
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #13007 from wanderview/contacts-webidl-delete

Bug 929287: Only create mozContact if we don't already have one.  r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/d94603ee4bf7
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 929287: Only create mozContact if we don't already have one.
2013-10-22 08:06:24 -07:00
Vicamo Yang
3f9ff25417 Bug 814556 - 2/2: clean up MOZ_B2G_RIL in browser/installer/package-manifest.in and dom/base/Navigator.*. r=khuey, f=Ms2ger 2013-10-22 19:23:04 +08:00
Vicamo Yang
ff610008af Bug 814556 - 1/2: Move mozilla::dom::icc::* to mozilla::dom. r=khuey, f=Ms2ger 2013-10-22 19:23:00 +08:00
Carsten "Tomcat" Book
dae2e257aa Backed out changeset f90eb21ea4cd (bug 928204) for build failures on Linux PGO 2013-10-22 11:47:48 +02:00
Landry Breuil
d7b696d54c Bug 928651: #include <assert.h> in cubeb_sndio.c to fix libxul linking r=padenot
../../../libcubeb/src/cubeb_sndio.o(.text+0x686): In function `sndio_get_max_channel_count':
undefined reference to `assert'
2013-10-22 11:24:30 +02:00
Wes Kocher
7f0f9ca7fa Merge fxteam to m-c 2013-10-21 20:32:55 -04:00
Wes Kocher
b55c225d41 Merge b2g-inbound to m-c 2013-10-21 20:30:58 -04:00
Steve Fink
e059de18e1 Bug 929151 - Disable GGC when object metadata is used, r=terrence 2013-10-21 13:53:37 -07:00
Kannan Vijayan
809746b013 Backout 5a0801040b54, 5bedd82346b4, 4d8068fd3271, and bc31e05eddb8 for b2g build breakage. CLOSED TREE. 2013-10-21 14:39:33 -04:00
Kannan Vijayan
e92a634e57 Backout 38d2cbc11868 for jsreftest failures. CLOSED TREE. 2013-10-21 14:39:29 -04:00
Gaia Pushbot
c569584b96 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/175b7a89aa5f
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #12982 from wanderview/contacts-webidl-sim

Bug 928954: Fix contact sim import for webidl changes.  r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/f1c802e00fa0
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 928954: Fix contact sim import for webidl changes
2013-10-21 11:16:13 -07:00
Gaia Pushbot
0e53dcdd1f Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/216a751e109b
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #12962 from reubenmorais/more-webidl-fixes

Bug 928635 - Fix handling of array properties in the New Contact form.  r=wanderview

========

https://hg.mozilla.org/integration/gaia-central/rev/0f06b2e962b6
Author: Reuben Morais <reuben.morais@gmail.com>
Desc: Bug 928635 - Fix handling of array properties in the New Contact form. r=bkelly
2013-10-21 11:15:49 -07:00
Gaia Pushbot
317f2d9eda Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2e42bc57d96c
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #12981 from wanderview/contacts-delete-search

Bug 928939: Check to see if contacts.Search is loaded in delete path.  r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/1c76e1fcb4e9
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 928939: Check to see if contacts.Search is loaded in delete path.

========

https://hg.mozilla.org/integration/gaia-central/rev/e3bfdfdfd6b5
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #12977 from wanderview/contacts-edit-defobj

Bug 928922: Handle null value in contacts edit screen. r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/d8eb91dc37e4
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 928922: Handle null value in contacts edit screen
2013-10-21 11:15:24 -07:00
Gijs Kruitbosch
d621025ba8 Bug 895471 - part 0: add a browser debugger flag, r=past 2013-10-21 18:08:39 +02:00
Jim Mathies
357604de6e Bug 927979 - Register the gecko thread correctly in the profiler for FxMetro. r=bgirard 2013-10-22 08:30:06 -05:00
Gijs Kruitbosch
e6ac0c23b0 Bug 927605 - invert the cloverleaf flag, r=vporof 2013-10-22 14:00:51 +02:00
Gaia Pushbot
de478ca6af Bumping gaia.json for 5 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5f765c6f46f5
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #12975 from Rik/xfail-contacts-928915

Bug 928915 - Mark contacts gaia-ui-tests as xfail until they are fixed. r=zac

========

https://hg.mozilla.org/integration/gaia-central/rev/1518d7712f33
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 928915 - Mark contacts gaia-ui-tests as xfail until they are fixed.

========

https://hg.mozilla.org/integration/gaia-central/rev/db85b6fee428
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 923459 - [Messages] jshint fixes r=rwaldron

* down to 6 jshint errors, the remaining errors are due (imho) to issues in
  jshint
* bumped up the jshint version
* add a test to test the wbmp decoder

========

https://hg.mozilla.org/integration/gaia-central/rev/87884d9045c2
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #12979 from wanderview/uitest-delete-contact

Bug 928937: Fix contact lookup in test_delete_contact.py  r=zac

========

https://hg.mozilla.org/integration/gaia-central/rev/11093c98dd9b
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 928937: Fix contact lookup in test_delete_contact.py
2013-10-21 08:32:51 -07:00
Gaia Pushbot
2098c251a4 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5d5eabb095fb
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #12978 from teodosia/unxfail-eme-search

Bug 927030 - Reenable test_everythingme_search when bug 927023 is fixed

========

https://hg.mozilla.org/integration/gaia-central/rev/5bf38f4bb12c
Author: Teodosia Pop <teodosia.pop@gmail.com>
Desc: Bug 927030 - Reenable test_everythingme_search when bug 927023 is fixed
2013-10-21 08:32:26 -07:00
Gaia Pushbot
9b6eef21ee Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8c4cb8239031
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #12970 from wanderview/contacts-merger-email-type

Bug 928866: Fix contacts email import for type array.  r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/844554e424e2
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 928866: Fix contacts email import for type array.

========

https://hg.mozilla.org/integration/gaia-central/rev/cae06f1c62aa
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #12972 from wanderview/contacts-webidl-google

Bug 928875: Fix google import for webidl mozContacts.  r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/558012651b53
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 928875: Fix google import for webidl mozContacts.
2013-10-21 08:16:09 -07:00