Commit Graph

6485 Commits

Author SHA1 Message Date
B2G Bumper Bot
f19f7958fd Bumping manifests a=b2g-bump 2014-02-22 08:11:09 -08:00
B2G Bumper Bot
d210efad3a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0bd525ab97a0
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #16379 from yor-mozilla-com/fix973407

Bug 973407 - [Messages] Reduce reflows when element heights are updated r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/06f9c9844fee
Author: Yan Or <yor@mozilla.com>
Desc: Bug 973407 - [Messages] Reduce reflows when element heights are updated

1. remove updateElementsHeight() call in messageComposerInputHandler(),
since updateSubjectHeight() already calls it

2. in cancelEdit(), only call updateElementsHeight() if in edit mode

3. in updateElementsHeight(), move code to set input width to 'auto' up
to avoid extra reflow if layout has changed prior to call

Added unit tests for cancelEdit().
2014-02-22 08:05:22 -08:00
B2G Bumper Bot
7778c7a6da Bumping manifests a=b2g-bump 2014-02-22 07:31:15 -08:00
B2G Bumper Bot
bdae679383 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/739d9e049ea1
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 972245 - Photos can appear distorted in the call log and in the SMS app(SMS part) r=julien
2014-02-22 07:25:25 -08:00
B2G Bumper Bot
1e421988da Bumping manifests a=b2g-bump 2014-02-21 21:25:51 -08:00
B2G Bumper Bot
86f2dc0309 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/adc922c62062
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #16527 from hfiguiere/bug962040

Bug 962040 - Catch errors to not break the JSON output r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/bd7da063af63
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 962040 - Catch errors to not break the JSON output. r=julienw

Also make sure VERBOSE is sent to stderr.

Add more verbosity to track where it might hang.
2014-02-21 21:20:23 -08:00
B2G Bumper Bot
6c540dbc8c Bumping manifests a=b2g-bump 2014-02-21 20:11:09 -08:00
B2G Bumper Bot
5ea7de2fb5 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 974163 - Turn off rocketbar by default in 1.4 build time r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/e40773248ff9
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 974163 - Turn off rocketbar by default in 1.4 build time
2014-02-21 20:05:22 -08:00
B2G Bumper Bot
983120939a Bumping manifests a=b2g-bump 2014-02-21 18:36:25 -08:00
B2G Bumper Bot
c175afd054 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1ab6b1fdffb8
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #16539 from qdot/revert-971006

Revert "Merge pull request #16321 from vingtetun/bug971006-final"

========

https://hg.mozilla.org/integration/gaia-central/rev/7b8d72ef5e1a
Author: Gareth Aye <gaye@mozilla.com>
Desc: Revert "Merge pull request #16321 from vingtetun/bug971006-final"

This reverts commit 19304fe63b26630f95c6f3a7da49349b433d476e, reversing
changes made to b9859b9c2199e1c5b7e4eda220e556a7ff43cd21.

Conflicts:
	apps/system/js/utility_tray.js
	apps/system/test/unit/utility_tray_test.js
2014-02-21 18:35:22 -08:00
B2G Bumper Bot
ce8df925b9 Bumping manifests a=b2g-bump 2014-02-21 15:31:13 -08:00
B2G Bumper Bot
9a4706b6bc Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fcd43750323f
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #16538 from davidflanagan/revert972701

Revert "Merge pull request #16301 from wilsonpage/bug/972701"

========

https://hg.mozilla.org/integration/gaia-central/rev/929c5957bfbe
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Revert "Merge pull request #16301 from wilsonpage/bug/972701"

This reverts commit d76e2742d251709c76cc297e25e79dd2170c8bb4, reversing
changes made to bad5658f1c678191e21984d3217a4ad2bfad3c94.
2014-02-21 15:20:23 -08:00
B2G Bumper Bot
b60950b476 Bumping manifests a=b2g-bump 2014-02-21 15:01:10 -08:00
B2G Bumper Bot
583bbf64a5 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c30e46fbd81c
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #16307 from wilsonpage/bug/972804

Bug 972804 - [Camera] Separate settings for camera and video flash r=dmarcos a=stability

========

https://hg.mozilla.org/integration/gaia-central/rev/4fa413138066
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 972804 - [Camera] Separate settings for camera and video flash
2014-02-21 14:55:22 -08:00
B2G Bumper Bot
8f00564239 Bumping manifests a=b2g-bump 2014-02-21 14:31:26 -08:00
B2G Bumper Bot
e89fe92170 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b29ee48d5c0a
Author: Jan Keromnes <janx@linux.com>
Desc: Merge pull request #16472 from jankeromnes/devmenu

Bug 968454 - [Settings] New icon for Developer menu. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/9a613b10dbe3
Author: Jan Keromnes <janx@linux.com>
Desc: Bug 968454 - [Settings] New icon for Developer menu. r=arthurcc
2014-02-21 14:30:22 -08:00
B2G Bumper Bot
25b91cddd7 Bumping manifests a=b2g-bump 2014-02-21 13:56:27 -08:00
B2G Bumper Bot
e65eeaf617 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8863a878a014
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #16301 from wilsonpage/bug/972701

[Camera] Stop Icon overlaps with Camera Shutter icon while recording video r=dmarcos a=stability

========

https://hg.mozilla.org/integration/gaia-central/rev/87ab9841eeff
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 972701 - [Camera] Stop Icon overlaps with Camera Shutter icon while recording video

Conflicts:
	apps/camera/style/controls.css
2014-02-21 13:55:23 -08:00
B2G Bumper Bot
f37d59a86e Bumping manifests a=b2g-bump 2014-02-21 13:46:05 -08:00
B2G Bumper Bot
ec26b79183 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/444503869c6e
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #16530 from mcav/clock-rot

Bug 947617 - Clock app consuming too much power. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/62bc829870f9
Author: Jon Hylands <jhylands@mozilla.com>
Desc: Bug 947617 - Clock app consuming too much power. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/0c5f7620def0
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Bug 970377 - [Messages][Drafts] Drafts are kept forever r=julienw

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

- Call Drafts.store() when deleting a just sent draft message
- Fix leaky sinon spy

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
2014-02-21 13:40:11 -08:00
B2G Bumper Bot
0686a8408e Bumping manifests a=b2g-bump 2014-02-21 12:56:12 -08:00
B2G Bumper Bot
7b2fb7f3d2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0c80486ba055
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16511 from vijayanandh/warnbugconsole

Bug 901216 - [l10n.js] make consoleWarn string concatenation-free

========

https://hg.mozilla.org/integration/gaia-central/rev/2b5266375365
Author: vijayanandh <vijayanand.hongal@accenture.com>
Desc: Bug 901216 - [l10n.js] make consoleWarn string concatenation-free
Also updated consoleLog string concatenation-free
2014-02-21 12:50:22 -08:00
B2G Bumper Bot
22cc091f37 Bumping manifests a=b2g-bump 2014-02-21 12:07:58 -08:00
B2G Bumper Bot
5934ab63e5 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2741c63d7513
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Revert "Merge pull request #16455 from JonHylands/jhylands-947617-clock-power-usage"

This reverts commit 7e1c255c20b64d09ef0e021b8b9d7377840d4061, reversing
changes made to fdc8e4beba5c8279f32083bc4e702348ef22f211.
2014-02-21 12:07:49 -08:00
Ryan VanderMeulen
1ae505b136 Merge m-c to b2g-inbound. 2014-02-21 15:01:50 -05:00
Ryan VanderMeulen
2c1d36ece9 Merge b2g-inbound to m-c. 2014-02-21 14:58:49 -05:00
B2G Bumper Bot
7934b91fb9 Bumping manifests a=b2g-bump 2014-02-21 11:51:12 -08:00
B2G Bumper Bot
71ee0ac214 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4283fcd52197
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #15914 from nullaus/task-switcher

Cards View Goodness!

========

https://hg.mozilla.org/integration/gaia-central/rev/7759d7419f23
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 939809

* added StackManager.snapshot which gets a copy of the array of applications in the stack
* updated CardsView to get the list of and current app from StackManager
* made StackManager ignore the System application explicitly
* minor changes to help with jshint later
* added 'position' getter on stack manager
* added several tests to ensure that the position is current after stack has changed
* moved apps used in cards view test into a variable used to populate running apps as well as the stack
* removed old user ordering code (web os model task manager...) since it's incompatible with our new model
  and the code does not have any tests and it hasn't been enabled in a long time. We're moving on!
* detect cardsview being dismissed and re-enable edge gestures
* created a local help function to enable/disable edge gestures based on events received
* select currently active application card in cards view when cards view is shown
  if no active application, then default to stack position.
* cards view uses 'position' in stack internally, updated code to stop using old 'origin' name to avoid confusion.
* cards view now broadcasts 'newStackPosition' when it's closed and the stack position has changed. newStackPosition contains the position of the application that will be in the top of the stack.
* made edge swipe detector listen to 'cardviewclosed' with new fancy newStackPosition, this also prevents edge gestures from being re-enabled when we go back to the homescreen.
* made stack manager use newStackPosition to move application that was displayed from cards view to top of stack.
* fixed cards view unit tests
* prevent system app from appearing in the application history stack.
* updated 'runningApps' var name to 'stack' in cards view for clarity
* updated 'displayedApp' var name to 'currentPosition' in cards view for clarity
* added getter/setter for position in stack manager, with tests
* added getter/setter for lifecycleEnabled in edge gestures as well as tests for it's usage
* added test to stack manager to ensure that system app does not show up in stack
* alignCurrentCard after we remove one.
* fix gaia ui test.
* use 'position' getter/setter everywhere in StackManager.
* added test to ensure that internal _current position in StackManager doesn't accidentily become a string.

r=etienne
2014-02-21 11:45:24 -08:00
B2G Bumper Bot
2dd21f6dc1 Bumping manifests a=b2g-bump 2014-02-21 11:36:12 -08:00
B2G Bumper Bot
fd7e99d8da Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2dce8ae3d194
Author: Rick Waldron <waldron.rick@gmail.com>
Desc: Revert "Bug 929027 - [Messages] Multiple image sharing from Gallery to Messages r=schung"

This reverts commit fdc8e4beba5c8279f32083bc4e702348ef22f211.

========

https://hg.mozilla.org/integration/gaia-central/rev/230677ee9536
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #16455 from JonHylands/jhylands-947617-clock-power-usage

Bug 947617 - fixed clock hand transform to invoke the GPU. r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/b910d53b03da
Author: Jon Hylands <jhylands@mozilla.com>
Desc: Bug 947617 - fixed clock hand transform to invoke the GPU
2014-02-21 11:30:22 -08:00
B2G Bumper Bot
717d8db319 Bumping manifests a=b2g-bump 2014-02-21 11:11:13 -08:00
B2G Bumper Bot
2a8aecdadc Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/09d19920c1c4
Author: sasikala.paruchuri <sasikala.paruchuri@lge.com>
Desc: Bug 929027 - [Messages] Multiple image sharing from Gallery to Messages r=schung

Updated review comments
2014-02-21 11:05:22 -08:00
B2G Bumper Bot
59fded2c78 Bumping manifests a=b2g-bump 2014-02-21 10:56:08 -08:00
B2G Bumper Bot
abea48ce18 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

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

Bug 973661 - [FTE] In FTE, when skipping PIN screen, there is no option to get that screen again when pressing back

========

https://hg.mozilla.org/integration/gaia-central/rev/dd2c575455e1
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 973661 - [FTE] In FTE, when skipping PIN screen, there is no option to get that screen again when pressing back

========

https://hg.mozilla.org/integration/gaia-central/rev/96fd0c5057b6
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #16451 from stasm/974361-arr-undefined

Bug 974361 - Memory average assumes the array of measurements always exists r=hub

========

https://hg.mozilla.org/integration/gaia-central/rev/e14022e2d19f
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 974361 - Memory average assumes the array of measurements always exists
2014-02-21 10:50:21 -08:00
B2G Bumper Bot
94291c60fa Bumping manifests a=b2g-bump 2014-02-21 09:36:26 -08:00
B2G Bumper Bot
025185e5a8 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/65124b4dde97
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Revert "Bug 974906 - Xfail test_camera_capture_video.py because of Bug 974851."

This reverts commit 6773129d877db48f3183782a1aefea4091393f1a.
2014-02-21 09:35:21 -08:00
B2G Bumper Bot
a41ebe88c4 Bumping manifests a=b2g-bump 2014-02-21 09:30:47 -08:00
B2G Bumper Bot
a4acf534c2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d1db45a074b9
Author: Mason Chang <mason@masonchang.com>
Desc: Merge pull request #16500 from changm/bug960325

Bug 960325 - Move Homescreen Background into Homescreen App. r=alive, crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/a463921aeee5
Author: Mason Chang <mchang@mozilla.com>
Desc: Bug 960325 - Move Homescreen Background into Homescreen App. r=alive,
crdlc
2014-02-21 09:25:26 -08:00
B2G Bumper Bot
11bf160ea3 Bumping manifests a=b2g-bump 2014-02-21 09:06:09 -08:00
B2G Bumper Bot
a1d981538a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6c139b2c645b
Author: evanxd <itoyxd@gmail.com>
Desc: Merge pull request #16435 from evanxd/bug-973876

Bug 973876 - make test-integration shouldn't ask for admin password

========

https://hg.mozilla.org/integration/gaia-central/rev/4b4f3cdd35f5
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 973876 - Remove the admin permission request.
2014-02-21 09:00:22 -08:00
B2G Bumper Bot
14315f8412 Bumping manifests a=b2g-bump 2014-02-21 08:41:30 -08:00
B2G Bumper Bot
177fd66ab4 Bumping manifests a=b2g-bump 2014-02-21 06:58:12 -08:00
B2G Bumper Bot
2c9bd82753 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5b157e823d42
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #16514 from etiennesegonzac/missing-git-ignore

Bug 975395 - Add missing gitignores for the directories created by running a make test-integration. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/b0411430cccd
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 975395 - Add missing gitignores for the directories created by running a make test-integration.
2014-02-21 06:50:12 -08:00
B2G Bumper Bot
8c3fd636eb Bumping manifests a=b2g-bump 2014-02-21 06:01:09 -08:00
B2G Bumper Bot
3ce35babe4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 974646 - [B2G][Contacts] Linking a Facebook contact to existing cont...

========

https://hg.mozilla.org/integration/gaia-central/rev/f1b553e1bddf
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 974646 - [B2G][Contacts] Linking a Facebook contact to existing contact shows local image on contacts list, but Facebook picture in contact details
2014-02-21 06:00:11 -08:00
B2G Bumper Bot
19d24d37fe Bumping manifests a=b2g-bump 2014-02-21 05:41:07 -08:00
B2G Bumper Bot
8f497f017d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9f9909a9fac7
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #16473 from yurenju/twice

Bug 974376 - Marionnette JS tests are reported twice on Travis and locally. r=@evanxd

========

https://hg.mozilla.org/integration/gaia-central/rev/9728b78e745f
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 974376 - Marionnette JS tests are reported twice on Travis and locally.
2014-02-21 05:35:16 -08:00
Kartikaya Gupta
0b3fb4b75d Back out cset 477e7d2eb1d7 (bug 965593) for causing bug 975221 which is more severe. r=backout 2014-02-21 08:23:12 -05:00
B2G Bumper Bot
4e5a4458d9 Bumping manifests a=b2g-bump 2014-02-21 05:21:02 -08:00
B2G Bumper Bot
f9b3ad3ab8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 973593 - Address failure in test_cost_control_data_alert_mobile.py

========

https://hg.mozilla.org/integration/gaia-central/rev/e19ec800f31e
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 973593 - Address failure in test_cost_control_data_alert_mobile.py
2014-02-21 05:20:10 -08:00