Commit Graph

209060 Commits

Author SHA1 Message Date
Ryan VanderMeulen
efaa97856d Merge m-c to b2g-inbound. a=merge 2014-10-06 17:33:00 -04:00
Ryan VanderMeulen
96a15f3c66 Merge inbound to m-c. a=merge 2014-10-06 17:05:56 -04:00
Massimo Gervasini
4e5f8f8f37 Bug 1075675 - use google-oauth-api.key for builds r=catlee 2014-10-06 17:03:48 -04:00
Justin Dolske
14f52be678 Bug 1071238 - UI Tour: add ability to put a widget in the toolbar. r=mattn 2014-10-06 15:49:30 -07:00
Matthew Noorenberghe
e5afb90247 Bug 1078261 - Don't fetch Loop call data for the FxA session if we aren't logged in. r=pkerr
--HG--
extra : rebase_source : e9dc9ddfa4c62254801889275c3fe46121036655
2014-10-06 15:36:07 -07:00
Ryan VanderMeulen
7f1b2d4cfa Backed out changeset f4953072c20f (bug 1068412) for mochitest-e10s crashes. 2014-10-06 17:00:27 -04:00
Dave Townsend
f20c5f971f Bug 1078665: Ignore exceptions thrown out of getBrowserForDocument. r=zombie 2014-10-06 13:56:58 -07:00
ZER0
a02e1fbcfd Bug 1078378 - Replace the array instance used by emitSync with one from the content's sandbox. r=Mossop 2014-10-06 13:56:18 -07:00
Ryan VanderMeulen
83ddc7c9de Merge b2g-inbound to m-c. a=merge 2014-10-06 16:45:26 -04:00
B2G Bumper Bot
73280bc81b Bumping manifests a=b2g-bump 2014-10-06 13:27:30 -07:00
Adam Roach [:abr]
66b2cc7fa9 Bug 1017257 - Attach Loop CSP Policy r=sstamm 2014-10-06 15:25:04 -05:00
Dave Townsend
8338f1992c Bug 1068412: Forward dynamically registered resource URI mappings to content processes. r=billm 2014-10-06 12:42:12 -07:00
Ryan VanderMeulen
cca44e57f3 Backed out changesets 4fee6e1f1ad2 and f5db0dae1434 (bug 1075644) for Android 2.3 robocop failures.
CLOSED TREE
2014-10-06 15:47:30 -04:00
Nick Alexander
a63ca8c787 Bug 1077381 - Follow-up: Try to fix Windows bustage. r=me
a=bustage on a CLOSED TREE

--HG--
extra : amend_source : c39a128f271f44e263d77f342665594ba161f933
2014-10-06 12:38:12 -07:00
B2G Bumper Bot
be3adf77c5 Bumping manifests a=b2g-bump 2014-10-06 11:41:53 -07:00
B2G Bumper Bot
b8ba0adc22 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1e5360b21cca
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #24843 from gaye/backout-reland-amd

Bug 1027707 - Proper backout of reland amd

========

https://hg.mozilla.org/integration/gaia-central/rev/2a500d2bac86
Author: gaye <gaye@mozilla.com>
Desc: Revert "Merge pull request #24733 from gaye/reland-amd"

This reverts commit 56d949e8d1c66abb5ee2a0188eac6c0974417212, reversing
changes made to d418d3d86a3e6471c902d39966df02d04d77c158.

========

https://hg.mozilla.org/integration/gaia-central/rev/fbc6c55389b7
Author: gaye <gaye@mozilla.com>
Desc: Revert "Revert "Bug 1027707 followup to fix notifications launching calendar" for causing Bug 1078244"

This reverts commit c3800a31b86648e10fc9ee4dac9673856df1a1f2.
2014-10-06 11:35:47 -07:00
B2G Bumper Bot
d239e58438 Bumping manifests a=b2g-bump 2014-10-06 10:41:54 -07:00
B2G Bumper Bot
774abb3a23 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/93eeaccba494
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #24768 from mcav/clock-alarm-logging

Bug 1052245 - Add debugging for Clock alarms. r=millermedeiros

========

https://hg.mozilla.org/integration/gaia-central/rev/a4d132dce643
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 1052245 - Add debugging for Clock alarms.

========

https://hg.mozilla.org/integration/gaia-central/rev/706027ecea00
Author: Salvador de la Puente González <neo.salvador@gmail.com>
Desc: Merge pull request #24461 from lodr/bug-1026384-send-mms-to-email

Bug 1026384 - [MMS]Display switching of SMS/MMS composition screen
r=:steveck

========

https://hg.mozilla.org/integration/gaia-central/rev/38f03594eda5
Author: Salvador de la Puente <salva@unoyunodiez.com>
Desc: Bug 1026384 - [MMS]Display switching of SMS/MMS composition screen
2014-10-06 10:35:46 -07:00
B2G Bumper Bot
f74165c070 Bumping manifests a=b2g-bump 2014-10-06 10:11:55 -07:00
B2G Bumper Bot
18f09dceb3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b16291874ccd
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #24812 from etiennesegonzac/bug-1075290

Bug 1075290 - Prevent a race condition between turnScreenOff and turnScreenOn r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/382d4def9bef
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1075290 - Prevent a race condition between turnScreenOff and turnScreenOn
2014-10-06 10:05:48 -07:00
B2G Bumper Bot
886368f973 Bumping manifests a=b2g-bump 2014-10-06 09:56:54 -07:00
B2G Bumper Bot
f91498d9fd Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

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

Bug 1077579 - [SoftwareHome] Add integration tests lockscreen appearance, coverage for bug 1064595

========

https://hg.mozilla.org/integration/gaia-central/rev/1d9cb7953d3f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1077579 - [SoftwareHome] Add integration tests lockscreen appearance, coverage for bug 1064595 r=eli

========

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

Bug 1077579 - [SoftwareHome] Add integration tests for modal dialog alerts, coverage for bug 1072231

========

https://hg.mozilla.org/integration/gaia-central/rev/5909f970a978
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1077579 - [SoftwareHome] Add integration tests for modal dialog alerts, coverage for bug 1072231 r=eli

========

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

Bug 1077579 - [SoftwareHome] Add integration tests for app install dialog, coverage for bug 1048593

========

https://hg.mozilla.org/integration/gaia-central/rev/e51ae56a81a4
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1077579 - [SoftwareHome] Add integration tests for app install dialog, coverage for bug 1048593 r=eli
2014-10-06 09:50:47 -07:00
Jon Coppeard
5a31094e9c Bug 650161 - Fix compacting GC build errors following JSObject changes. r=terrence
CLOSED TREE
2014-10-06 17:49:45 +01:00
Ryan VanderMeulen
30963f04ba Backed out changeset 6d73cc06f9fe (bug 650161) for SM(ggc) timeouts.
CLOSED TREE
2014-10-06 16:03:38 -04:00
Jonathan Griffin
2544d57ff7 Bug 1078385 - Bump mozdevice to 0.41, r=jgraham 2014-10-06 10:31:31 -07:00
B2G Bumper Bot
5dfbe3c001 Bumping manifests a=b2g-bump 2014-10-06 09:47:03 -07:00
B2G Bumper Bot
9874cb8d3f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1077579 - [SoftwareHome] Add integration tests for fullscreen apps

========

https://hg.mozilla.org/integration/gaia-central/rev/033cc212d247
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1077579 - [SoftwareHome] Add integration tests for fullscreen apps r=eli
2014-10-06 09:35:48 -07:00
B2G Bumper Bot
046c11bf37 Bumping manifests a=b2g-bump 2014-10-06 09:26:56 -07:00
Ben Hearsum
e89c5cb859 bug 1075723: use different signing format for 64-bit windows builds - fix external packaging special casing. r=mshal, a=bustage 2014-10-06 12:21:29 -04:00
B2G Bumper Bot
999bfb30c7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/407d05c78d76
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #24751 from albertopq/1074033-overlap-statusbar-3

Bug 1074033 - Absolute positioning dialogs when hidden r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/afee5585bfb0
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1074033 - Absolute positioning dialogs when hidden
2014-10-06 09:20:48 -07:00
B2G Bumper Bot
9bddd54274 Bumping manifests a=b2g-bump 2014-10-06 08:26:55 -07:00
B2G Bumper Bot
f4b73c3d98 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d0262401339c
Author: tamarahills <thills@mozilla.com>
Desc: Merge pull request #24707 from tamarahills/bugfix/1068109

Bug 1068109 - Restore 2s delay before callscreen is closed.

========

https://hg.mozilla.org/integration/gaia-central/rev/e3481eed4eed
Author: Tamara Hills <thills@mozilla.com>
Desc: Bug 1068109 - Restore 2s delay before callscreen is closed.
2014-10-06 08:20:48 -07:00
Carsten "Tomcat" Book
97e8a626d9 merge fx-team to mozilla-central a=merge 2014-10-06 15:42:06 +02:00
Carsten "Tomcat" Book
0a6f426021 merge mozilla-inbound to mozilla-central a=merge 2014-10-06 15:32:37 +02:00
Jennifer Fong
e0cfea69b3 Bug 1074880 - Remove file icons on tree view. r=jryans 2014-10-06 12:58:00 +02:00
Jan Odvarko
5c9944fe58 Bug 1072208 - Implement new events for ToolSidebar. r=bgrins 2014-10-07 18:13:51 +02:00
Dão Gottwald
2692457ddb Bug 1079372 - Default browser notification bar should have 'warning' priority, not 'info'. r=gijs 2014-10-08 06:23:30 +02:00
Adam Roach [:abr]
a469e633d5 Bug 1017257 - Attach Loop CSP Policy r=sstamm,dmose 2014-10-06 15:25:04 -05:00
Wes Kocher
c8cdf1120d Merge m-c to fx-team a=merge 2014-10-07 18:46:09 -07:00
Richard Newman
9941764ec0 Bug 1078394 - Remove AppConstants.SEARCH_PACKAGE_NAME. r=margaret 2014-10-06 12:01:51 -07:00
Tim Taubert
b1d0030153 Bug 1078085 - Simplify preference checking code in the newtab preloader r=gijs 2014-10-07 17:54:31 +02:00
Richard Newman
a09923b6ac Bug 1042951 - Part 4: document new search location. r=bcolloran 2014-10-07 17:52:21 -07:00
Richard Newman
460da4dd19 Bug 1042951 - Part 3: record searches from SearchActivity. r=margaret 2014-10-07 17:52:21 -07:00
Richard Newman
ff0f424cd6 Bug 1042951 - Part 2: allow for delayed recording of searches with FHR. r=margaret 2014-10-07 17:52:21 -07:00
Richard Newman
d42f46ae09 Bug 1042951 - Part 1: bump searches measurement version to include search activity sources. r=margaret 2014-10-07 17:52:20 -07:00
Nick Alexander
6f48237bf6 Bug 1063750 - Part 4: Test navigating to about:home?panel= URLs. r=mcomella
There are no consumers of this (that I can see) in the tree, so we need
to test that it doesn't go away.
2014-10-07 16:53:30 -07:00
Nick Alexander
28da99009e Bug 1063750 - Part 3: Remove duplicated test-only PanelType. r=mcomella
Duplicate test types make it difficult to keep tests and code in
lock-step.  (They do mean fewer Proguard annotations.)
2014-10-07 16:53:29 -07:00
Nick Alexander
1b28f32dfa Bug 1063750 - Part 2: Implement link from Remote Tabs tray to Remote Tabs home panel. r=mcomella
Deriving the correct panel UUID from the active Home Panel configuration
is challenging.  This is easy and will only exist for one release.  (The
Remote Tabs tray icon will disappear after this release; see Bug
1063753.)  This solves the problem in essentially all the situations we
expect to see.
2014-10-07 16:53:28 -07:00
Nick Alexander
c6f7cfa6aa Bug 1063750 - Part 1: Replace Remote Tabs tray with messaging to Remote Tabs home panel. r=mcomella 2014-10-07 16:53:27 -07:00
Margaret Leibovic
6ea13f2b03 Bug 895745 - Don't create whitespace between add-on title and version number in details view. r=liuche 2014-10-07 16:24:16 -07:00