Bug 910210 - Overlay.update() should accept an optional parameter to override internal counter
Merge pull request #11811 from comoyo/progress_update

Bug 910210 - Overlay.update() should accept an optional parameter to override internal counter [r=arcturus]
Revert "Merge pull request #12482 from lightsofapollo/921297"

This reverts commit 97cd1c6e3068130c0dce6fd6d12961695ffccca5, reversing
changes made to 8edfa18285f8c36fd6ed783c4e6db81c4c6e9dd0.
Merge pull request #12507 from lightsofapollo/revert-irc-notifications

Revert "Merge pull request #12482 from lightsofapollo/921297"
Bug 921297 - Really enable travis irc notifications r=me
Bug 900413: [Messages] Should detect and link 5 digit short codes in message text. - r=gnarf

- Updated minimum digits to be detected as a phone number to 5
- Ensured that when 5 digits, the number is only 5 characters without removing separators

Closes gh-12490
Merge pull request #12508 from lightsofapollo/travis-irc-notifcations-done-right

Bug 921297 - Really enable travis irc notifications r=me
Bug 919962 - [MMS] Converting to text layout when sending a MMS r=gnarf

We now display the banner in an asynchronous way therefore the previous way to
hide the banner synchronously didn't work.

This patch changes the logic then: instead of hiding the banner after displaying
it, it now prevents the banner from being displayed at all.
Merge pull request #12514 from julienw/919962-dont-show-sms-conversion-banner-after-send

Bug 919962 - [MMS] Converting to text layout when sending a MMS r=gnarf
Bug 913994 - [Messages] When sending SMS to a number included in a SMS, we should load the thread after clicking on send r=gnarf

The problem was simple: we were not resetting inThread when handling the #new
hash.
Merge pull request #12515 from julienw/913994-conversation-not-shown-after-sending-sometimes

Bug 913994 - [Messages] When sending SMS to a number included in a SMS, ...
Merge branch 'master' into Add-uitest-mozId