Commit Graph

1326 Commits

Author SHA1 Message Date
Ed Morley
21c1b092f8 Merge latest green inbound changeset and mozilla-central 2013-06-21 15:39:27 +01:00
Gaia Pushbot
c6b753cd80 Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/dfeb3d9b3ca4
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #10157 from evanxd/bug-870756

Bug 870756 - [SMS] No Notification sound when SMS class 0(popup) is recived

========

https://hg.mozilla.org/integration/gaia-central/rev/f9bff0502b45
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 870756 - Play ring tone when receive class-0 type message.

========

https://hg.mozilla.org/integration/gaia-central/rev/bf673376d353
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #10100 from evanxd/bug-864555

Bug 864555 -  - [Dialer] [Regional] Display the voice mail label when calling to the VM service and the VM is not stored on the SIM

========

https://hg.mozilla.org/integration/gaia-central/rev/c2ae5f66912d
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 864555 - Show the voicemail label.
2013-06-20 21:40:22 -07:00
Gaia Pushbot
1f9265f86e Bumping gaia.json for 3 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/f2c6443ee65f
Author: mozshiao9 <mshiao@mozilla.com>
Desc: Merge pull request #10482 from mozshiao9/master_camera_881218

Bug 881218 - [Camera] Record of deleted videos are not updated in camera filmstrip, r=@dominickuo

========

https://hg.mozilla.org/integration/gaia-central/rev/47a337048b91
Author: Mark Shiao <mshiao@mozilla.com>
Desc: gallery and camera already listening to poster deletion, removing listeners

========

https://hg.mozilla.org/integration/gaia-central/rev/ce35bb96f862
Author: Mark Shiao <mshiao@mozilla.com>
Desc: Bug 881218 - [Camera] Record of deleted videos are not updated in camera filmstrip
2013-06-20 21:06:23 -07:00
Gaia Pushbot
62ad245de3 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/624e8a418591
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #10510 from daleharvey/813363

Bug 813363 - Ensure loading state is correctly displayed on newly displa... r=benfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/2bf2cfea6b74
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 813363 - Ensure loading state is correctly displayed on newly displayed tabs
2013-06-20 12:31:27 -07:00
Gaia Pushbot
324c8a5800 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/ca4ff544cabf
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #10508 from daleharvey/817829

Bug 817829 - Remove misplaced background highlight on awesomescreen r=benfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/fc62288e6d0f
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 817829 - Remove misplaced background highlight on awesomescreen
2013-06-20 12:16:23 -07:00
Aki Sasaki
5252bbb876 bug 885407 - add hamachi m-c builds. r=catlee 2013-06-20 11:33:33 -07:00
Aki Sasaki
fc0ae2e634 bug 885408 - add leo m-c builds. r=catlee 2013-06-20 11:33:24 -07:00
Gaia Pushbot
be5965ab93 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/f77cc11f08f7
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #10507 from daleharvey/806173

Bug 806173 - Dont show url button when there is no input r=benfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/c9d8cc55a086
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 806173 - Dont show url button when there is no input
2013-06-20 11:31:23 -07:00
Gaia Pushbot
8305bf2b92 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/3ca4f566c83b
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #10506 from fabi1cazenave/simpleLocalize-bug882591

Bug 882591 - l10n.js should expose an asynchronous `localize()' method, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/0e74446a9eec
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Bug 882591 - l10n.js should expose an asynchronous `localize()' method
2013-06-20 10:46:22 -07:00
Gaia Pushbot
04dec646db Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/69f220a0382b
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #10489 from jmcanterafonseca/custom_urls_services

Bug 883510 - Partner customization should be able to set Facebook OAuth ...

========

https://hg.mozilla.org/integration/gaia-central/rev/660b952ff131
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 883510 - Partner customization should be able to set Facebook OAuth 2 callback url completely
2013-06-20 09:46:22 -07:00
Gaia Pushbot
bfadad922f Bumping gaia.json for 3 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/8d9ae370cf54
Author: Chris AtLee <catlee@mozilla.com>
Desc: Bug 852321: Update xulrunner SDK to reduce download time. r=ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/d4c0b3a4c08a
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #10446 from JonHylands/jhylands-876736-mms-reference-workloads-master

Bug 876736 - Added MMS reference workloads
r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/9dc7e2327fcb
Author: Jon Hylands <jhylands@mozilla.com>
Desc: Bug 876736 - Added MMS reference workloads
2013-06-20 09:41:51 -07:00
Gaia Pushbot
1438876f5c Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/584f9cc51085
Author: Dale  Harvey <dale@arandomurl.com>
Desc: Merge pull request #10473 from mschwart/bug884486

Bug 884486 Stored MCC matches nsIDOMMozMobileNetworkInfo r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/9b626d749003
Author: Michael Schwartz <mschwart@codeaurora.org>
Desc: Bug 884486 Stored MCC matches nsIDOMMozMobileNetworkInfo r=daleharvey

Bug 828307 changed the type of the MCC in nsIDOMMozMobileNetworkInfo to
string.  Stored MCC values must also be of type string.

Change-Id: Idf861d2a372ffa4e428d9af3aa6439337a516e40
2013-06-20 04:01:22 -07:00
Gaia Pushbot
75bf1603da Bumping gaia.json for 3 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/01bc4b1acdc6
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10455 from alivedise/bugzilla/796369_master/software-button-manager

Bug 796369 - Software button manager, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/2e03df383784
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Merge branch 'master' of https://github.com/mozilla-b2g/gaia into bugzilla/796369_master/software-button-manager

Conflicts:
	apps/settings/index.html

========

https://hg.mozilla.org/integration/gaia-central/rev/f6b96ed42120
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 796369 - Software button manager
2013-06-20 03:46:22 -07:00
Gaia Pushbot
6a19df4544 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/13abe6c60a2b
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #10398 from pivanov/bug-865155

Bug 865155 - Email divider lines are incorrect. They should have a 15 pixel gap at both ends to match system. | Follow up patch r=@samjoch

========

https://hg.mozilla.org/integration/gaia-central/rev/8d0be4b49fab
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 865155 - Email divider lines are incorrect. They should have a 15 pixel gap at both ends to match system. | Follow up patch
2013-06-20 03:01:23 -07:00
Gaia Pushbot
2195f505bb Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/510a2b53de76
Author: mozshiao9 <mshiao@mozilla.com>
Desc: Merge pull request #10483 from mozshiao9/master_fm_876265

Bug 876265 - One FM test fails on TBPL, r=pinzhang

========

https://hg.mozilla.org/integration/gaia-central/rev/7a1adb90e971
Author: Mark Shiao <mshiao@mozilla.com>
Desc: Bug 876265 - One FM test fails on TBPL
2013-06-20 01:01:22 -07:00
Gaia Pushbot
1e989cdb92 Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/344bc62a70a6
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #10479 from yurenju/hidpi

Bug 881127 - Used GAIA_DEV_PIXELS_PRE_PX instead of HIDPI r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/d06788f435b3
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 881127 - Used GAIA_DEV_PIXELS_PRE_PX instead of HIDPI r=timdream

========

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

Bug 869383 - Remove extra colon

========

https://hg.mozilla.org/integration/gaia-central/rev/29be2fbdb4f2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 869383 - Remove extra colon
2013-06-20 00:16:23 -07:00
Gaia Pushbot
b8980f9b86 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/47331f01247d
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #10128 from ian-liu/bluetooth/Bug832368_revise_title_for_device_selector_dialog

Bug 832368 - Dialog to pick bluetooth file-transfer recipient is really vague. 'Choose your option | [Cancel][OK]', r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/06b5278359f7
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 832368 - Dialog to pick bluetooth file-transfer recipient is really vague. 'Choose your option | [Cancel][OK]'
2013-06-19 20:16:22 -07:00
Bill McCloskey
92baec2902 Bug 871005 - Add a pref for GC decommit threshold (r=gregor) 2013-06-20 18:06:53 -07:00
Ryan VanderMeulen
aa4e313f71 Merge m-c and inbound. 2013-06-20 19:26:38 -04:00
Aki Sasaki
9f4d820349 bug 882691 - inari configs. r=catlee
--HG--
extra : rebase_source : 131685c868a93281ccbd0c21d34112927be96eff
2013-06-19 11:51:42 -07:00
Gaia Pushbot
eff18e5198 Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/393b5209f9bc
Author: John Hu <johu@mozilla.com>
Desc: Bug 878735 - [SMS / MMS] entering new message screen not rendering correctly when accessed via contacts app - r=gnarf

Closes gh-10204
2013-06-19 11:46:22 -07:00
Gaia Pushbot
469dade4cf Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d56d449c7476
Author: Mike Pennisi <mike@mikepennisi.com>
Desc: Bug 883813 - [SMS][Translation][Spanish][Portugues] Some tokens are not translated r=julienw

In order to support a variable width of the "To:" field in the
Recipients section, some restructuring is necessary.
2013-06-19 10:16:22 -07:00
Gaia Pushbot
864b6f9c22 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/75423c872bf4
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #10486 from Rik/deleted-files-884592

Bug 884592 - Only lint existing files in the pre-commit hook r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/a0d0d891a524
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 884592 - Only lint existing files in the pre-commit hook
2013-06-19 10:01:26 -07:00
Gaia Pushbot
28236ba98b Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/feed41b8b879
Author: Dale  Harvey <dale@arandomurl.com>
Desc: Merge pull request #10475 from cctuan/863932

Bug 863932 - [B2G][Leo][Lockscreen][Camera] Camera does not work from lockscreen. r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/f6aed694c314
Author: gduan <gduan@mozilla.com>
Desc: Bug 863932 - [B2G][Leo][Lockscreen][Camera] Camera does not work from lockscreen with passcode
2013-06-19 09:46:23 -07:00
Gaia Pushbot
94c2d80119 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/50fddaae85a2
Author: Michael Wu <mwu@mozilla.com>
Desc: Merge pull request #10406 from michaelwu/bug-871501

Bug 871501 - Make zip file generation consistent

========

https://hg.mozilla.org/integration/gaia-central/rev/6c5016942202
Author: Michael Wu <mwu@mozilla.com>
Desc: Bug 871501 - Make zip file generation consistent
2013-06-19 09:31:24 -07:00
Gaia Pushbot
ed2b3698e9 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/b87eb11393b9
Author: ochameau <poirot.alex@gmail.com>
Desc: Merge pull request #10440 from ochameau/touch-scroll

Bug 883834 - Touch events position is wrong on desktop when a DOM element is scrollable r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/a5fa8b409586
Author: Alexandre Poirot <poirot.alex@gmail.com>
Desc: Bug 883834 - Touch events position is wrong on desktop when a DOM element is scrollable
2013-06-19 08:16:21 -07:00
Gaia Pushbot
83d64cc0fb Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/0b5b9a1ad7c1
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #10458 from Rik/disable-travis

Bug 884217 - Disable travis on v1.1.0hd r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/dffbc85920f5
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 884217 - Disable travis on v1.1.0hd
2013-06-19 06:46:22 -07:00
Gaia Pushbot
194d7f5ec4 Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/c86fcf41322b
Author: Fernando Rodriguez Sela <frsela@tid.es>
Desc: Bug 881672 - Enabling a DUMP function for all Gaia apps, r=kaze
2013-06-19 02:46:22 -07:00
Gaia Pushbot
6200b9babe Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/4f9b96cfb0d5
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #10453 from davidflanagan/bug881239

Bug 881239: retain space or punctuation when reverting an auto-correction r=RudyLu

========

https://hg.mozilla.org/integration/gaia-central/rev/5224690b9b64
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 881239: retain space or punctuation when reverting an auto-correction
2013-06-19 01:16:24 -07:00
Joey Armstrong
1156439ca4 bug 880246: move EXTRA_PP_COMPONENTS to mozbuild (cleanup). r=mshal 2013-06-20 15:59:59 -04:00
Gaia Pushbot
8206aa3ad0 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/5b2d2e3dec75
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #10465 from elad661/gaia-keyboard-nun-sofit

Bug #884329 - Add missing Nun Sofit to the Hebrew keyboard layout. r=rudylu

========

https://hg.mozilla.org/integration/gaia-central/rev/30f5af8dea94
Author: Elad Alfassa <elad@fedoraproject.org>
Desc: Bug #884329 - [Keyboard] Add missing Nun Sofit to the Hebrew keyboard layout

For some reason we had Vav twice and no Nun Sofit.
More information: https://en.wikipedia.org/wiki/%D7%9F#Hebrew_Nun

This fixes bug #884329
2013-06-19 00:16:22 -07:00
Gaia Pushbot
4ce1fd67de Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/8e33f6f8ca04
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10454 from crh0716/883759

Bug 883759 - Hangup the waiting call when receiving CHLD=0

========

https://hg.mozilla.org/integration/gaia-central/rev/7a6445a10114
Author: crh0716 <crh0716@gmail.com>
Desc: Bug 883759 - Hangup the waiting call when receiving CHLD=0
2013-06-18 19:16:24 -07:00
Gaia Pushbot
ad5e84d080 Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/56e34384094a
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 884639 - [SMS][MMS] Fix lint error caused by bug 875408 patch

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

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-06-18 19:01:21 -07:00
Gaia Pushbot
e87f4142f4 Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/60b99121e72a
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 883058 - [SMS/MMS] One contact with very long name can be scrolled in recipient field r=gnarf

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

- Removes rule about a single contact prohibiting pull down
- Height of recipient-list itself is informative enough to determine "pullable" status
- http://en.wikipedia.org/wiki/Taumatawhakatangihangakoauauotamateapokaiwhenuakitanatahu

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-06-18 18:46:21 -07:00
Nikhil Marathe
cd6eab356e Bug 881424 - Set B2G SimplePush serverURL to Mozilla Push Server. r=jrconlin 2013-06-18 17:01:32 -07:00
Gaia Pushbot
cc00199388 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/4488e32f5bac
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #10351 from fabi1cazenave/mmsUnknownAttachments-bug875408

Bug 875408 - [MMS] Display unknown file types, r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/aeeeaa16c55d
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Bug 875408 - [MMS] Display unknown file types and corrupted attachments
2013-06-18 15:46:21 -07:00
Gaia Pushbot
9d586987f2 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/7ea9d3380972
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #10471 from masap/20130619

Bug 884565 - [WiFi] Fix WPS regression by Bug 879193, r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/cd918664a27d
Author: masap <masashi.honma@gmail.com>
Desc: Bug 884565 - [WiFi] Fix WPS regression by Bug 879193
2013-06-18 15:31:22 -07:00
Gaia Pushbot
c5c1b1c9ba Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/fc8faac21133
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #10350 from punamdahiya/Bug-838179_ShowFiles

Bug-838179 - [Music] - Show files beginning with . in the music app r=davidflanagan

========

https://hg.mozilla.org/integration/gaia-central/rev/ec12ffc1b3d1
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug-838179 - [Music] - Show files beginning with . in the music app r=davidflanagan
2013-06-18 13:16:22 -07:00
Gaia Pushbot
a7068b502c Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/f4f6162e7fb0
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 884406 - Makefile will throw an error if the test fails r=julienw
2013-06-18 11:31:22 -07:00
Gaia Pushbot
0d0f0b4cce Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/2064f98a9c27
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #10467 from Rik/unbreak-birch-884406

Bug 884406 - Check that we have a .git directory before copying r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/0ec09b86a8f8
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 884406 - Check that we have a .git directory before copying
2013-06-18 10:46:23 -07:00
Chia-hung Tai
b6b96897bf Bug 880561 - B2G MMS: Add 2 more error status (in flight mode and no sim card) when sending MMS. r=gene 2013-06-18 12:06:32 +08:00
Gaia Pushbot
b1ace63e0f Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/840b192df265
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 884050 - [SMS][MMS] Regression. New renderContact rules missed untested cases - r=gnarf

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

- Only render a contact's tel value entry for the _specified_ input value when not rendering a suggestion. If the tel record value _doesn't_ match, then continue.
- If rendering for contact search result suggestions, don't render contact tel records for values that are already selected as recipients. This comparison should be safe, as the value in this.recipients.numbers comes from the same source that current.value comes from.

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

Closes gh-10448
2013-06-18 08:46:22 -07:00
Gaia Pushbot
ad054f9cac Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/8cdfe7674f6a
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #10466 from Rik/no-multiprocess-884338

Bug 884338 - Travis no likey multiprocess :( r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/c9a5d7b78533
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 884338 - Travis no likey multiprocess :(
2013-06-18 08:37:39 -07:00
Gaia Pushbot
c025f81dfd Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/de03a5f157a7
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #10372 from Rik/pre-commit-882116

Bug 882116 - Install a pre-commit hook to run the linter tests r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/480400239f31
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 882116 - Install a pre-commit hook to run the linter tests

Also enables --multiprocess for make lint
2013-06-18 08:27:44 -07:00
Gaia Pushbot
64dc9f509f Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/e0cc4a34ba83
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #10459 from gasolin/issue-877675-2

fix regression of Bug 877675, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/a29e920f44eb
Author: gasolin <gasolin@gmail.com>
Desc: fix regression of Bug 877675
2013-06-18 08:27:21 -07:00
Gaia Pushbot
74bc8ee813 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/f845586fb561
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #10438 from airpingu/bug-880648-mms-accented-characters-part-2

Bug 880648 - [MMS] Accented characters are not correctly sent/received in a MMS (part 2, content blob must be encoded by utf-8). r=steveck-chung, a=leo+

========

https://hg.mozilla.org/integration/gaia-central/rev/687ed1aad9fa
Author: Gene Lian <airpingu@gmail.com>
Desc: Bug 880648 - [MMS] Accented characters are not correctly sent/received in a MMS (part 2, content blob must be encoded by utf-8). r=schung a=leo+
2013-06-18 08:16:42 -07:00
Gaia Pushbot
fc41e016a9 Bumping gaia.json for 2 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

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

Bug 882067 - [SMS] Unable to send SMS after opening the link from previous received thread

========

https://hg.mozilla.org/integration/gaia-central/rev/2e34f5f9fa84
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 882067 - [SMS] Unable to send SMS after opening the link from previous received thread r=borja
2013-06-18 08:16:22 -07:00
Ed Morley
524de88db8 Merge mozilla-central and birch 2013-06-18 12:05:31 +01:00
Ed Morley
a7b19f7efa Merge latest green birch changeset and mozilla-central 2013-06-18 11:57:48 +01:00
Gaia Pushbot
e3d6f30d65 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/e2c833158599
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #10340 from jaoo/882089

Bug 882089 - Automatic channel configuration for 1.1/DT PL, r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/7c2c8b41a603
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Bug 882089 - Automatic channel configuration for 1.1/DT PL (follow-up 874793)
2013-06-18 03:16:45 -07:00