Commit Graph

151378 Commits

Author SHA1 Message Date
Wes Kocher
e3fcfc49b1 Merge m-c to fxteam 2013-10-22 18:46:56 -04:00
Brian Nicholson
fc39e24220 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
abc9a053f3 Merge inbound to m-c 2013-10-22 18:11:06 -04:00
Wes Kocher
09451a3733 Merge b2g-inbound to m-c 2013-10-22 17:59:54 -04:00
Brian Nicholson
30619056cd 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
8bd5814074 Bug 919709 - Make Debugger use CodeMirror. r=vporof 2013-10-22 13:53:53 -07:00
Panos Astithas
581d72f5ad Include the browser console command line handler in the browser packaging (bug 929540). r=bsmedberg 2013-10-22 23:01:34 +03:00
Wes Kocher
8f386cadf3 Merge m-c to b2g-inbound 2013-10-22 11:19:19 -04:00
Jim Chen
7ecbc61faf Bug 927429 - Set UA override update URL for B2G; r=fabrice 2013-10-22 11:15:38 -04:00
Karl Dubost
38fbe95c07 Bug 911260 - Remove UA override for domains starting 2013-08-30; r=lmandel 2013-10-22 11:11:42 -04:00
Gaia Pushbot
5b081eecd1 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
8b431bda92 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
0af7b1d4de 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
d21f03b6d5 Backed out changeset f90eb21ea4cd (bug 928204) for build failures on Linux PGO 2013-10-22 11:47:48 +02:00
Landry Breuil
d3bf9fd216 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
dd099c1046 Merge fxteam to m-c 2013-10-21 20:32:55 -04:00
Wes Kocher
cac2099286 Merge b2g-inbound to m-c 2013-10-21 20:30:58 -04:00
Kannan Vijayan
6e9b3e6350 Backout 5a0801040b54, 5bedd82346b4, 4d8068fd3271, and bc31e05eddb8 for b2g build breakage. CLOSED TREE. 2013-10-21 14:39:33 -04:00
Kannan Vijayan
3447d22f47 Backout 38d2cbc11868 for jsreftest failures. CLOSED TREE. 2013-10-21 14:39:29 -04:00
Gaia Pushbot
f85d79df4b 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
1086c6348a 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
e500e9f739 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
911927dc1e Bug 895471 - part 0: add a browser debugger flag, r=past 2013-10-21 18:08:39 +02:00
Jim Mathies
1cafa0210f Bug 927979 - Register the gecko thread correctly in the profiler for FxMetro. r=bgirard 2013-10-22 08:30:06 -05:00
Gijs Kruitbosch
7c77a454d1 Bug 927605 - invert the cloverleaf flag, r=vporof 2013-10-22 14:00:51 +02:00
Gaia Pushbot
d8ff6caa9e 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
05b3c1a654 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
a073d329a0 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
Gaia Pushbot
144eccb20c Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2b6da8b94135
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #12916 from lissyx/bug923574

Bug 923574 - Ensure manifest size is valid r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/76880157232d
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 923574 - Ensure manifest size is valid

When installing an application with an invalid/undefined size, the new
WebIDL is not happy about this and the notification stays forever. We
fix this by checking that the size is effectively defined before setting
the max value of the notification.
2013-10-21 08:15:47 -07:00
Gaia Pushbot
c6f66b716d Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/a1cbfe5e2473
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #12969 from zacc/bug_928864

Bug 928864 - Reenable python ui test test_gallery_delete_image.py , Mari...

========

https://hg.mozilla.org/integration/gaia-central/rev/ccf46db548ed
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 928864 - Reenable python ui test test_gallery_delete_image.py , Marionette modal dialog handling repaired

========

https://hg.mozilla.org/integration/gaia-central/rev/fd2544cad200
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #12968 from zacc/bug_928834

Bug 928834 - Python - Change the timing of the base select wrapper to re...

========

https://hg.mozilla.org/integration/gaia-central/rev/33babafa1834
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 928834 - Python - Change the timing of the base select wrapper to resolve test failure in clock app
2013-10-21 08:15:24 -07:00
Benjamin Smedberg
1b8c0cf234 Fixup for bug 927174 - use the preexisting app.support.baseURL pref instead of a custom one
--HG--
extra : rebase_source : 90f2f8dc85b9198bca608b46bee037d93a118543
2013-10-21 10:33:49 -04:00
Gaia Pushbot
c97ce70b9d Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7125c8040844
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #12499 from comoyo/keyboard_slide_up

Bug 912028 - Background is visible on keyboard pop in. r=RudyL

========

https://hg.mozilla.org/integration/gaia-central/rev/c5f1991f7a3e
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 912028 - Background is visible on keyboard pop in
2013-10-21 01:41:24 -07:00
Gaia Pushbot
cb2b286c72 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/83c708eba811
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12951 from wanderview/uitest-symlink-b2g

Bug 928631: support sym linked b2g in gaia-ui-test

========

https://hg.mozilla.org/integration/gaia-central/rev/48999903b977
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 928631: support sym linked b2g in gaia-ui-test
2013-10-21 00:55:23 -07:00
Gaia Pushbot
86a93813d5 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

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

Bug 924244 - [B2G][Contacts] After exporting a contact the UI still disp...

========

https://hg.mozilla.org/integration/gaia-central/rev/62678797d5a9
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 924244 - [B2G][Contacts] After exporting a contact the UI still displays Export in the top right
2013-10-21 00:45:24 -07:00
Gaia Pushbot
b29a3bfdce Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2172a8ae2e64
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #12139 from arasbm/bug-909373-openaudio-activity-save-robustness

bug-909373-[Music] open activity saving feature robustness, r=@dominickuo

========

https://hg.mozilla.org/integration/gaia-central/rev/176261f18241
Author: Aras Balali Moghaddam <arasbm@gmail.com>
Desc: bug-909373-[Music] open activity saving feature robustness
2013-10-21 00:20:24 -07:00
Gaia Pushbot
e42d479040 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

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

Bug 927768 - Fix incorrect generated CSS transform value in card view, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/e9a1287bc968
Author: ying.xu <ying.xu@spreadtrum.com>
Desc: Bug 927768 - Fix incorrect generated CSS transform value in card view
2013-10-20 21:50:24 -07:00
Gaia Pushbot
a1adc1b606 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2dc51014b8ae
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #12689 from gasolin/issue-917359

Bug 917359 - Remember my choice is exposed for the getUserMedia dialog, ..., r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/f8f9f045b8e2
Author: gasolin <gasolin@gmail.com>
Desc: Bug 917359 - Remember my choice is exposed for the getUserMedia dialog, but shouldn't be
2013-10-20 19:51:24 -07:00
Phil Ringnalda
bd30e279e0 Merge m-c to b-i 2013-10-20 19:32:48 -07:00
Phil Ringnalda
a658b1a532 Merge m-i to m-c 2013-10-20 19:24:53 -07:00
Gijs Kruitbosch
6574bca193 Bug 927605 - refactor keyboard shortcut code in devtools into a JSM, r=Unfocused,vporof
--HG--
rename : browser/devtools/shared/helpers.js => toolkit/modules/ShortcutUtils.jsm
2013-10-20 22:50:37 +02:00
Nick Fitzgerald
9940956347 Bug 916180 - Make pretty printing toggle-able; r=vporof 2013-10-22 00:04:46 -07:00
Tim Taubert
ee9ddb8f96 Bug 929097 - Check window type in SessionStore.onOpen() to ignore; r=smacleod 2013-10-22 00:21:20 +02:00
Tim Taubert
16a6042fb1 Bug 929036 - Remove legacy timer code; r=smacleod 2013-10-21 19:01:00 +02:00
Wes Kocher
8437f0bbbc Merge m-c to fxteam 2013-10-21 20:52:31 -04:00
Gijs Kruitbosch
f481bd6499 Bug 928640 - middle click open recent tabs and restore all tabs broken, r=jaws 2013-10-20 22:06:24 +02:00
Gaia Pushbot
bcd6ef2178 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3d5ae214674b
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #12857 from pivanov/bug-917837

Bug 917837 - [Music] Use Full Line Highlights in Album View

========

https://hg.mozilla.org/integration/gaia-central/rev/4e701344b6db
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 917837 - [Music] Use Full Line Highlights in Album View
2013-10-20 11:45:24 -07:00
Gaia Pushbot
e266e639c2 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0acabc6a8619
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Merge pull request #12942 from flodolo/bug928347

Bug 928347 - Add missing strings in settings.en-US.properties, r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/844741327628
Author: Francesco Lodolo <flod@lodolo.net>
Desc: Bug 928347 - Add missing strings in settings.en-US.properties

All strings have the correct data-l10n-id but strings are not available
in the .properties file
2013-10-20 09:50:23 -07:00
Gaia Pushbot
a6c9ece4eb Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/bd6498a514cc
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 906316 - Don't download the xulrunner SDK each time we change a branch if their configuration are different r=yurenju,asuth,ochameau

This also shows a message when the archive file seems to be corrupted, advising
to run "make really-clean". Also changed "make really-clean" to remove all
xulrunner related files.

We now uncompress the archive directly in a specific directory that should
change when we change the URL.

We use a dot file inside the xulrunner SDK directory to keep the URL used to
download that SDK.

Now we can also define XULRUNNER_DIRECTORY from the command-line. If not
defined, it will use the default xulrunner-sdk-26/xulrunner-sdk.
We can also define XULRUNNER_BASE_DIRECTORY which is the place where the
XULRunner SDK will get uncompressed.

We export the new XULRUNNER_DIRECTORY variable along with the
existing various xulrunner program paths. These paths have been made absolute
using make's `abspath` operation.

The patch also removes the ./ prefixes to those paths as they're likely useless
and prevent from using an absolute path when defining XULRUNNER_DIRECTORY from
the command line.

This patch also remove the email's build_stage directory when running "make
clean".

This _will_ make all devs redownload XULRunner, sorry.

This make the build fail if submakes fail

Also add documentation at the top of the Makefile.
2013-10-20 09:25:24 -07:00
Phil Ringnalda
ee0b0cac08 Merge m-c to b-i 2013-10-19 22:56:18 -07:00
Phil Ringnalda
5a88b3ad4a Merge f-t to m-c 2013-10-19 18:52:09 -07:00