Commit Graph

171784 Commits

Author SHA1 Message Date
B2G Bumper Bot
c1f1b26cdc Bumping manifests a=b2g-bump 2014-03-05 16:01:12 -08:00
B2G Bumper Bot
552f2a6273 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/25562480c0f6
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16917 from 6a68/bug-972645-reset-password

Bug 972645 - Implement Reset Password Firefox Accounts flow, resubmitted. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/9646e5b494aa
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 972645 - Implement Reset Password Firefox Accounts flow, resubmitted. r=ferjm

  Includes special case for reset password in FTE, see bug 965494 comment 1
2014-03-05 15:55:23 -08:00
B2G Bumper Bot
29aba2a327 Bumping manifests a=b2g-bump 2014-03-05 14:51:33 -08:00
B2G Bumper Bot
1864067854 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c10a5f7f7e2f
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #16819 from dmarcos/bug974730

Bug 974730 - [Camera] Camera Library has to listen for the onPreviewStat...

========

https://hg.mozilla.org/integration/gaia-central/rev/c82911658e3a
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 974730 - [Camera] Camera Library has to listen for the onPreviewStateChange event
2014-03-05 14:50:24 -08:00
B2G Bumper Bot
e9355749f8 Bumping manifests a=b2g-bump 2014-03-05 14:45:54 -08:00
B2G Bumper Bot
6bd29ab8db Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e030bdb4b6db
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 975161 - Reland ensure SIM Pin inputs are visible. r=vingetun

This reverts commit 05337d2ce75651550892ca883030548ed5f7d6aa.
2014-03-05 14:40:27 -08:00
Ryan VanderMeulen
7dc19fd5c0 Merge m-c to b2g-inbound. 2014-03-05 16:07:26 -05:00
Ryan VanderMeulen
3d07d638ad Merge b2g-inbound to m-c. 2014-03-05 16:01:53 -05:00
Ryan VanderMeulen
9af7d7848c Merge fx-team to m-c. 2014-03-05 15:49:40 -05:00
Ryan VanderMeulen
4523d362ef Merge inbound to m-c. 2014-03-05 15:43:21 -05:00
B2G Bumper Bot
5d3fb83e37 Bumping manifests a=b2g-bump 2014-03-05 12:40:51 -08:00
B2G Bumper Bot
6470053089 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/92e7b0175abd
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #16907 from millermedeiros/972666-lines-over-events-2

Bug 972666 - [Calendar] lines over events longer than 2 hours r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/41e352749ff5
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 972666 - [Calendar] lines over events longer than 2 hours

========

https://hg.mozilla.org/integration/gaia-central/rev/82970d7816cd
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #16912 from millermedeiros/979969-marionette-is-view-active

Bug 979969 - [Calendar] calendar.isViewActive should check if element is really "active" on the marionette tests r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/11cc4d709a3d
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 979969 - [Calendar] calendar.isViewActive should check if element is really "active" on the marionette tests
2014-03-05 12:35:25 -08:00
B2G Bumper Bot
6fd4977159 Bumping manifests a=b2g-bump 2014-03-05 12:11:10 -08:00
B2G Bumper Bot
1f5dc6ecdb Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a19581a56f75
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #16918 from pivanov/bug-979696

Folowup patch for Bug 979696

========

https://hg.mozilla.org/integration/gaia-central/rev/87eec8bd392a
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Folowup patch for Bug 979696

========

https://hg.mozilla.org/integration/gaia-central/rev/73bd440eef89
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #16908 from pivanov/bug-979696

Bug 979696 - Update Photographic Wallpapers Sizes for 1.4

========

https://hg.mozilla.org/integration/gaia-central/rev/cca85e9f8e17
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 979696 - Update Photographic Wallpapers Sizes for 1.4
2014-03-05 12:05:23 -08:00
B2G Bumper Bot
c579657121 Bumping manifests a=b2g-bump 2014-03-05 12:01:08 -08:00
B2G Bumper Bot
efbc990744 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c7a34ae95f67
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #16667 from pivanov/bug-949024

Bug 949024 - Update Branded Wallpapers Sizes for v.1.4

========

https://hg.mozilla.org/integration/gaia-central/rev/11cfc3fcb2a0
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 949024 - Update Branded Wallpapers Sizes for v.1.4
2014-03-05 11:55:22 -08:00
Robert Strong
6bc5c325e9 Test cleanup and tests for Bug 759469 - Add new updater instruction to add a file if it doesn't exist in the destination. r=bbondy
--HG--
rename : toolkit/mozapps/update/tests/unit_base_updater/marDirLockedStageFailure_win.js => toolkit/mozapps/update/tests/unit_base_updater/marAppApplyDirLockedStageFailure_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageSuccessComplete_win.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageFailureComplete_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageSuccessPartial_win.js => toolkit/mozapps/update/tests/unit_base_updater/marFileInUseStageFailurePartial_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessComplete_win.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageFailureComplete_win.js
rename : toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageSuccessPartial_win.js => toolkit/mozapps/update/tests/unit_base_updater/marRMRFDirFileInUseStageFailurePartial_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marDirLockedStageFailureSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marAppApplyDirLockedStageFailureSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageSuccessCompleteSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageSuccessPartialSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marFileInUseStageFailurePartialSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessCompleteSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageFailureCompleteSvc_win.js
rename : toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageSuccessPartialSvc_win.js => toolkit/mozapps/update/tests/unit_service_updater/marRMRFDirFileInUseStageFailurePartialSvc_win.js
2014-03-05 11:43:28 -08:00
Robert Strong
0b103b9c2c Updated test binaries for Bug 759469 - Add new updater instruction to add a file if it doesn't exist in the destination. r=bbondy
--HG--
rename : toolkit/mozapps/update/tests/data/partial_in_use_win_before.exe => toolkit/mozapps/update/tests/data/complete.exe
rename : toolkit/mozapps/update/tests/data/partial_in_use_win_after.exe => toolkit/mozapps/update/tests/data/partial.exe
2014-03-05 11:43:20 -08:00
Robert Strong
a98abe6963 Main patch for Bug 759469 - Add new updater instruction to add a file if it doesn't exist in the destination. r=bbondy 2014-03-05 11:43:11 -08:00
Robert Strong
f32e59dab1 Bug 896224 - Remove support for the version 1 manifest from the updater. r=bbondy 2014-03-05 11:43:03 -08:00
Robert Strong
e7817478d3 Bug 900251 - Add support for add-if-not instruction added by bug 759469 to the mar generation scripts. r=nthomas 2014-03-05 11:42:56 -08:00
Robert Strong
5faf340e1f bug 896223 - Remove the version 1 manifest from the mar creation scripts. r=nthomas 2014-03-05 11:42:48 -08:00
B2G Bumper Bot
eac4d1e716 Bumping manifests a=b2g-bump 2014-03-05 11:35:50 -08:00
B2G Bumper Bot
5c3df191e8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/566953ef93e6
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #16909 from mcav/alarm-bar

Bug 979530 - [B2G][Clock] The text alarm in the notification banner is cut off. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/a73b0c548ddd
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 979530 - [B2G][Clock] The text alarm in the notification banner is cutoff
2014-03-05 11:30:23 -08:00
B2G Bumper Bot
306f72b35b Bumping manifests a=b2g-bump 2014-03-05 11:01:27 -08:00
B2G Bumper Bot
5994e4b748 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5d470e57a891
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #16628 from 6a68/bug-972645-reset-password"

This reverts commit e2427df4eaf5b0b7ae207b256a51436b5b80d769, reversing
changes made to 117b06a09a1e15ce19f21eaaf53a7fe187b233d8.
2014-03-05 11:00:16 -08:00
B2G Bumper Bot
89f3e2c65c Bumping manifests a=b2g-bump 2014-03-05 10:36:27 -08:00
B2G Bumper Bot
1cdad064a3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c7a5af5dc4e9
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #16678 from jonallengriffin/modules

Bug 977366 - Allow make node_modules to use git mirror, r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/d61735aa8cc5
Author: Jonathan Griffin <jonallengriffin@gmail.com>
Desc: Bug 977366 - Allow make node_modules to use git mirror, r=gaye
2014-03-05 10:35:19 -08:00
B2G Bumper Bot
69d22ab9ad Bumping manifests a=b2g-bump 2014-03-05 10:06:11 -08:00
B2G Bumper Bot
cb22403455 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/765bd1e5dbef
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 975161 - Ensure SIM Pin inputs are visible. r=vingetun" for failures in system/test/unit/sim_settings_helper_test.js

This reverts commit fa25ec9e9491388beee916b35ad3c59cbfee2f30.
2014-03-05 10:00:22 -08:00
B2G Bumper Bot
6fc311b40f Bumping manifests a=b2g-bump 2014-03-05 09:51:29 -08:00
B2G Bumper Bot
424b14e55f Bumping manifests a=b2g-bump 2014-03-05 09:26:11 -08:00
B2G Bumper Bot
bef614adf9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5d6a52354620
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16628 from 6a68/bug-972645-reset-password

Bug 972645 - Implement Reset Password Firefox Accounts flow

========

https://hg.mozilla.org/integration/gaia-central/rev/6b4bfac91fae
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 972645 - Implement Reset Password Firefox Accounts flow. r=ferjm

  Includes special case for reset password in FTE, see bug 965494 comment 1
2014-03-05 09:20:23 -08:00
B2G Bumper Bot
5758cd8cbd Bumping manifests a=b2g-bump 2014-03-05 09:16:05 -08:00
B2G Bumper Bot
fba4f12a00 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 971447 - [System2] Instantiable ActionMenu r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/f07aab93e438
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 971447 - [System2] Instantiable ActionMenu r=alive
2014-03-05 09:10:39 -08:00
Nick Alexander
c50facf8d3 Bug 978587 - Make GeckoView package org.mozilla.gecko; don't include org.mozilla.gecko.R. r=blassey
This builds a new Java JAR containing only org.mozilla.gecko.R.  This
new JAR file is included in Fennec, but not included in
geckoview_library.  (Usually ant, gradle, or Eclipse arranges to produce
org.mozilla.gecko.R but not include it in the classes.jar output as part
of a library project.  This mimics that.)

Changing the GeckoView package to org.mozilla.gecko declares to
consuming applications that they should produce org.mozilla.gecko.R,
replacing what was removed above (but with correct resource IDs).
2014-03-05 08:57:09 -08:00
Nick Alexander
9bb1446916 Bug 978587 - Pre: Make geckoview_library and BackgroundInstrumentationTests target android-16. r=blassey
This agrees with Fennec (and BrowserInstrumentationTests).
2014-03-05 08:57:09 -08:00
Nick Alexander
3720d512ba Bug 978587 - Pre: Let Java JARs contain either sources or generated sources. r=blassey 2014-03-05 08:57:09 -08:00
Boris Zbarsky
4b3ac033b1 Bug 978618. Fix error reporting for unintended XPConnect exceptions thrown by JS-implemented webidl to actually work correctly. r=bholley 2014-03-05 08:32:27 -05:00
Boris Zbarsky
7b32b1e627 Bug 978646. Properly cycle-collect document.styleSheetSets. r=smaug 2014-03-05 08:32:27 -05:00
Olli Pettay
15a9629656 Bug 978862, make sure to use the right event type atom throughout CompileEventHandlerInternal, r=jst 2014-03-05 15:16:42 +02:00
Olli Pettay
093484e915 Backout the previous landing (15229e2a01b1) for Bug 978862, since it had wrong bug number, r=backout 2014-03-05 15:16:04 +02:00
Honza Bambas
02010883fb Bug 977339 - Do GECKO_SEPARATE_NSPR_LOGS=1 by default, r=jduell 2014-03-05 14:01:09 +01:00
Ehsan Akhgari
de14085d8c Bug 979067 - Stop exporting the guard object classes; r=froydnj 2014-03-05 07:50:55 -05:00
Carsten "Tomcat" Book
2b75afa842 merge b2g-inbound to mozilla-central 2014-03-05 13:24:51 +01:00
Carsten "Tomcat" Book
4124791bb3 merge mozilla-inbound to mozilla-central 2014-03-05 13:04:39 +01:00
Simon Montagu
423901ddaf Add more logical-coordinate API to nsIFrame. Bug 735577, r=jfkthame 2014-03-04 23:31:47 -08:00
L. David Baron
0253d42661 Bug 828173 bustage fix for non-unified builds: add using declaration. 2014-03-04 21:05:18 -08:00
Timothy Nikkel
87283ff654 Bug 952354. Don't worry about premult alpha flags if the frame is opaque when calling GetFrame and CopyFrame. r=seth 2014-03-04 22:48:48 -06:00
L. David Baron
0ff448bbbf Bug 979557: CanAnimatePropertyOnCompositor should return early when there's no OMT compositing, whether or not logging is enabled. r=dzbarsky
This shouldn't behave differently depending on whether or not logging is
enabled; that difference was introduced in bug 785648.
2014-03-04 20:13:22 -08:00