[SMS] Contact search results should include "type | number" where "type" is the number's entry type eg. mobile, home, work r=julienw

Also removed "carrier" from display, as this does not appear in current spec materials.

https://bugzilla.mozilla.org/show_bug.cgi?id=872395

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 38ce0068bad14e27b42b9b3800ade592f1b9c9f4)

Conflicts:
	apps/sms/test/unit/thread_ui_test.js
Bug 874358 - [SMS] Can't create contact from SMS App r=borjasalguero

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit e2e58db18b0dbf48deb6a329965126c5c9733307)

Conflicts:
	apps/sms/test/unit/thread_ui_test.js
Bug 874496 - [MMS] [UX] Attach image, change size indicator over the image to this one - r=gnarf r=julienw

Closes gh-10047
(cherry picked from commit fe41240fc905f7fc1026e87f0e36ec7c7aba5fb3)

Conflicts:
	apps/sms/index.html
Bug 870612 - [MMS] Composer. "TO" field has a wrong shape between itself and the header - r=borjasalguero

This restores the correct CSS styles lost in the merge on Wednesday night.

https://bugzilla.mozilla.org/show_bug.cgi?id=870612

Closes bocoup/gaia#6

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 1968e92747c272f95a1adde8014966e550cc5492)

Conflicts:
	apps/sms/style/sms.css
Bug 876758 - [sms] normal messages are incorrectly considered class-0 messages when clicking the notification and the app is not running r=gnarf

We were testing the type of SMS/MMS but we don't have that information. Instead,
we know when a notification is related to a class-0 message, so let's use that
instead.
(cherry picked from commit 33abecaf661a4bb7440726c8809748368cc9af60)
Bug 873498 - [MMS] [UX] Compose. Contacts suggestion should not show the contact's photo r=julienw

- Adds a new third arg to Utils.getContactDetails to allow for inclusion of optional fields.
- Tests for thirst arg's "photoURL" option.

https://bugzilla.mozilla.org/show_bug.cgi?id=873498
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit c7f5c27137cc36f51c9da194292e1e5055675017)
Bug 873498 - Fix tests due to bad rebasing r=schung
(cherry picked from commit 9885fc228d8b1f4cac9151d3d3afb37298b2c3cb)
Merge pull request #9945 from albertopq/dialer-selected-filter

Bug 874671 - Focusing the "All" tab by default in the call log r=gtorodelvalle(cherry picked from commit 87d68fa5c9dd9afa5c1768dccb11659f86a82442)
Bug 876055 - Add defaults for the new device storage/automounter settings
(cherry picked from commit 1dd7b39de59258cce237d5ae732ecac1c3868cc5)
Bug 876003 - [MMS] Sending mms to unknown contact via activity will lose the number - r=gnarf

Closes gh-9996

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit fc32391128052b42416427cc2a2c061150210c70)
Merge pull request #10093 from dominickuo/bug-877313

Bug 877313 - [music] Remove Math.floor() on the audio duration, r=djf(cherry picked from commit 204025be379064233596eadb08f6766c029bcbbf)
Merge pull request #10120 from asutherland/email-html-attribs-sans-spaces

Bug 873702 - [Email] HTML tags containing attributes without separating/delimiting whitespace will be emitted as text by the HTML sanitizer (bleach.js). r=daleharvey(cherry picked from commit e73419a5353fedaa44bba4a03dcc6902098c250e)
Merge pull request #9641 from mcirlanaru/bug_857832

Bug 857832 - [Music] Normalize search queries for songs with accented... r=@RudyLu(cherry picked from commit 55b3f1629e0ea673b1d38b8b30274880264b7cf8)
Merge pull request #10136 from davidflanagan/bug875641

Bug 875641: update MediaDB and Gallery to handled SD card removal and sharing when there is also internal storage r=dhylands(cherry picked from commit b51af7558dd9e39da536ad77e975f3a3ab866d36)
Merge pull request #10137 from davidflanagan/bug875641-v1-train

Merge pull request #10136 from davidflanagan/bug875641
Merge pull request #10056 from davidflanagan/bug870327

Bug 870327: fix crash if sdcard is pulled while music is playing r=dkuo(cherry picked from commit e6b05b52f421c6122a31e9167cdeeb80d227d290)
Merge pull request #10138 from davidflanagan/bug870327-v1-train

Merge pull request #10056 from davidflanagan/bug870327
Merge pull request #10141 from davidflanagan/bug878326

Bug 878326: do not crash when removing sdcard during video playback. r=daleharvey(cherry picked from commit 2a14bc6bf94d8985c5ba995130a4f55135e336a4)
Merge pull request #10145 from davidflanagan/bug878326-v1-train

Merge pull request #10141 from davidflanagan/bug878326
Bug 860605 - [Email/IMAP] Initial synchronization is too conservative on time windows, especially when the folder has a small number of messages. rs=squib

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/215