35df417b93a79f36e3be6415830716e4d2725c22: Merge f-t to m-c, a=merge
Phil Ringnalda <philringnalda@gmail.com> - Sat, 17 Jan 2015 13:09:20 -0800 - rev 224413
Push 28125 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:09:43 +0000
Merge f-t to m-c, a=merge
72103138c055a62adccaf02ea6e005983d5256c5: Bug 1119061 - Part 2: Add Sync 1.1 -> Sync 1.5 migration telemetry. r=rnewman
Nick Alexander <nalexander@mozilla.com> - Fri, 16 Jan 2015 17:42:34 -0800 - rev 224412
Push 28125 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:09:43 +0000
Bug 1119061 - Part 2: Add Sync 1.1 -> Sync 1.5 migration telemetry. r=rnewman ======== https://github.com/mozilla-services/android-sync/commit/f7eaef78c18b75f4e03b1f2d897de8de72474399 Author: Nick Alexander <nalexander@mozilla.com> Date: Wed Jan 14 17:36:29 2015 -0800 Bug 1119061 - Part 2: Add Sync 1.1 to Sync 1.5 migration telemetry. ======== https://github.com/mozilla-services/android-sync/commit/e64f9687038a9198a0c67d80d328f08be235311c Author: Nick Alexander <nalexander@mozilla.com> Date: Mon Jan 12 16:30:09 2015 -0800 Bug 1119061 - Part 1: Add TelemetryWrapper. This is cribbed, more or less directly, from the stumbler. ======== https://github.com/mozilla-services/android-sync/commit/51299e74e4e7b9f3228ff163ed2566cca9efcd3a Author: Nick Alexander <nalexander@mozilla.com> Date: Mon Jan 12 17:26:41 2015 -0800 Bug 1119061 - Pre: Clear Firefox Account notifications when Android Account is removed.
94d2782392e4749bb63572132ca428c3ca093126: Bug 1119061 - Part 1: Add Fennec-specific Sync 1.1 -> Sync 1.5 migration telemetry histograms. r=rnewman
Nick Alexander <nalexander@mozilla.com> - Fri, 16 Jan 2015 17:38:28 -0800 - rev 224411
Push 28125 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:09:43 +0000
Bug 1119061 - Part 1: Add Fennec-specific Sync 1.1 -> Sync 1.5 migration telemetry histograms. r=rnewman The exponential histogram FENNEC_SYNC11_MIGRATION_NOTIFICATIONS_OFFERED is triggered every time the Android device tries to sync from the Sync11Migrated state. Therefore, the notification offered may be (transparently) replacing an existing notification; it doesn't necessarily mean we're nagging the user after dismissal.
c8634e2a411740f845aafd3c650f15d797eb71d3: Bug 1119070 - Add migration=sync11 query parameter to post-migration /account/login. r=rnewman
Nick Alexander <nalexander@mozilla.com> - Fri, 16 Jan 2015 17:42:29 -0800 - rev 224410
Push 28125 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:09:43 +0000
Bug 1119070 - Add migration=sync11 query parameter to post-migration /account/login. r=rnewman ======== https://github.com/mozilla-services/android-sync/commit/fb5159ea46d59164e21b0a21dbb953c4386dfcb4 Author: Nick Alexander <nalexander@mozilla.com> Date: Mon Jan 12 15:01:22 2015 -0800 Bug 1119070 - Part 3: Re-instate service=sync; add migration=sync11. ======== https://github.com/mozilla-services/android-sync/commit/00ab8e45e0261799ee35fad1a7a3486ecceecb5c Author: Nick Alexander <nalexander@mozilla.com> Date: Mon Jan 12 14:23:32 2015 -0800 Bug 1119070 - Part 2: Thread query parameters through to relevant API calls. ======== https://github.com/mozilla-services/android-sync/commit/b4029585aac5cc07f17027b804295258f8390c78 Author: Nick Alexander <nalexander@mozilla.com> Date: Mon Jan 12 12:46:22 2015 -0800 Bug 1119070 - Part 1: Extract uniform getBaseResource.
a57f75ad12f1aa13142b3e9d923c435438af8c14: Bug 1121610 - Change WiFi -> Wi-Fi. r=nalexander
Archaeopteryx <archaeopteryx@coole-files.de> - Thu, 15 Jan 2015 10:53:17 -0800 - rev 224409
Push 28125 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:09:43 +0000
Bug 1121610 - Change WiFi -> Wi-Fi. r=nalexander ======== https://github.com/mozilla-services/android-sync/commit/5e9476fa2a3e278024c4f036ca8f71362683ac55 Author: Archaeopteryx <archaeopteryx@coole-files.de> Bug 1121610 - WiFi -> Wi-Fi
e161904aeeb9f226ce301afcfa47fe7b043b3924: Bug 1120236 - fix autocomplete in case search bar doesn't exist, r=florian
Gijs Kruitbosch <gijskruitbosch@gmail.com> - Sat, 17 Jan 2015 00:21:21 +0000 - rev 224408
Push 28125 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:09:43 +0000
Bug 1120236 - fix autocomplete in case search bar doesn't exist, r=florian
e72b48d59969a5c4b732ef85c212674611d0e5ac: Bug 1116912 - Don't hide the dynamic toolbar when it was originally shown but a tab was selected. r=wesj
Michael Comella <michael.l.comella@gmail.com> - Fri, 16 Jan 2015 17:37:20 -0800 - rev 224407
Push 28125 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:09:43 +0000
Bug 1116912 - Don't hide the dynamic toolbar when it was originally shown but a tab was selected. r=wesj Additionally, rename mShowActionModeEndAnimation to make it more intuitive and clean up it's initialization.
41c672fbc3c1513728ca6feb5adcca2992f1d696: Merge b-i to m-c, a=merge
Phil Ringnalda <philringnalda@gmail.com> - Sat, 17 Jan 2015 13:06:16 -0800 - rev 224406
Push 28124 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:06:29 +0000
Merge b-i to m-c, a=merge
51f665bec8d758942c506aceae2709689e7e606a: Merge m-c to b2g-inbound a=merge
Wes Kocher <wkocher@mozilla.com> - Fri, 16 Jan 2015 18:07:28 -0800 - rev 224405
Push 28124 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:06:29 +0000
Merge m-c to b2g-inbound a=merge
2eb235ad3fcb5449d8bc9a285f92d1302712967d: Bumping manifests a=b2g-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Fri, 16 Jan 2015 14:41:26 -0800 - rev 224404
Push 28124 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:06:29 +0000
Bumping manifests a=b2g-bump
9834a6ddc7504f127849ca82ca7e04741f206104: Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
B2G Bumper Bot <release+b2gbumper@mozilla.com> - Fri, 16 Jan 2015 14:39:48 -0800 - rev 224403
Push 28124 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:06:29 +0000
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9afe83aea4c5 Author: David Flanagan <dflanagan@mozilla.com> Desc: Merge pull request #27436 from davidflanagan/bug1108979 Bug 1108979: don't just hide the poster image; actually unload it. r=pdahiya ======== https://hg.mozilla.org/integration/gaia-central/rev/63af966efceb Author: David Flanagan <dflanagan@mozilla.com> Desc: Bug 1108979: don't just hide the poster image; actually unload it.
0844cea3c2d5d2685016071923999e5e54092675: Bug 1122276 - Inline the BuildOverscrollHandoffChain callsite of GetTargetAPZC to avoid re-entering the tree lock and deadlocking. r=botond
Kartikaya Gupta <kgupta@mozilla.com> - Fri, 16 Jan 2015 17:34:47 -0500 - rev 224402
Push 28124 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:06:29 +0000
Bug 1122276 - Inline the BuildOverscrollHandoffChain callsite of GetTargetAPZC to avoid re-entering the tree lock and deadlocking. r=botond
88f7f6c668829e2324c88ea631a86851fc36bf7c: Bug 1122276 - Move lock from GetTargetNode to call sites. r=botond
Kartikaya Gupta <kgupta@mozilla.com> - Fri, 16 Jan 2015 17:34:47 -0500 - rev 224401
Push 28124 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:06:29 +0000
Bug 1122276 - Move lock from GetTargetNode to call sites. r=botond
e5a20f32cbef480d99ef09de2e66a1375e1401f5: Bug 1113779 - UserCustomizations.jsm spams desktop mochitest test logs r=mccr8
Fabrice Desré <fabrice@mozilla.com> - Fri, 16 Jan 2015 14:16:03 -0800 - rev 224400
Push 28124 by philringnalda@gmail.com at Sat, 17 Jan 2015 21:06:29 +0000
Bug 1113779 - UserCustomizations.jsm spams desktop mochitest test logs r=mccr8
b86864fd9d60cd454cb9f70b2cfd4a67a0b27796: Bug 1122366 - Reftest for margin-collapsing through empty element in vertical mode. r=dbaron
Jonathan Kew <jkew@mozilla.com> - Sat, 17 Jan 2015 08:51:41 +0000 - rev 224399
Push 28123 by philringnalda@gmail.com at Sat, 17 Jan 2015 20:51:39 +0000
Bug 1122366 - Reftest for margin-collapsing through empty element in vertical mode. r=dbaron
ba8558804ee7306de881ff2d04bd203cf847f54d: Bug 1122366 - pt 2 - Also make nsInlineFrame::IsSelfEmpty aware of vertical writing modes. r=dbaron
Jonathan Kew <jkew@mozilla.com> - Sat, 17 Jan 2015 08:51:37 +0000 - rev 224398
Push 28123 by philringnalda@gmail.com at Sat, 17 Jan 2015 20:51:39 +0000
Bug 1122366 - pt 2 - Also make nsInlineFrame::IsSelfEmpty aware of vertical writing modes. r=dbaron
8c5e7ffa005de56e51c2d9a2ee7426fe777847e1: Bug 1122366 - pt 1 - Make nsBlockFrame::IsSelfEmpty aware of vertical writing modes. r=dbaron
Jonathan Kew <jkew@mozilla.com> - Sat, 17 Jan 2015 08:50:56 +0000 - rev 224397
Push 28123 by philringnalda@gmail.com at Sat, 17 Jan 2015 20:51:39 +0000
Bug 1122366 - pt 1 - Make nsBlockFrame::IsSelfEmpty aware of vertical writing modes. r=dbaron
d915530b1046e1dc26cc108498ed7f377c37c96e: Bug 1120071 - Replace custom drop shadow with feDropShadow. r=jaws
Robert Longson <longsonr@gmail.com> - Sat, 17 Jan 2015 08:43:12 +0000 - rev 224396
Push 28123 by philringnalda@gmail.com at Sat, 17 Jan 2015 20:51:39 +0000
Bug 1120071 - Replace custom drop shadow with feDropShadow. r=jaws
496125bde79acee66742b87fece852fc2bd6c5c1: Bug 1121802 - Only add #-moz-resolution to favicon URIs that end in ".ico". r=Unfocused
Seth Fowler <seth@mozilla.com> - Sat, 17 Jan 2015 00:38:41 -0800 - rev 224395
Push 28123 by philringnalda@gmail.com at Sat, 17 Jan 2015 20:51:39 +0000
Bug 1121802 - Only add #-moz-resolution to favicon URIs that end in ".ico". r=Unfocused
a802fb9c3f996f827126fe8e1cea46c5403b2bed: Bug 1122882 - Fix test_platform_colors.xul for 10.10
Phil Ringnalda <philringnalda@gmail.com> - Sat, 17 Jan 2015 00:24:13 -0800 - rev 224394
Push 28123 by philringnalda@gmail.com at Sat, 17 Jan 2015 20:51:39 +0000
Bug 1122882 - Fix test_platform_colors.xul for 10.10
(0) -100000 -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip