Commit Graph

165587 Commits

Author SHA1 Message Date
Nick Alexander
2d65bc50d0 Merge m-c to s-c 2014-01-29 20:01:11 -08:00
Richard Newman
b977878594 Bug 959915 - Adapt FxA token server client to include X-Client-State header. r=nalexander 2014-01-29 17:08:39 -08:00
Nick Alexander
13f55b77d8 Bug 965376 - Update final copy for Android Firefox Accounts. r=me
--HG--
extra : amend_source : a5dc69864bc0e9ba4e834184f7f2d8525f75995a
2014-01-29 13:02:44 -08:00
Ryan VanderMeulen
c578705bd5 Merge b2g-inbound to m-c on a CLOSED TREE. 2014-01-29 15:37:19 -05:00
Ryan VanderMeulen
aa86b69add Merge fx-team to m-c on a CLOSED TREE. 2014-01-29 15:18:45 -05:00
B2G Bumper Bot
a2a950079a Bumping manifests a=b2g-bump 2014-01-29 12:05:56 -08:00
B2G Bumper Bot
d01c990e33 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/621040ee199c
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #15356 from borjasalguero/dm_update_time_strings"

This reverts commit 78dda57ce4b5e5eb862a370a4fb994d1f0b1c5a3, reversing
changes made to 7c033555f5f79bca85d2a89a9d78fa3dff7dfead.
2014-01-29 12:00:10 -08:00
B2G Bumper Bot
9ef6f40fa6 Bumping manifests a=b2g-bump 2014-01-29 11:47:50 -08:00
B2G Bumper Bot
8b47807fc8 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

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

Bug 960250 - Show app titles in status bar

========

https://hg.mozilla.org/integration/gaia-central/rev/ca2f1cadd156
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 960250 - Show app titles in status bar r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/1c16e3927bdf
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #15656 from arcturus/bug-962215

Bug 962215 - [B2G][Contacts]Unable to import contacts from the SD card.

========

https://hg.mozilla.org/integration/gaia-central/rev/df981ce193c4
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 962215 - [B2G][Contacts]Unable to import contacts from the SD card.

========

https://hg.mozilla.org/integration/gaia-central/rev/b89bbd4ec3ea
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #15679 from arcturus/bug-957338

Bug 957338 - [Contacts] When viewing contact details from the Messages app (via Activity) the chat icon is not functional and not disabled either

========

https://hg.mozilla.org/integration/gaia-central/rev/2d25b8b0149d
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 957338 - [Contacts] When viewing contact details from the Messages app (via Activity) the chat icon is not functional and not disabled either
2014-01-29 11:47:42 -08:00
Ryan VanderMeulen
a5b81a765d Backed out changesets ac4e6f145b9a, 91c572ac5ee1, f501606dc1d3, and 15fc5d1cb10e (bug 952893) for test failures on a CLOSED TREE. 2014-01-29 14:34:08 -05:00
Paul Adenot
dca90b3409 Bug 952893 - Null-check mStream in AudioDestinationNode::SetIsOnlyNodeForContext as it can be called during CC, on a CLOSED TREE.
--HG--
extra : rebase_source : 20893fd4bba9a92c71a3e205e58dc03e6f2958dd
2014-01-29 19:09:39 +01:00
Gijs Kruitbosch
939382ceee Bug 964433 - overflowedItem fix for Australis overflowable toolbar, r=jaws 2014-01-29 17:22:52 +00:00
B2G Bumper Bot
341d8abe8a Bumping manifests a=b2g-bump 2014-01-29 09:18:05 -08:00
B2G Bumper Bot
8f4669544f Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/59b5a0203768
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #15803 from gabrielesvelto/bug-947234-incremental-threads-v1.3

Bug 947234 - Improve SMS app launch latency

========

https://hg.mozilla.org/integration/gaia-central/rev/1a37d498bb50
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 947234 - Quiet facebook-related errors that aren't really errors

========

https://hg.mozilla.org/integration/gaia-central/rev/34ab93047dec
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 947234 - Render the threads incrementally
2014-01-29 09:15:21 -08:00
Gijs Kruitbosch
5728a70b7c Bug 940116 - part 1 of many, fix Australis' customize/quit/help labels, r=jaws
--HG--
extra : rebase_source : c21f1850c72ed7f11defcd00711f48fd8e12f668
2014-01-29 17:10:14 +00:00
Mark Hammond
e595dddc14 Bug 958927 - XUL dialogs for sync unlink and relink confirmation dialogs. r=gavin
Conflicts:
	browser/base/content/aboutaccounts/aboutaccounts.js

--HG--
extra : rebase_source : 2c81fe29d3b85eb8174b988cbaff516e71c39358
2014-01-28 20:43:01 -08:00
Mark Hammond
b9974ecc39 Bug 965016 - about:accounts should always say "Firefox Accounts", not "Nightly Accounts". r=ttaubert
--HG--
extra : rebase_source : eebff0b5ba1b783fea1bb70fa0b848ac1c7e85e7
2014-01-28 20:43:01 -08:00
Lucas Rocha
8cc52c566c Bug 963508 - Don't directly remove elements while iterating on a set (r=wesj) 2014-01-29 09:03:31 -08:00
Lucas Rocha
b97f532baa Bug 962237 - Fix indentation in toolbar_edit_layout.xml (r=wesj) 2014-01-29 09:02:08 -08:00
Richard Newman
a7fef31707 Bug 965064 - Part 2: back out FirefoxAccountsHelper. r=nalexander 2014-01-28 16:51:19 -08:00
Richard Newman
46456905af Bug 965064 - Part 1: back out non-native about:accounts. r=nalexander 2014-01-28 16:49:54 -08:00
Richard Newman
19031f31eb Bug 963424 - Use token server-provided cluster URL. r=nalexander 2014-01-28 16:20:50 -08:00
Richard Newman
cbb7b8036b Bug 965038 - Styling for links. r=nalexander 2014-01-28 15:49:39 -08:00
Richard Newman
fbbe589163 Bug 964873 - Linkify the COPPA 'learn more' link. r=nalexander 2014-01-28 15:28:33 -08:00
Richard Newman
57a2769fc6 Bug 962542 - Linkify 'getting started' support link. r=nalexander 2014-01-28 15:27:57 -08:00
Richard Newman
869e4e8be0 Bug 959774 - Linkifying FxA setup elements. r=nalexander 2014-01-28 15:27:26 -08:00
Richard Newman
aac0650754 Bug 965020 - Use task affinities more clearly to avoid some back-stack issues. r=wesj 2014-01-28 15:18:16 -08:00
Richard Newman
b69c1f4946 Merge m-c to s-c. 2014-01-28 15:14:23 -08:00
Ryan VanderMeulen
56ad345355 Merge inbound to m-c. 2014-01-28 16:25:05 -05:00
Ryan VanderMeulen
cdf1e69671 Merge fx-team to m-c. 2014-01-28 16:18:18 -05:00
Ryan VanderMeulen
23022f3fa0 Merge b2g-inbound to m-c. 2014-01-28 16:12:29 -05:00
Wes Johnston
562b93fe74 backout 4e6fcc7b5d13, 58d9759ff3d1, and 45d37d92612d CLOSED TREE 2014-01-28 12:28:46 -08:00
Nikhil Marathe
6a771ba40f Bug 957926 - Add JS::CreateTypeError. r=jorendorff
--HG--
extra : rebase_source : d621273cbff342f10864c2843a53eb55421fe582
2014-01-28 09:19:48 -08:00
B2G Bumper Bot
dc75c31d84 Bumping manifests a=b2g-bump 2014-01-28 09:14:39 -08:00
B2G Bumper Bot
72479ca3d3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2f947703e8fd
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #15482 from eeejay/bug-961169

Bug 961169 - [Settings] Clean up range inputs, and make them more screen... r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/d07e762767ae
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 961169 - [Settings] Clean up range inputs, and make them more screen reader friendly.
2014-01-28 09:10:21 -08:00
B2G Bumper Bot
06de1f7ceb Bumping manifests a=b2g-bump 2014-01-28 08:49:35 -08:00
B2G Bumper Bot
a68c703a63 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3d4209fdf720
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 909839 - Merge JavaScript 'atoms' used by gaia and gaiatest. r=jgriffin r=zcampbell
2014-01-28 08:45:21 -08:00
B2G Bumper Bot
630f1a7def Bumping manifests a=b2g-bump 2014-01-28 08:22:21 -08:00
Honza Bambas
72ebac915b Bug 963703 - Don't use LoadUnblocked flag as cache priority load indication, r=michal 2014-01-28 17:21:21 +01:00
B2G Bumper Bot
b7a0f7eaee Bumping manifests a=b2g-bump 2014-01-28 08:19:22 -08:00
B2G Bumper Bot
1fd9fe92e9 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3451eb6b72d2
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 946812 - Disable test_camera_flash on Hamachi (no flash present) a=testonly r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/24822dd90ea8
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 949897 - Disable test_cards_view_kill_apps_two_apps for device a=testonly r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/a8ac9ba099f3
Author: rwood-moz <rwood@mozilla.com>
Desc: Bug 964280 - Add option to override b2g start timeout duration. r=dhunt
2014-01-28 08:19:12 -08:00
Gijs Kruitbosch
9306a5579a Bug 964217 - search item is broken in Australis' customize code, r=mikedeboer 2014-01-28 15:53:45 +00:00
Gijs Kruitbosch
35d5f37fc7 Bug 947915 - fix sync button pending state on Australis win7 glass on menubar/tabstoolbar, r=mikedeboer 2014-01-29 16:27:33 +00:00
Mike de Boer
499f75d2eb [Australis] Bug 870593: add locale strings to be used for tips in Customize Mode. r=Gijs 2014-01-29 15:43:29 +01:00
Margaret Leibovic
99e8c611cd Bug 961375 - Create a shorter label for dynamic toolbar pref. r=bnicholson 2014-01-29 06:58:49 -08:00
Margaret Leibovic
42187e7dff Bug 745755 - Generate a marketplace bookmark on profile creation. r=wesj 2014-01-29 06:58:46 -08:00
Mike de Boer
750a66cd18 [Australis] Bug 963095: adjust toolbar widget panel styling. r=Gijs 2014-01-29 12:20:40 +01:00
Carsten "Tomcat" Book
1b02bd336d Backed out changeset e3a37b924215 (bug 964510) for suspicion of causing frequent rc2 orange on android 2014-01-29 12:17:42 +01:00
Carsten "Tomcat" Book
5016359128 Backed out changeset 33060d0581d6 (bug 784759) for suspicion of causing frequent rc2 orange on android 2014-01-29 12:17:32 +01:00
Carsten "Tomcat" Book
2d1271c0c2 Backed out changeset 9c564b61b7f8 (bug 964511) for suspicion of causing frequent rc2 orange on android 2014-01-29 12:17:22 +01:00