Ed Morley
bee9f64a49
Merge mozilla-central and birch
2013-07-16 10:02:38 +01:00
Ed Morley
a178dd5cec
Merge latest green birch changeset and mozilla-central
2013-07-16 09:59:15 +01:00
Gaia Pushbot
0bc03df0ff
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a391d9b3c4c3
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10994 from alivedise/bugzilla/894230/apploadtime-event-listener-target-wrong
Bug 894230 - Use iframe as target of appopen event instead of frame, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/ced34e12bfa3
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 894230 - Use iframe as target of appopen event instead of frame
2013-07-15 23:50:26 -07:00
Gaia Pushbot
02946a7ae6
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/01102911f85a
Author: Salvador de la Puente González <salva@unoyunodiez.com>
Desc: Merge pull request #10831 from lodr/bug-830272-validate-0-threshold
Bug 830272 - Adding constrains to avoid negative or zero values in balance threshold
r=arcturus
========
https://hg.mozilla.org/integration/gaia-central/rev/87957b8f402b
Author: lodr <salva@unoyunodiez.com>
Desc: Bug 830272 - Adding constrains to avoid negative or zero values in balance threshold
2013-07-15 22:25:23 -07:00
Gaia Pushbot
c63c8dbdf4
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/280fbd71cae2
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10991 from jlebar/gaia-event-listener-leak
Bug 894081 - (Try to) fix a leak in Gaia by registering its mozbrowserer...r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/28d668d770e5
Author: Justin Lebar <justin.lebar@gmail.com>
Desc: Bug 894135 - Don't leak |homescreenFrame| from within window_manager.js's apploaded closure.
========
https://hg.mozilla.org/integration/gaia-central/rev/b868997dbf0e
Author: Justin Lebar <justin.lebar@gmail.com>
Desc: Bug 894081 - (Try to) fix a leak in Gaia by registering its mozbrowsererror listener on the mozbrowser iframe itself, rather than on one of the iframe's parent nodes.
2013-07-15 20:20:23 -07:00
Gaia Pushbot
b06530a4a3
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/37d94f0bacee
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 891277 - Update Usage assets, r=me
2013-07-15 20:10:23 -07:00
Gaia Pushbot
ecc5b02111
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ae6bd540e71a
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #9326 from pauljt/bug863527_v2
Bug 863527 -- Safer html injection in app error, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/d5bc2ff16c0c
Author: Paul Theriault <ptheriault@mozilla.com>
Desc: fix bug 863527 by updating test instead of parsing untrusted input
2013-07-15 20:00:22 -07:00
Gaia Pushbot
c73305288f
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/82dbf4bd629a
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #10965 from huchengtw-moz/video/Bug_891929_remove_youtube_protocol_hack
Bug 891929 - Remove youtube protocol hack per landing of bug 887454, r=daleharvey
========
https://hg.mozilla.org/integration/gaia-central/rev/fac6cfa9692b
Author: John Hu <johu@mozilla.com>
Desc: Bug 891929 - Remove youtube protocol hack per landing of bug 887454
2013-07-15 19:15:23 -07:00
Gaia Pushbot
8dabd8294c
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9b3ffbd7fe9f
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #10970 from evanxd/bug-893694
Bug 893694 - [Calendar] Update the 1.5x version of images for Calendar App
========
https://hg.mozilla.org/integration/gaia-central/rev/3b60d2882d1b
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 893694 - Update the 1.5x version of images.
2013-07-15 19:00:25 -07:00
Gaia Pushbot
889c2d36d7
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/911756823e45
Author: John Ford <john@johnford.info>
Desc: Merge pull request #10932 from brendandahl/pdfjs-v0.8.326
Bug 892721 - Update gaia pdf.js to version 0.8.326.
========
https://hg.mozilla.org/integration/gaia-central/rev/4631d9e630a8
Author: Brendan Dahl <brendan.dahl@gmail.com>
Desc: Bug 892721 - Update gaia pdf.js to version 0.8.326.
2013-07-15 17:45:23 -07:00
Gaia Pushbot
2bc93784ca
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/846f8e708936
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #10983 from gaye/bug-889396
Bug 889396 - Sync button went away r=lightsofapollo
========
https://hg.mozilla.org/integration/gaia-central/rev/87f21415dc13
Author: gaye <gaye@mozilla.com>
Desc: Bug 889396 - Sync button went away
2013-07-15 13:15:23 -07:00
Gaia Pushbot
f7cc635d24
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d266560b990b
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #10990 from jonallengriffin/disablebusytime
Bug 893248 - Disable busytime_test.js for near perma-orange in TBPL, a=t...
========
https://hg.mozilla.org/integration/gaia-central/rev/f42afb0f2a73
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Bug 893248 - Disable busytime_test.js for near perma-orange in TBPL, a=test-only
2013-07-15 12:55:23 -07:00
Gaia Pushbot
3d8074e01e
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9a8405332100
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Merge pull request #10988 from jonallengriffin/disablegridtest
Bug 892658 - Disable grid_test.js in TBPL for very frequent orange, a=te...
========
https://hg.mozilla.org/integration/gaia-central/rev/56e5813a8ab9
Author: Jonathan Griffin <jgriffin@mozilla.com>
Desc: Bug 892658 - Disable grid_test.js in TBPL for very frequent orange, a=test-only
2013-07-15 12:30:23 -07:00
Gaia Pushbot
7492d1f849
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e44b13b6a7b0
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #10939 from RudyLu/homescreen/4x5grid_onWVGA_support
Bug 881149 - hdpi/xhdpi resolution layout for Homescreen app. r=crdlc.
========
https://hg.mozilla.org/integration/gaia-central/rev/5dbcf6c990dd
Author: Rudy Lu <left.lu@gmail.com>
Desc: Bug 881149 - hdpi/xhdpi resolution layout for Homescreen app
1. adjust to show 4 x 5 grid on WVGA.
2. modify the scale ratio of app icon according to
window.devicePixelRatio.
==============
1. To address review comment, for reset the hidden of the 17th icon
2. Add 1.5x graphics (not complete, some assets are still missing)
2013-07-15 11:35:23 -07:00
Gaia Pushbot
31a1d4120d
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/686f7e5027bd
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #10930 from eeejay/lockscreen-elastic-fix
Bug 892649 - Make sure elastic is never played when screen reader is enabled r=kgrandon
========
https://hg.mozilla.org/integration/gaia-central/rev/024a08abc7cd
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 892649 - Make sure elastic is never played when screen reader is enabled.
2013-07-15 10:30:22 -07:00
Gaia Pushbot
a510aac23a
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/77058600c39f
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 891908 - [MMS] Replacing an attachment with a large image should trigger resizing - r=schung
* Ensure that image resizing is triggered whenever an image is added (even via replace)
2013-07-15 10:15:24 -07:00
Gaia Pushbot
4c2f92b3c1
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/02b50e5b3ca8
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 892480 - [SMS] Sending two phone numbers separed by space or enter should detect two phone numbers - r=arcturus
* Shorten the greediness of the match to not accept as many numbers
* Added a check to ensure that the character after the match is not a digit
* Only allow space and tab as separators in phone numbers
2013-07-15 09:55:22 -07:00
Gaia Pushbot
78aa8446de
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c61d272d29ae
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #10871 from KevinGrandon/bug_882346_add_date_time_mappings_for_now
Bug 882346 - Add date time mappings for now r=vingtetun,lightsofapollo
========
https://hg.mozilla.org/integration/gaia-central/rev/8515ff8e847a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 882346 - Add dom.experimental_forms pref
2013-07-15 09:00:23 -07:00
Gaia Pushbot
cb9df13764
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3451c5dbd0bf
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #10951 from KevinGrandon/bug_893188_fix_system_messages
Bug 893188 - Update system message manager r=vingtetun
========
https://hg.mozilla.org/integration/gaia-central/rev/d5d6294ffcef
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 893188 - Update system message manager
2013-07-15 08:50:22 -07:00
Gaia Pushbot
15387d1777
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ba45890684e4
Author: Dale Harvey <dale@arandomurl.com>
Desc: Merge pull request #10945 from dominickuo/bug-889739
Bug 889739 - [gallery] Enable the done button after the picked image is. r=daleharvey
========
https://hg.mozilla.org/integration/gaia-central/rev/551d17f156a2
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 889739 - [gallery] Enable the done button after the picked image is loaded
2013-07-15 07:40:25 -07:00
Gaia Pushbot
7dfe369ada
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8d0f8afa3650
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #10966 from crdlc/bug-890811
Bug 890811 - SIM import needs to support canceling
========
https://hg.mozilla.org/integration/gaia-central/rev/068a73311596
Author: crdlc <crdlc@tid.es>
Desc: Bug 890811 - SIM import needs to support canceling
2013-07-15 05:50:22 -07:00
Gaia Pushbot
f03927f663
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a9de5769866d
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10909 from leob2g/Bug_890448_wrong_info_is_shown_when_receiving_second_call
Bug 890448 - [Dialer] When receiving second call that has withheld number, shows contact information (not withheld number token) r=etienne, a=leo+
========
https://hg.mozilla.org/integration/gaia-central/rev/e7a9586e0ec9
Author: sungwoo.yoon <sungwoo.yoon@lge.com>
Desc: Bug 890448 - [Dialer] When receiving second call that has withheld number, shows contact information (not withheld number token)
2013-07-15 04:00:23 -07:00
Gaia Pushbot
ef4f5217f2
Bumping gaia.json for 8 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/007f168bd8ec
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10969 from crh0716/893693
Bug 893693 - Add removeEventListener funtion to IccHelper r=echen
========
https://hg.mozilla.org/integration/gaia-central/rev/b51cca845416
Author: crh0716 <crh0716@gmail.com>
Desc: Bug 893693 - Add removeEventListener funtion to IccHelper
========
https://hg.mozilla.org/integration/gaia-central/rev/86dd4fe57bbc
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #10920 from comoyo/fix_settings_b2gdesk
Bug 796623 - Settings throw error in B2G desktop. r=arthurcc
========
https://hg.mozilla.org/integration/gaia-central/rev/e6434ee1a344
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 796623 - Settings throw error in B2G desktop
========
https://hg.mozilla.org/integration/gaia-central/rev/ea4a47341f08
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #10816 from cctuan/889757
Bug 889757 - [Dialer] When holding a call and selecting keypad, cannot hide keypad and input number
========
https://hg.mozilla.org/integration/gaia-central/rev/a2cbb3a6ed3d
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 889757 - [Dialer] When holding a call and selecting keypad, cannot hide keypad and input number
========
https://hg.mozilla.org/integration/gaia-central/rev/8306f751be94
Author: Francisco Borja Salguero Castellano <fbsc@tid.es>
Desc: Merge pull request #10771 from rwldrn/888150
Bug 888150 - [MMS][Regression] Header actions are not working properly.
========
https://hg.mozilla.org/integration/gaia-central/rev/ad7b307bc892
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 888150 - [MMS][Regression] Header actions are not working properly.
- STR1 Fixed
- STR2 Cannot Reproduce (https://www.dropbox.com/sh/3lr5a5kepnns8z1/rydxqmpucg )
- STR3 Fixed
- Fixes broken activity handling introduced here: 8b41ee9a80 (L2R227)
includes tests.
https://bugzilla.mozilla.org/show_bug.cgi?id=888150
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-07-15 03:45:23 -07:00
Gaia Pushbot
7ee084dd21
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4839476d648c
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10925 from masap/20130711
Bug 892434 - [WiFi] Fix Showing gone network r=arthurcc
========
https://hg.mozilla.org/integration/gaia-central/rev/18fb5d823e8b
Author: masap <masashi.honma@gmail.com>
Desc: Bug 892434 - [WiFi] Fix Showing gone network
2013-07-15 03:25:23 -07:00
Gaia Pushbot
c08f31b05c
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a5c433a2df05
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #10942 from crdlc/bug-892357-master
Bug 892357 - Followup to bug 890454 - [Homescreen] The save-bookmark scr...
========
https://hg.mozilla.org/integration/gaia-central/rev/54cf0f6d18f5
Author: crdlc <crdlc@tid.es>
Desc: Bug 892357 - Followup to bug 890454 - [Homescreen] The save-bookmark screen does not work fine when Add to Home Screen button is pressed continuously
2013-07-15 02:30:23 -07:00
Gaia Pushbot
97cd125db5
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d717e2e751a6
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Merge pull request #10894 from crdlc/bug-890813
Bug 890813 - Memory Card import needs to support cancelling
========
https://hg.mozilla.org/integration/gaia-central/rev/5705fd11039c
Author: crdlc <crdlc@tid.es>
Desc: Bug 890813 - Memory Card import needs to support cancelling
2013-07-15 01:00:27 -07:00
Gaia Pushbot
eebc302a65
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3f5f434d1649
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #10915 from dominickuo/bug-882683
Bug 882683 - [music] check trak atom to filter iso base media files, r=mozsquib
========
https://hg.mozilla.org/integration/gaia-central/rev/e6b3a269cfc8
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 882683 - [music] check trak atom to filter iso base media files
2013-07-15 00:25:22 -07:00
Gaia Pushbot
c4a42175e1
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6054940e3ea8
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #10805 from evanxd/bug-881137-images
Bug 881137 - hdpi/xhdpi resolution assets and layout for Calendar app
========
https://hg.mozilla.org/integration/gaia-central/rev/af72bec7563d
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 881137 - Update the image files as 1.5 times bigger images.
2013-07-14 04:45:23 -07:00
Gaia Pushbot
773a70332e
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/610132b9ad9a
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #10957 from cctuan/master-gallery
Bug 893310 - hdpi/xhdpi replacing @1.5x images assets for Gallery app, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/cfcf9b8d3995
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 893310 - hdpi/xhdpi replacing @1.5x images assets for Gallery app
2013-07-13 09:50:22 -07:00
Gaia Pushbot
55a49d6dee
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9a9c7a559a26
Author: Dave Hylands <dhylands@gmail.com>
Desc: Merge pull request #10949 from dhylands/bug-893120-mochitest-perms
Bug 893120 - Fix devicestorage permissions for mochitest. r=dclarke
========
https://hg.mozilla.org/integration/gaia-central/rev/9ac658beb8a3
Author: Dave Hylands <dhylands@gmail.com>
Desc: Bug 893120 - Fix devicestorage permissions for mochitest.
2013-07-12 13:00:22 -07:00
Gaia Pushbot
6ce22518fb
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3004264248cc
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #10867 from wanderview/unit-test-script
Bug 891366: Provide unit test script and make target. r=mwu
========
https://hg.mozilla.org/integration/gaia-central/rev/304aef72c600
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 891366: Provide unit test script in gaia/bin
2013-07-12 12:30:22 -07:00
Gaia Pushbot
2ea6aded19
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/015185f797c4
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 887712 - [SMS/MMS] Make editable cursor element "zero width" until any user interaction r=gnarf
https://bugzilla.mozilla.org/show_bug.cgi?id=887712
Includes: 4880acb5ec
- Empty, out of focus placeholders contract to zero offset width
- Empty, in focus placeholders expand to rem-based width (margin: r & l, padding: r & l)
- When all recipients are deleted, don't leave empty editable in the to-field.
- When the editable placeholder is contracted to a zero offset width, it's possible to accidentally tap a recipient when the intention is to tap the to-field area around the recipient list, which will correctly prompt the user to remove the recipient. Since there is no way to unambiguously detect the user's intention, always handle "Remove" and "Cancel" in an intuitive way.
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2013-07-12 11:20:23 -07:00
Ryan VanderMeulen
2cca46b24a
Merge m-c to birch.
2013-07-12 13:31:17 -04:00
Gaia Pushbot
506f4cf670
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/93d613b62a46
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 889763 - [MMS] Only image is received when sending image + audio file from android device. Co-author with gnarf37
2013-07-12 10:15:24 -07:00
Gaia Pushbot
3d0cba7a6f
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8d2dd720cd08
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #10906 from EdgarChen/bug_877978
Bug 877978 - [Gaia] Use new WebAPI to access iccInfo related attribute/event
========
https://hg.mozilla.org/integration/gaia-central/rev/977de81e0fae
Author: Edgar Chen <echen@mozilla.com>
Desc: Bug 877978 - Use IccHelper to access iccInfo. r=alive,arthur,fcampo,salva
2013-07-12 09:30:23 -07:00
Gaia Pushbot
6e3287fc7b
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/419504104ae7
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #10869 from eeejay/highlight-fix
Explicitly set the active background of lockscreen icons to none.r=mihai
========
https://hg.mozilla.org/integration/gaia-central/rev/eddd5f65c50a
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 889925 - Explicitly set the active background of lockscreen icons to none.
2013-07-12 07:26:23 -07:00
Gaia Pushbot
802df52b5a
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d3bf1e5466f0
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #10943 from fabi1cazenave/mmsAttachmentContainers-bug889899
Bug 889899: use <div> instead of <iframe> for MMS attachment containers, r=julienw
========
https://hg.mozilla.org/integration/gaia-central/rev/662a0765f17a
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Bug 889899: use <div> instead of <iframe> for MMS attachment containers, r=julienw
Attachment containers use `<iframe>` in the SMS app because they are handy in the Compose area (work well in a contenteditable element): this ensures that attachment blocks are deletable but not editable. However, `<iframes>` are a pain to use in the message thread, and can become a performance killer on threads with lots of attachments.
This patch keeps `<iframe>` containers for draft attachments in the Compose area but relies on `<div>` containers for the message thread. To achieve this we use three templates:
* one `attachment-preview` template:
- display it in a 80x80 px placeholder (can be extended to 120x80 or 80x120);
- display the attachment size if in the Compose window;
- do not display the file name for images
(another patch will enable to display the file name on video with previews)
* one `attachment-nopreview` template: (audio, video, large images)
- display the attachment type as a 80x80 px icon (audio, video, image, other);
- display the attachment size if in the Compose window;
- display the file name, both in the Compose window and in the message thread.
* one `attachment-draft` template to embed one of the two previous templates in an `<iframe>` container for the Compose area.
Non-draft attachments are displayed in a `<div>` container. In both cases (div or iframe), the container carries an `attachment-container` class and a `preview` or `nopreview` one.
Side notes:
* this fixes bug 882094 (display attachment file names in MMS);
* the `bubbleEvents` method has been slightly re-rewritten to be more self-explanatory;
* some basic cleanup has been done on the HTML & CSS front.
2013-07-12 07:05:23 -07:00
Ryan VanderMeulen
48411f99e3
Merge m-c to inbound.
2013-07-12 09:29:59 -04:00
Gaia Pushbot
729cf67c3f
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8f402e9a5c9a
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #10934 from rexboy7/fix-bug892373-master
Bug 892373 - @1.5x asset revise for Dialer app
========
https://hg.mozilla.org/integration/gaia-central/rev/80be3e3a4c6f
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 892373 - @1.5x asset revise for Dialer app
2013-07-11 23:30:22 -07:00
Gaia Pushbot
ba448ac7a2
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/cbffb3b5e67c
Author: mozshiao9 <mshiao@mozilla.com>
Desc: Merge pull request #10933 from mozshiao9/master_settings_889717
Bug 889717 - [Settings] Do not work when you are scrolling and select a menu, r=pivanov
========
https://hg.mozilla.org/integration/gaia-central/rev/e25731e3555a
Author: Mark Shiao <mshiao@mozilla.com>
Desc: Bug 889717 - [Settings] Do not work when you are scrolling and select a menu
2013-07-11 20:50:23 -07:00
Gaia Pushbot
65eaa1f53e
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6aa0e53d6672
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #10910 from rexboy7/fixhd-881146-ftu-master
Bug 881146 - hdpi/xhdpi resolution assets and layout for FTU. r=arcturus
========
https://hg.mozilla.org/integration/gaia-central/rev/4f8fc20dae05
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 881146 - hdpi/xhdpi resolution assets and layout for First run experience app
2013-07-11 20:40:22 -07:00
Gaia Pushbot
6cdf008214
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3cf4f76cd177
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #10931 from wanderview/tag-vm-semicolon
Branch 892659: Remove misplaced ; in tag_visibility_monitor. r=eshapiro
========
https://hg.mozilla.org/integration/gaia-central/rev/cb31db9bc185
Author: Ben Kelly <ben@wanderview.com>
Desc: Branch 892659: Remove misplaced ; in tag_visibility_monitor
2013-07-11 15:30:23 -07:00
Gaia Pushbot
de1dd79ebd
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/dc051b13b2a8
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #10903 from wanderview/contacts-full-defer-order-search
Bug 892155: Fully defer order/search string calc. r=arcturus
========
https://hg.mozilla.org/integration/gaia-central/rev/67c38a9335da
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 892155: Fully defer order/search string calc
2013-07-11 10:25:25 -07:00
Gaia Pushbot
ef734d17d0
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f8a85aceda9c
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #10928 from ferjm/mmiresultdefaultcase
Follow up for MMI localization work
========
https://hg.mozilla.org/integration/gaia-central/rev/22a3cf15439a
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 890463 - Follow up of Use MMIResult for get IMEI - default case. r=etienne
========
https://hg.mozilla.org/integration/gaia-central/rev/d6ce537dafe6
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 890291 - [MMI] Follow-up of Localization of Call Barring functionality. r=etienne
2013-07-11 08:35:24 -07:00
Gaia Pushbot
1202bb1dd8
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/84f23fc83920
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #10902 from wanderview/contacts-favorites
Bug 891984: Properly render contacts in favorites. r=crdlc
========
https://hg.mozilla.org/integration/gaia-central/rev/a4b8b0b98d83
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 891984: Properly render contacts in favorites.
Previously if a contact was a favorite, then we would only render it once
in either its main letter group or the favorites group. This patch correctly
tracks the group so that we reference the contact properly in order to
render it for both groups.
2013-07-11 05:15:24 -07:00
Gaia Pushbot
547e73f881
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4301a609060f
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #10923 from comoyo/revert_swipe_to_hide
Revert "Merge pull request #10669 from RudyLu/keyboard/swipe_hide_keyboard_2"
========
https://hg.mozilla.org/integration/gaia-central/rev/55d822fcf7dc
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Revert "Merge pull request #10669 from RudyLu/keyboard/swipe_hide_keyboard_2"
This reverts commit 103f3635c241e208f84b6e8d80afb23731043c09, reversing
changes made to 4be813b65ea30e3914ce732d1401385d8fb78b68.
2013-07-11 04:15:25 -07:00
Gaia Pushbot
5ea0e467b4
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6a4adb2d6e67
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Merge pull request #10901 from comoyo/vcf4
Bug 888153 - [contacts] Import from vCard 4.0 has email missing in Contacts app
========
https://hg.mozilla.org/integration/gaia-central/rev/78a03eca481b
Author: Sergi Mansilla <sergi.mansilla@gmail.com>
Desc: Bug 888153 - [contacts] Import from vCard 4.0 has email missing in Contacts app
2013-07-11 03:20:24 -07:00
Ed Morley
dd8c578940
Merge mozilla-central and birch
2013-07-11 10:59:04 +01:00
Gaia Pushbot
ee9c50ddb1
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/3f9b2319c2b3
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10918 from crh0716/892393
Bug 892393 - Add 1.5x resolution assets r=rexboy
========
https://hg.mozilla.org/integration/gaia-central/rev/26f60f2a526d
Author: crh0716 <crh0716@gmail.com>
Desc: Bug 892393 - Add 1.5x resolution assets
========
https://hg.mozilla.org/integration/gaia-central/rev/5140f1fbba25
Author: Francisco Borja Salguero Castellano <fbsc@tid.es>
Desc: Merge pull request #10726 from julienw/885278-updatetimeheaders-with-fixedheader
885278 updatetimeheaders with fixedheader
========
https://hg.mozilla.org/integration/gaia-central/rev/8b741e315032
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 885278 - [SMS] `updateTimeHeaders' is not working properly with FixedHeader feature. r=borja
* always call refresh in updateTimeHeaders
* expose updateHeaderContent and use it in updateTimeHeaders so that the fixed
header is changed in the same time than the other headers
2013-07-11 02:50:23 -07:00
Gaia Pushbot
f2dbb8abd8
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7530f9702749
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #10694 from yurenju/885676
Bug 885676 - Added unit tests for ScreenManager r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/c9464724886c
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 885676 - Added unit tests for ScreenManager
2013-07-11 02:35:23 -07:00