Commit Graph

5729 Commits

Author SHA1 Message Date
B2G Bumper Bot
0811ac61da Bumping gaia.json for 8 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4476a9df53ab
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #17571 from RudyLu/keyboard/Bug983012_master

Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/9cade1438d30
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
disable after switching the keyboard as pinyin.
 - Remove the touchmove event listeners from the touched keys when
   switching layouts.

========

https://hg.mozilla.org/integration/gaia-central/rev/d3885fb8715c
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #17600 from zacc/bug_987847

Bug 987847 - Debug test_settings_wallpaper.py

========

https://hg.mozilla.org/integration/gaia-central/rev/19e8381a68ca
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 987847 - Resolve timing in test_settings_wallpaper.py and re-enable

========

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

Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"

========

https://hg.mozilla.org/integration/gaia-central/rev/d64c49a74f0c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"

This reverts commit 2f48cfaf3dcc1732c57dbc0706819e9359d79fce, reversing
changes made to ede2b2488f467a0b8bddf5a741e07464cd15f735.

========

https://hg.mozilla.org/integration/gaia-central/rev/e5cddba3a31a
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #17615 from gaye/backout-marionette-client-bump

Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionett...

========

https://hg.mozilla.org/integration/gaia-central/rev/a6dfca16d815
Author: Gareth Aye <gaye@mozilla.com>
Desc: Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionette_client_1_1_x"

This reverts commit d19a7fb3efa74c479be7f0b24f030e9895eb4b7a, reversing
changes made to 732a35447c7da220578fc21e10fe119c2552d662.
2014-03-25 21:21:45 -07:00
Wes Kocher
362cb153e3 Merge m-c to b2g-inbound despite the CLOSED TREE 2014-03-25 20:22:16 -07:00
Wes Kocher
0db346b4d5 Merge inbound to m-c 2014-03-25 19:54:55 -07:00
B2G Bumper Bot
a2e4f0e31b Bumping manifests a=b2g-bump 2014-03-25 13:07:32 -07:00
B2G Bumper Bot
199647e935 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1bd0f38add91
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 987133 - Unxfail and fix test_cards_view_with_two_apps.py"

This reverts commit af238e5e64057a0bbf99227cffc36bf8b37135cc.

========

https://hg.mozilla.org/integration/gaia-central/rev/3ef7be23c879
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 985498 - Disable intermittent failing test, test_homescreen_delete_app.py
2014-03-25 13:05:31 -07:00
B2G Bumper Bot
6e7c808dcd Bumping manifests a=b2g-bump 2014-03-25 12:21:13 -07:00
B2G Bumper Bot
47c001dadf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/299929cec781
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #17534 from DouglasSherk/987018-dsds-sms-focus

Bug 987018 - [DSDS] Fix focus() method calling on SIM picker to hide the keyboard. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/25c4d82d1f6e
Author: DouglasSherk <github@sherk.me>
Desc: Bug 987018 - [DSDS] Fix focus() method calling on SIM picker to hide the keyboard. r=julienw
2014-03-25 12:16:03 -07:00
B2G Bumper Bot
3767e876e7 Bumping manifests a=b2g-bump 2014-03-25 12:06:27 -07:00
B2G Bumper Bot
7b19bd1b99 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/740334658f4d
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #17544 from DouglasSherk/984793-voicemail-1

Bug 984793 - [Dialer] Strip out the 1 from the phone number when long pressing voicemail. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/3c6fa0ebf544
Author: DouglasSherk <github@sherk.me>
Desc: Bug 984793 - [Dialer] Strip out the 1 from the phone number when long pressing voicemail. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/14f1ff56e162
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 987389 - [Clock] Make time picker for timer accessible."

This reverts commit c07e2bfd66037dcb57e8981df72d6e6dd65b58b5.
2014-03-25 12:01:07 -07:00
B2G Bumper Bot
8dc0bb8c54 Bumping manifests a=b2g-bump 2014-03-25 11:56:43 -07:00
B2G Bumper Bot
2f1e1ff1a4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/318f2018b8b6
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #17564 from chirarobert/unxfail_fix_cards_view_test_master

Bug 987133 - Unxfail and fix test_cards_view_with_two_apps.py

========

https://hg.mozilla.org/integration/gaia-central/rev/f61e798a3652
Author: chirarobert <robert.chira@softvision.ro>
Desc: Bug 987133 - Unxfail and fix test_cards_view_with_two_apps.py
2014-03-25 11:50:36 -07:00
B2G Bumper Bot
bd3187016b Bumping manifests a=b2g-bump 2014-03-25 11:41:05 -07:00
B2G Bumper Bot
5ac1ce0d07 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0b1687927faa
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #17400 from eeejay/bug-986165

Bug 986165 - [keyboard] Hide button bubbles properly. r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/c638652ee12f
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 986165 - [keyboard] Hide button bubbles properly.
2014-03-25 11:35:55 -07:00
B2G Bumper Bot
ccfd58d305 Bumping manifests a=b2g-bump 2014-03-25 11:16:17 -07:00
B2G Bumper Bot
213899ac4c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ffd44471fdef
Author: gitmai <mri@tid.es>
Desc: Merge pull request #17586 from gitmai/bug-987761-jshint-fix-followup-965512

Bug 987761 - Folloup up toBug 965512 - [CostControl] jshint fixes
r=jmcf

========

https://hg.mozilla.org/integration/gaia-central/rev/bfb9fe686b5d
Author: mai <mri@tid.es>
Desc: Bug 987761 - Folloup up toBug 965512 - [CostControl] jshint fixes
2014-03-25 11:11:08 -07:00
B2G Bumper Bot
212e97503c Bumping manifests a=b2g-bump 2014-03-25 11:01:12 -07:00
B2G Bumper Bot
39c5d170f9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4c3cf4d40f5e
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #17537 from DouglasSherk/987024-contacts-bustage

Bug 987024 - [DSDS] Cache ril.xxx.defaultServiceId in MSAB to avoid IO thrashing. Fixed after being backed out in bug 980982. r=Rik, francisco

========

https://hg.mozilla.org/integration/gaia-central/rev/a022e25a73b8
Author: DouglasSherk <github@sherk.me>
Desc: Bug 987024 - [DSDS] Cache ril.xxx.defaultServiceId in MSAB to avoid IO thrashing. Fixed after being backed out in bug 980982. r=Rik, francisco
2014-03-25 10:56:08 -07:00
B2G Bumper Bot
49f0cbc025 Bumping manifests a=b2g-bump 2014-03-25 10:47:46 -07:00
B2G Bumper Bot
0634111aa3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/824714d8201a
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #17549 from eeejay/bug-987389

Bug 987389 - [Clock] Make time picker for timer accessible. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/60d178981dbb
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 987389 - [Clock] Make time picker for timer accessible.
2014-03-25 10:45:58 -07:00
B2G Bumper Bot
6ff8685c61 Bumping manifests a=b2g-bump 2014-03-25 10:36:09 -07:00
B2G Bumper Bot
4a69e23d79 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a68d91bb1d07
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 987847 - Disable intermittent failing test: test_settings_wallpaper.py

========

https://hg.mozilla.org/integration/gaia-central/rev/1ff8fe737799
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 987604 - Bump gaiatest version to 0.21.9. r=bsilverberg

========

https://hg.mozilla.org/integration/gaia-central/rev/15e0906e7c16
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #17550 from eeejay/bug-987397

Bug 987397 - [Clock] Hide timer edit dialog. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/6271176c97a2
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 987397 - [Clock] Hide timer edit dialog.

========

https://hg.mozilla.org/integration/gaia-central/rev/baa4a6b1939a
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #17320 from crdlc/bug-985132

Bug 985132 - [B2G][Homescreen]Input overlap with confirmation prompt whe...

========

https://hg.mozilla.org/integration/gaia-central/rev/64a173867c48
Author: crdlc <crdlc@tid.es>
Desc: Bug 985132 - [B2G][Homescreen]Input overlap with confirmation prompt when deleting apps from the dock
2014-03-25 10:30:57 -07:00
B2G Bumper Bot
5380841f00 Bumping manifests a=b2g-bump 2014-03-25 09:08:25 -07:00
B2G Bumper Bot
278179cf56 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/adb61c307cb9
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17447 from rnowm/986055

Bug 986055 - [VDR] Update buttons and header in BB edit mode r=pivanov

========

https://hg.mozilla.org/integration/gaia-central/rev/7f491c738353
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 986055 - [VDR] Update buttons and header in BB edit mode

========

https://hg.mozilla.org/integration/gaia-central/rev/327768736ca9
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17563 from rnowm/986433

Bug 986433 - [Messages][Refresh] Messages Inbox edit mode r=Borja

========

https://hg.mozilla.org/integration/gaia-central/rev/478ac56f4e20
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 986433 - [Messages][Refresh] Messages Inbox edit mode
2014-03-25 09:08:14 -07:00
B2G Bumper Bot
c6abbe7182 Bumping manifests a=b2g-bump 2014-03-25 08:41:08 -07:00
B2G Bumper Bot
6210ec5813 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f73bd4b45c4a
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #17535 from wanderview/contacts-canvas-cleanup-2

Bug 983885: Aggressively cleanup img/canvas in contacts. r=jmcf

========

https://hg.mozilla.org/integration/gaia-central/rev/c8f6151d9aad
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 983885: Aggressively cleanup img/canvas in contacts.
2014-03-25 08:36:00 -07:00
B2G Bumper Bot
d770fd1580 Bumping manifests a=b2g-bump 2014-03-25 08:11:05 -07:00
B2G Bumper Bot
0ae48494ad Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/186e5f04086d
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #17559 from mcav/1.3-uplift

Bug 981255 - [Sora][MMI]Alarm display abnormally when unlock screen. r=millermedeiros

========

https://hg.mozilla.org/integration/gaia-central/rev/bc46f1a1b478
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 981255 - [Sora][MMI]Alarm display abnormally when unlock screen. r=millermedeiros
2014-03-25 08:05:55 -07:00
B2G Bumper Bot
a43191c28e Bumping manifests a=b2g-bump 2014-03-25 07:57:31 -07:00
B2G Bumper Bot
d7b0a2de28 Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e358a255be79
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #17582 from vingtetun/csslint-reland-backouted-without-any-reasons-patches

Csslint reland backouted without any reasons patches

========

https://hg.mozilla.org/integration/gaia-central/rev/bce32ad90c52
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 981610 - Remove some CSS warnings on the keyboard app. r=janjongboom

========

https://hg.mozilla.org/integration/gaia-central/rev/feed1e78d313
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 981610 - Remove some CSS warnings on shared/. r=arnau

========

https://hg.mozilla.org/integration/gaia-central/rev/71b907e6535f
Author: gitmai <mri@tid.es>
Desc: Merge pull request #15833 from gitmai/bug-965512-costcontrol-jshint-fix

Bug 965512 - [CostControl] jshint fixes
r=jmcf

========

https://hg.mozilla.org/integration/gaia-central/rev/86ed2c75a00e
Author: mai <mri@tid.es>
Desc: Bug 965512 - [CostControl] jshint fixes
2014-03-25 07:55:36 -07:00
B2G Bumper Bot
fa98d0718d Bumping manifests a=b2g-bump 2014-03-25 19:31:08 -07:00
B2G Bumper Bot
413e2cba59 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/86b2389af4a4
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #17572 from steveck-chung/bug-986465

Bug 986465 - [Messaging] In list of messages to delete, contact name overlaps the photo. r=borja

========

https://hg.mozilla.org/integration/gaia-central/rev/c85b4c5c3a72
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 986465 - [Messaging] In list of messages to delete, contact name overlaps the photo
2014-03-25 19:25:56 -07:00
B2G Bumper Bot
2a27066052 Bumping manifests a=b2g-bump 2014-03-25 18:51:22 -07:00
B2G Bumper Bot
33dff078de Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/094113b3fe20
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Merge pull request #17466 from marshall/ftuPing" for breaking gaia-unit tests on TBPL

This reverts commit 732a35447c7da220578fc21e10fe119c2552d662, reversing
changes made to 2f48cfaf3dcc1732c57dbc0706819e9359d79fce.
2014-03-25 18:46:15 -07:00
B2G Bumper Bot
908282da99 Bumping manifests a=b2g-bump 2014-03-25 18:26:09 -07:00
B2G Bumper Bot
821ca41f63 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2cc445d3e8f4
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #17601 from eeejay/bug-987389

Bug 987389 - [Clock] Make time picker for timer accessible. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/0655d62e7c02
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 987389 - [Clock] Make time picker for timer accessible.
2014-03-25 18:20:59 -07:00
B2G Bumper Bot
e66b96bde0 Bumping manifests a=b2g-bump 2014-03-25 17:06:17 -07:00
B2G Bumper Bot
1e4abd36e1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b0f637d0bdb9
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #17609 from KevinGrandon/bug_985112_marionette_client_1_1_x

Bug 985112 - Fix marionette-client@1.1.x

========

https://hg.mozilla.org/integration/gaia-central/rev/c7e83b807320
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 985112 - Fix marionette-client@1.1.x
2014-03-25 17:01:11 -07:00
B2G Bumper Bot
2fcbe7e603 Bumping manifests a=b2g-bump 2014-03-25 16:27:37 -07:00
B2G Bumper Bot
3851afa51b Bumping gaia.json for 61 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ee552bd27ac8
Author: Marshall Culpepper <marshall.law@gmail.com>
Desc: Merge pull request #17466 from marshall/ftuPing

Bug 969101: Initial implementation of a first-time use ping

========

https://hg.mozilla.org/integration/gaia-central/rev/16fdd6627b0f
Author: Marshall Culpepper <marshall@mozilla.com>
Desc: Bug 969101: Initial implementation of a first-time use ping. r=fabrice

========

https://hg.mozilla.org/integration/gaia-central/rev/8a98181be088
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #17599 from dmarcos/camera-new-features-master

Camera new features master

========

https://hg.mozilla.org/integration/gaia-central/rev/a4fb26c4ca1c
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 988010: increase maxBuffer size for multilocale build tests

========

https://hg.mozilla.org/integration/gaia-central/rev/7ac861087197
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 985903 - Investigate test_camera_capture_video.TestCamera intermittent fail

========

https://hg.mozilla.org/integration/gaia-central/rev/dfaa13ab2cfe
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 987825: remove build tests for camera

========

https://hg.mozilla.org/integration/gaia-central/rev/67d8a461d3ab
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 971070: implement preview gallery for Camera app [hyunacho] r=djf,jdarcangelo

resolve merge conflicts [djf]

simplify thumbnail creation code [djf]

fix error in storage library [djf]

Fixed unit tests for Bug 971090 [jdarcangelo]
(cherry picked from commit 9ae9b275beca6f17d2f31bf638b9e384d8260376)

change event in confirm controller and cleanup in preview controller [hyunacho]
(cherry picked from commit 06bd371196c81125aa9974684a93ac9cc8d69016)

fix confirm controller test [djf]

fix review nits [djf]

when discarding state on blur in secure mode, also erase thumbnail [djf]

========

https://hg.mozilla.org/integration/gaia-central/rev/cc10092b9da6
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 985012 - [Camera][Madai] Control buttons are disabled when we change from Video mode to camera mode and take a picture

========

https://hg.mozilla.org/integration/gaia-central/rev/289dae3e1702
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985058 - [Camera] [Mozilla][UX] 1.4 Viewfinder Assets not to spec

========

https://hg.mozilla.org/integration/gaia-central/rev/360a249a7ea9
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Revert "Bug 985012 - [Camera][Madai] Control buttons are disabled when we change from Video mode to camera mode and take a picture"

This reverts commit 7e41934ab5c851f7a5ae22f89ae93db71e806a9d.

========

https://hg.mozilla.org/integration/gaia-central/rev/4edad78b0e97
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)

========

https://hg.mozilla.org/integration/gaia-central/rev/720ad454a91b
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 985012 - [Camera][Madai] Control buttons are disabled when we change from Video mode to camera mode and take a picture

========

https://hg.mozilla.org/integration/gaia-central/rev/a83dd30fa4f6
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 986217 - [Camera] Fade viewfinder on picture capture

========

https://hg.mozilla.org/integration/gaia-central/rev/8793eb51cbcf
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985092 - [Camera][Madai][Mozilla][UX] 1.4 Indicators look like buttons

========

https://hg.mozilla.org/integration/gaia-central/rev/e07d26bb6d3c
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 986849 - image pick activity displays useless mode switch button

========

https://hg.mozilla.org/integration/gaia-central/rev/31a6b0579a2e
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Revert "Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)"

This reverts commit 2a1a6ab9304cc0d9b93695b9f3ce32fe71fe5813.

========

https://hg.mozilla.org/integration/gaia-central/rev/45fcc30c9922
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)

========

https://hg.mozilla.org/integration/gaia-central/rev/6933fa00a0c3
Author: Wilson Page <wilsonpage@me.com>
Desc: Revert "Merge pull request #17280 from singhashish1887/bug984772_HDRIndicator"

This reverts commit 83242d8e2420e9c6a875150880ec421b3c5a360e, reversing
changes made to ad5a232980e427830fe272198052b858110960ba.

========

https://hg.mozilla.org/integration/gaia-central/rev/41d485015b82
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984772 - [Camera] HDR Indicator not displayed on View Finder (Screen)

========

https://hg.mozilla.org/integration/gaia-central/rev/527d23a0e9f4
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 986276 - [Camera] [Madai] Indicator should disappear when recording video

========

https://hg.mozilla.org/integration/gaia-central/rev/5cf41e31ed07
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 985662 - [Camera][Madai][Mozilla] 1.4 Video recording counter is in wrong position

========

https://hg.mozilla.org/integration/gaia-central/rev/9d53d1efe69c
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 965145 - [Camera] refactor .sensorAngle patch in bug 947956 for new camera app

========

https://hg.mozilla.org/integration/gaia-central/rev/56bc05193c89
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 978531 - [Camera][Madai] The preview is not available when reopening the camera

========

https://hg.mozilla.org/integration/gaia-central/rev/f4226d32b5b8
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 986120 - [Camera][Mozilla][Madai][UX] 1.4 Gallery Grid Icon shifts when changing orientation

========

https://hg.mozilla.org/integration/gaia-central/rev/81d57e947881
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 986266 - zoom control slider is shown on UI

========

https://hg.mozilla.org/integration/gaia-central/rev/7e786246b259
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 985077 - [Camera][Madai] Unable to take picture against dark surface with flash turned off

========

https://hg.mozilla.org/integration/gaia-central/rev/9d21cc7bfe95
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 982071 - Unusable Camera app when triggered from pick activity for file upload

========

https://hg.mozilla.org/integration/gaia-central/rev/dac8c1583824
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 985236 - [camera][madai] Zoom bar jumps on orientation

========

https://hg.mozilla.org/integration/gaia-central/rev/ff06cf2b452a
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 984616 - [Camera][Madai] Short videos don't get saved. Less than a second

========

https://hg.mozilla.org/integration/gaia-central/rev/143938cac7c8
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 984730 - Camcorder starts with flash light by default

========

https://hg.mozilla.org/integration/gaia-central/rev/9b04b86dfb6b
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 949941 - [Camera] Replace all memory-backed Blob instances with disk-backed File instances after saving to disk so "pick" activity consumers don't break. r=djf
(cherry picked from commit f23f21bc3837fa0726a97575c3efed33371751fc)

Conflicts:

	apps/camera/js/controllers/camera.js

========

https://hg.mozilla.org/integration/gaia-central/rev/55168f81af95
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 985602 - [Camera][Madai] Premature start of self-timer when taking pictures back-to-back

========

https://hg.mozilla.org/integration/gaia-central/rev/30b5b532f8b9
Author: hyuna.cho <hyuna.cho@lge.com>
Desc: bug 984719- hide gallery/thumbnail button during the recording

========

https://hg.mozilla.org/integration/gaia-central/rev/56b981190695
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 984632 - [Camera] Zoom slider too close from the capture buttons on landscape orientation

========

https://hg.mozilla.org/integration/gaia-central/rev/3d9dc2583db9
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 985016 - [B2G][Camera] Z-Index of Zoom Bar is incorrect

========

https://hg.mozilla.org/integration/gaia-central/rev/5023bc6a4868
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984764 - [camera] Beep Sounds When self-timer reaches 3~1

========

https://hg.mozilla.org/integration/gaia-central/rev/77828885dd12
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 984769 - [Camera] Self-Timer orientation change

========

https://hg.mozilla.org/integration/gaia-central/rev/f359ebfc7fe4
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 984625 - [Camera] I cannot clear the self timer

========

https://hg.mozilla.org/integration/gaia-central/rev/07117463bf6c
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976852 - [Camera] Indicator Icons On camera Preview for Important camera settings

========

https://hg.mozilla.org/integration/gaia-central/rev/50cbe7367125
Author: Wilson Page <wilsonpage@me.com>
Desc: Revert "Merge pull request #17168 from wilsonpage/bug/976852"

This reverts commit df82d12baeba31072da5aa2e4450ab9cd895e5ab, reversing
changes made to 6317b0f2902c2121703cc870018ef6683937e33d.

========

https://hg.mozilla.org/integration/gaia-central/rev/c31a36527b6b
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976852 - [Camera] Indicator Icons On camera Preview for Important camera settings

========

https://hg.mozilla.org/integration/gaia-central/rev/a2eba553ba88
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979285 - [Camera] Size the viewfinder to fill the device viewport

========

https://hg.mozilla.org/integration/gaia-central/rev/0d1369197266
Author: Wilson Page <wilsonpage@me.com>
Desc: Revert "Merge pull request #17243 from wilsonpage/bug/979285"

This reverts commit ed794d89721e1798177babd6001d57cb15754021, reversing
changes made to 2f9d1662770a2f2edf5a6dc697ab81ff48ecaa9e.

========

https://hg.mozilla.org/integration/gaia-central/rev/c27715aa7137
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979285 - [Camera] Size the viewfinder to fill the device viewport

========

https://hg.mozilla.org/integration/gaia-central/rev/91769c1d8812
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 933902 - [Camera] 1.4 Add zoom functionality

========

https://hg.mozilla.org/integration/gaia-central/rev/ae6fadd0b0d2
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 966837 - [User story] Add self-timer to camera settings

========

https://hg.mozilla.org/integration/gaia-central/rev/4f1ee15efe9b
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 983705 - [Camera][Madai][Buri] Camera Preview is not working on Qualcomm QRD device due to preview size anomalies

========

https://hg.mozilla.org/integration/gaia-central/rev/340f676403eb
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 966835 - [User story] Add HDR to camera settings

========

https://hg.mozilla.org/integration/gaia-central/rev/a65ef881ac92
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 971086 - [Camera] 1.4 Visual Design - Image Capture/ Video Buttons

========

https://hg.mozilla.org/integration/gaia-central/rev/619ff71519c5
Author: ashish.singh <ashish.singh@lge.com>
Desc: Bug 966834 - [User story] Add white balance support in camera

========

https://hg.mozilla.org/integration/gaia-central/rev/a4ff380ff12f
Author: ashish.singh <ashish.singh@lge.com>
Desc: [Camera] ISo implementation

========

https://hg.mozilla.org/integration/gaia-central/rev/2188458bbf2c
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Revert "Merge pull request #16956 from wilsonpage/bug/979285"

========

https://hg.mozilla.org/integration/gaia-central/rev/046cd653d638
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979285 - [Camera] Size the viewfinder to fill the device viewport

========

https://hg.mozilla.org/integration/gaia-central/rev/560993aaeb3a
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 979289 - [Camera] Make settings menu fullscreen

========

https://hg.mozilla.org/integration/gaia-central/rev/ab6003d28a02
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976406 - [Camera] Fade viewfinder when switching between modes

========

https://hg.mozilla.org/integration/gaia-central/rev/4719b0e51dca
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976203 - [Camera] Localization (l10n) missing from settings UI

========

https://hg.mozilla.org/integration/gaia-central/rev/2a34458a550c
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 976203 - [Camera] Localization (l10n) missing from settings UI

========

https://hg.mozilla.org/integration/gaia-central/rev/24c95526f96c
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 966839 - [Camera] Add frame grid to camera settings

========

https://hg.mozilla.org/integration/gaia-central/rev/1839e16887f1
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 980290 - [Camera] Bytes and pixels shouldn't be used interchangeably

========

https://hg.mozilla.org/integration/gaia-central/rev/87df384f5b01
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 980094 - [Camera] Moving setter and enabler methods from controls view to the view base class

========

https://hg.mozilla.org/integration/gaia-central/rev/4d64f5ea25ca
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 980599 - [Camera] Picture and video resolution selection
2014-03-25 16:26:17 -07:00
B2G Bumper Bot
5d7176970a Bumping manifests a=b2g-bump 2014-03-25 14:31:15 -07:00
B2G Bumper Bot
c0c49a5144 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d1276095f679
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #17587 from mcav/clock-timeout-master

Bug 986753 - [Tarako] Alarm Clock can get killed in the background. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/050120528940
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 986753 - [Tarako] Alarm Clock can get killed in the background and never ring.
2014-03-25 14:26:06 -07:00
B2G Bumper Bot
73e81ee398 Bumping manifests a=b2g-bump 2014-03-25 04:31:05 -07:00
B2G Bumper Bot
b9564bf5db Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/922428a1c163
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Merge pull request #17452 from fcampo/no-name-contact-header-985948

Bug 985948 - Empty title for contacts without name (r=jmcf)

========

https://hg.mozilla.org/integration/gaia-central/rev/9b977c7bf9cc
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Bug 985948 - Empty title for contacts without name

========

https://hg.mozilla.org/integration/gaia-central/rev/cbef075f1b86
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #17558 from ankit93040/963875_Service_currently_unavailable_message_provides_user_with_incorrect_information

963875_Service_Currently_unavailable_message_provides_user_with_incorrect_info. r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/363939302bcf
Author: ankit.agrawal <ankit.agrawal@lge.com>
Desc: 963875_Service_Currently_unavailable_message_provides_user_with_incorrect_info

963875_Service_Currently_Unavailable_messgae_provides_user_with_incorrect_info

========

https://hg.mozilla.org/integration/gaia-central/rev/c99cd70699e7
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17443 from rnowm/951670

Bug 951670 - Contacts list edit mode: Update layout r=gtorodelvalle

========

https://hg.mozilla.org/integration/gaia-central/rev/7b4df3b9b33e
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 951670 - Contacts list edit mode: Update layout
2014-03-25 04:25:51 -07:00
B2G Bumper Bot
1d5739931d Bumping manifests a=b2g-bump 2014-03-25 04:16:04 -07:00
B2G Bumper Bot
15d6a26a7c Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e5b0b435aed0
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Merge pull request #17419 from shamenchens/Bug934169-Permission-MoreInfo

Bug 934169 - Permission dialog more info/hide info, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/c078f5ba03df
Author: Sherman Chen <shamen.chens@gmail.com>
Desc: Bug 934169 - Permission dialog more info/hide info

========

https://hg.mozilla.org/integration/gaia-central/rev/213ffe108e72
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #17555 from shamenchens/Bug984834-Video-Playback

Bug984834 Video Playback workaround patch, r=johnhu

========

https://hg.mozilla.org/integration/gaia-central/rev/255870dde9b5
Author: Sherman Chen <shamen.chens@gmail.com>
Desc: Bug984834 Video Playback workaround patch
2014-03-25 04:10:47 -07:00
B2G Bumper Bot
a9ff30c3e9 Bumping manifests a=b2g-bump 2014-03-25 04:02:25 -07:00
B2G Bumper Bot
cfa05f962e Bumping manifests a=b2g-bump 2014-03-25 03:41:08 -07:00
B2G Bumper Bot
4fd36b2ff0 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/179e560ab4c5
Author: EragonJ <eragonj@eragonj.me>
Desc: Revert "Merge pull request #17518 from EragonJ/bug-960861-fix"

This reverts commit 13b00e279ebe5784772c763f730a277fd85f26e4, reversing
changes made to 80af23f8c74d9d2e9388d8ed3c204040b5c528ec.
2014-03-25 03:36:00 -07:00
B2G Bumper Bot
9f097f9b96 Bumping manifests a=b2g-bump 2014-03-25 03:25:59 -07:00
B2G Bumper Bot
3314b10ba1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e125f6aff643
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #17560 from lightsofapollo/taskcluster

Bug 987567 - Initial taskcluster graph +shepherd

========

https://hg.mozilla.org/integration/gaia-central/rev/403f1a7f37eb
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 987567 - Initial taskcluster graph +shepherd
2014-03-25 03:21:16 -07:00