dd72dd2a82
Merge fx-team to m-c
2013-12-20 18:28:28 -08:00
971cbb78c9
Merge b2g-inbound to m-c
2013-12-20 18:02:21 -08:00
053154b8a5
merge elm to m-c IGNORE BAD COMMIT MESSAGES
2013-12-21 01:36:09 +01:00
2632b0d5f5
merge m-c to elm
2013-12-21 01:28:08 +01:00
f6b401af9c
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f7a78194ae8e
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 951339 - [Messages][Drafts] Existing thread drafts not properly populated when a new message is sent to that same recipient r=julienw
https://bugzilla.mozilla.org/show_bug.cgi?id=951339
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
========
https://hg.mozilla.org/integration/gaia-central/rev/25b217bf4c6f
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 952225 - [Messages][Drafts] Support subject line in message drafts r=julienw
https://bugzilla.mozilla.org/show_bug.cgi?id=952225
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-12-20 15:05:27 -08:00
23bd5a736d
Bug 940997: Show submenu indicator for MenuItemActionBar. [r=mfinkle]
2013-12-20 14:51:53 -08:00
e73b7ab49e
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/fd425823b0bc
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14909 from davidflanagan/bug951932
Bug 951932: don't allow pick from Music for ringtones r=dmarcos
========
https://hg.mozilla.org/integration/gaia-central/rev/dd976f9b6deb
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 951932: don't allow pick from Music for ringtones
2013-12-20 14:50:25 -08:00
b0775082df
Bug 945521 - Make sure button text type is consistent with keyboard text type; r=mcomella
2013-12-20 17:48:59 -05:00
1221083b0e
Revert the backout of bug 938023 (changesets 19fbd3fb0373:8146150d4df8)
2013-12-20 13:43:46 -08:00
b5ad221892
Bug 952473 - SessionStore should only watch for top-level pageshow events r=wesj
2013-12-20 16:41:11 -05:00
ddbcbb1b36
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4cc1eb367c65
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #14721 from dwilsoncaf/bug-950800
Bug 950800 - Add hardware composer setting, r=kaze
========
https://hg.mozilla.org/integration/gaia-central/rev/75c4248062fe
Author: Diego Wilson <dwilson@codeaurora.org>
Desc: Bug 950800 - Add hardware composer setting
Now you can toggle the hardware composer on/off at any point without
restarting B2G.
2013-12-20 13:20:50 -08:00
6557415bc9
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/5b8b38c8dab9
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #13297 from gaye/bug-918303
Bug 918303 - Quick advance through emails
========
https://hg.mozilla.org/integration/gaia-central/rev/2f7e8abb7498
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 918303 - Quick advance through emails
2013-12-20 13:20:26 -08:00
4a1fbf06b0
Bug 878935 followup - touch CLOBBER file to clean up bustage
2013-12-20 07:58:12 -08:00
40c57cd5b3
Bug 952324 - Don't block native events for more than 50ms [r=jimm]
2013-12-20 07:51:13 -08:00
d041e15611
merge m-c to elm
2013-12-20 15:05:28 +01:00
8ba68170dd
Backed out changeset 70befb4cf2f4 (bug 878935) for mochitest -4 and bc test failures
2013-12-20 12:42:54 +01:00
fdd77494b2
Backed out changeset b84baa03b9d1 (bug 868341) for mochitest -4 and bc testfailures
2013-12-20 12:42:16 +01:00
d59f4da0fb
merge b2g-inbound to mozilla-central
2013-12-20 10:23:46 +01:00
76b3c9c6c0
merge fx-team to mozilla-central
2013-12-20 10:22:29 +01:00
d1658ac407
Bug 949695 tests followup - fix test_handleSyncError to reset error account so it passes when run twice
2013-12-20 15:57:26 +11:00
bd3b67b4ff
Bug 949695 tests followup - convert more tests to run with both identity managers.
2013-12-20 15:57:26 +11:00
6d992cc467
Bug 949695 tests followup - convert test_service_wipeServer to identity_test infrastructure
2013-12-20 15:57:26 +11:00
d2933b41f3
Bug 949695 tests followup - Add ability to run tests twice - once with each identity manager - and have test_service_startOver use it.
2013-12-20 15:57:26 +11:00
a1683f8a40
Bug 949259 followup - refactor identity config for tests and remove need to pass params to BrowserIDManager.
2013-12-20 15:57:26 +11:00
ac310565e0
Bug 949695 followup - add resetCredentials/resetSyncKey to avoid BrowserID setters from being called.
2013-12-20 15:57:25 +11:00
3fa148f89a
Bug 952073. Fix codegen to actually work correctly for the case of a nullable union dictionary member with no default value. r=dzbarsky
...
This fix just makes us take the normal Optional codepath for this case, since there is no weirdness here.
2013-12-19 23:30:38 -05:00
fbaa80f98d
Bug 952270 - Null check result of GetPathForLengthOrPositionMeasuring in nsSVGTextFrame2::GetTextPath. r=longsonr
2013-12-20 15:26:28 +11:00
04b251c4ba
Merge m-c to b2g-inbound
2013-12-19 19:52:38 -08:00
15a0fdcdfd
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6c2b33c8f522
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #14487 from cctuan/945553
Bug 945553 - Rewrite install-gaia.py to install-gaia.js
========
https://hg.mozilla.org/integration/gaia-central/rev/ffad73493158
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 945553 - Rewrite install-gaia.py to install-gaia.js
2013-12-19 19:51:24 -08:00
b27e63c236
Merge m-c to inbound
2013-12-19 19:51:23 -08:00
5893105125
Backed out changeset 4330724d9e05 (bug 940811) for breaking builds
2013-12-19 19:46:54 -08:00
3053bbf32b
Backed out changeset 2e2c930a960c (bug 948269) for android 4.0 mochitest-2 permaorange
2013-12-19 19:24:42 -08:00
accd5a8842
Backed out changeset 1035869d1819 (bug 950452) for jit-test failures
2013-12-19 19:19:23 -08:00
56d9fc8c65
Merge fx-team to m-c
2013-12-19 19:09:04 -08:00
17d5f1239d
Bug 932145 - Mochitest support for Keyboard/IME API. r=fabrice
2013-12-20 11:05:52 +08:00
3f7a546e4f
Merge inbound to m-c
2013-12-19 18:58:45 -08:00
21ba126db6
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/958f5e5dff3d
Author: dwi2 <dwi2@dwi2.com>
Desc: Merge pull request #14797 from dwi2/bug937561
Bug 937561 - get both available network list and known network list, and...
========
https://hg.mozilla.org/integration/gaia-central/rev/19311815168b
Author: tzhuang <tzhuang@mozilla.com>
Desc: Bug 937561 - get both available network list and known network list, and make union of them to present to settings app
2013-12-19 18:50:23 -08:00
bdc10edc8a
Bug 631842 (part 2b) - Fix a mis-handling of platform-specific suppression files in |mach valgrind-test|. r=me.
...
--HG--
extra : rebase_source : 7a8a33d9db10ed47cf273358d99b6da874b48137
2013-12-19 17:33:34 -08:00
db15b39861
Merge b2g-inbound to m-c
2013-12-19 17:34:10 -08:00
53f340cae0
Bug 951895 - Hook up SpecialPowers messagemanager correctly for B2G, r=ahal
2013-12-19 17:04:20 -08:00
23a675daa4
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/1ec948d93704
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #14903 from cctuan/952497
Bug 952497 - getPid in the rewritten install-gaia.js writes to a constant file name
========
https://hg.mozilla.org/integration/gaia-central/rev/a63a9d5734bc
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 952497 - getPid in the rewritten install-gaia.js writes to a constant file name
2013-12-20 12:57:28 -08:00
c1eec87bdc
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
Truncated some number of revisions since the previous bump.
========
https://hg.mozilla.org/integration/gaia-central/rev/cd3fccdb793b
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #14905 from gaye/bug-952553
Revert "Merge pull request #14659 from gasolin/issue-950080"
========
https://hg.mozilla.org/integration/gaia-central/rev/575982414753
Author: Gareth Aye <gaye@mozilla.com>
Desc: Revert "Merge pull request #14659 from gasolin/issue-950080"
This reverts commit 5028d298c3be4effa75147703b3148883982038e, reversing
changes made to 0ef52554acf8cc115e40a95b2eab0117df3dff45.
2013-12-20 12:57:05 -08:00
6051f9a3bf
Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0be4f9d5fa72
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #14854 from KevinGrandon/bug_952097_rocketbar_add_cancel_button
Bug 952097 - [Rocketbar] Add cancel button r=vingtetun
========
https://hg.mozilla.org/integration/gaia-central/rev/043210e5adeb
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 952097 - [Rocketbar] Add cancel button r=vingtetun
========
https://hg.mozilla.org/integration/gaia-central/rev/1625ccbbd682
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #14506 from gnarf/941976
Bug 941976 - [B2G][SMS] SMS messages with more than one phone number are treated as a single phone number
========
https://hg.mozilla.org/integration/gaia-central/rev/eec7207b4eab
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 941976 - [B2G][SMS] SMS messages with more than one phone number are treated as a single phone number - r=julienw
2013-12-19 15:50:24 -08:00
b19e3916c0
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/fa9644133018
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #14784 from nullaus/bug949286-net-error
bug 949286
========
https://hg.mozilla.org/integration/gaia-central/rev/56dea66daf4f
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 949286
-Handle dnsNotFound as well as netOffline errors in net_error.html/.js.
2013-12-19 15:40:25 -08:00
10c4da16db
Update debugger tests for new JSON.parse syntax error message format. Followup to bug 507998, r=yetmoreorangesigh
...
--HG--
extra : rebase_source : 9e4009922085b67d2ca7f8e92c7ec269c7446924
2013-12-19 18:26:26 -05:00
4f541a11b7
Merge m-c to s-c.
2013-12-19 15:23:37 -08:00
ec2de40ee6
Bug 950564 ComplexTextInputPanel should be positioned to bottom-left of the focused plugin feedback=emk, r=smichaud
2013-12-20 08:19:17 +09:00
511353a442
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a8dd09a5d33e
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #14858 from vingtetun/bug951298
Bug 951298 - placing 5 icons in the dock and then going in and out of ed...
========
https://hg.mozilla.org/integration/gaia-central/rev/bf9c38e98f08
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 951298 - placing 5 icons in the dock and then going in and out of edit mode on the homescreen will chop the 5th icon. r=crdlc
2013-12-19 15:00:25 -08:00
c55ae6084f
Bug 947501 - Uplift Addon SDK to Firefox
2013-12-19 14:50:18 -08:00
e55de8109a
Bug 862805 - API to allow add-ons to register custom lists on about:home. r=wesj
2013-12-19 14:51:10 -08:00
Wes Kocher
Tim Taubert
Gaia Pushbot
Sriram Ramasubramanian
Jim Chen
Mark Finkle
Matt Brubeck
Carsten "Tomcat" Book
Mark Hammond
Boris Zbarsky
Cameron McCormack
Yuan Xulei
Nicholas Nethercote
Jonathan Griffin
Jeff Walden
Richard Newman
Masayuki Nakano
Erik Vold
Margaret Leibovic