Commit Graph

169758 Commits

Author SHA1 Message Date
B2G Bumper Bot
6433460950 Bumping manifests a=b2g-bump 2014-02-22 18:51:28 -08:00
B2G Bumper Bot
c685327713 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/df0b1e4b8e67
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Revert "Merge pull request #16435 from evanxd/bug-973876"

This reverts commit 447eb65ee5a7428e3959ac3b1c0a3fbbfc125d43, reversing
changes made to 6894b915ee7d031a1f0ed16c422c48f293de1b84.
2014-02-22 18:50:24 -08:00
B2G Bumper Bot
7f00ee3818 Bumping manifests a=b2g-bump 2014-02-22 08:11:09 -08:00
B2G Bumper Bot
bf21c71bf2 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
d32d58f19e Bumping manifests a=b2g-bump 2014-02-22 07:31:15 -08:00
B2G Bumper Bot
099aefc541 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
Sotaro Ikeda
3833d05925 Bug 957276 - Fix YFlipped buffer's source crop r=sushil 2014-02-22 04:56:02 -08:00
B2G Bumper Bot
0b3ed4e54a Bumping manifests a=b2g-bump 2014-02-21 21:25:51 -08:00
B2G Bumper Bot
3e856540af 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
14ffd4bb05 Bumping manifests a=b2g-bump 2014-02-21 20:11:09 -08:00
B2G Bumper Bot
2983281cfe 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
Wes Kocher
f3ef1c9118 Merge m-c to b2g-inbound 2014-02-21 18:54:57 -08:00
Wes Kocher
ec9d63f712 Merge fx-team to m-c 2014-02-21 18:49:56 -08:00
B2G Bumper Bot
1e4f73d00b Bumping manifests a=b2g-bump 2014-02-21 18:36:25 -08:00
Wes Kocher
07eb676262 Merge b2g-inbound to m-c 2014-02-21 18:35:32 -08:00
B2G Bumper Bot
c13fcf8dcf 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
c4a18c3b28 Bumping manifests a=b2g-bump 2014-02-21 15:31:13 -08:00
B2G Bumper Bot
6f8d6add1e 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
16844dd7e5 Bumping manifests a=b2g-bump 2014-02-21 15:01:10 -08:00
Kartikaya Gupta
e8bce1378a Bug 898563. r=botond 2014-02-21 17:58:30 -05:00
B2G Bumper Bot
3a9939f8d9 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
ece81103db Bumping manifests a=b2g-bump 2014-02-21 14:31:26 -08:00
B2G Bumper Bot
884947214e 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
1526f52f71 Bumping manifests a=b2g-bump 2014-02-21 13:56:27 -08:00
B2G Bumper Bot
90d601d6de 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
Ryan VanderMeulen
f1a55855c0 Backed out changeset 2d021370c57f (bug 965990) for causing bug 973307. 2014-02-21 16:54:42 -05:00
Benoit Jacob
1b9fd6371f Bug 970747 - 6/6 - Make LayerTransactionParent::RecvUpdate error out if RepositionChild fails - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
340ad52d84 Bug 970747 - 5/6 - Make ContainerLayer::RepositionChild always perform checks and return bool - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
52bcbbf9fd Bug 970747 - 4/6 - Make LayerTransactionParent::RecvUpdate error out if RemoveChild fails - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
42f76f6266 Bug 970747 - 3/6 - Make ContainerLayer::RemoveChild always perform checks and return bool - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
cc2564fac3 Bug 970747 - 2/6 - Make LayerTransactionParent::RecvUpdate error out if InsertAfter fails - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
de6342ddcf Bug 970747 - 1/6 - Make ContainerLayer::InsertAfter always perform checks and return bool - r=mattwoodrow 2014-02-21 16:50:25 -05:00
Benoit Jacob
5a2a768330 Bug 968825 - Null pointer checks in LayerTransactionParent - r=jrmuizel 2014-02-21 16:50:25 -05:00
B2G Bumper Bot
308805c30a Bumping manifests a=b2g-bump 2014-02-21 13:46:05 -08:00
B2G Bumper Bot
27a588d541 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
dadadel
0c14c0abb9 Bug 975136 - Fix mozprocess to accept single function or array of functions for onTimeout/onFinish, update docs;r=wlach 2014-02-21 16:33:30 -05:00
B2G Bumper Bot
b3494d4d5d Bumping manifests a=b2g-bump 2014-02-21 12:56:12 -08:00
B2G Bumper Bot
54d8f3f288 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
Ryan VanderMeulen
4f25d52cfa Backed out 3 changesets (bug 956657, bug 974824, bug 974258) for mochitest-other failures on a CLOSED TREE.
Backed out changeset 792ce962cad6 (bug 956657)
Backed out changeset a1574a6b0544 (bug 974824)
Backed out changeset ad851c771c04 (bug 974258)
2014-02-21 15:28:43 -05:00
Brian Hackett
ac85a0c7a8 Bug 975335 - Allow calling CurrentThreadCanAccess{Runtime,Zone} from any thread, r=luke. 2014-02-21 13:22:39 -07:00
B2G Bumper Bot
06aa1786a6 Bumping manifests a=b2g-bump 2014-02-21 12:07:58 -08:00
B2G Bumper Bot
8c2827896a 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
2edb5862a5 Merge m-c to inbound. 2014-02-21 15:01:16 -05:00
Ryan VanderMeulen
ca498aa5c2 Merge b2g-inbound to m-c. 2014-02-21 14:58:49 -05:00
Ryan VanderMeulen
95bf4ca4b1 Backed out changeset a00bd379adb2 (bug 950371) for breaking OSX non-unified builds. 2014-02-21 14:58:34 -05:00
Reuben Morais
a8bbb6b48f Bug 951785 - For browser content, unless explicitly denied for the app, consider permissions for the requesting origin, not the requesting app. r=sicking
--HG--
extra : rebase_source : 83d71d004f193c597f19a3cead1682698579d3d5
2014-02-21 16:56:19 -03:00
Ryan VanderMeulen
20336de511 Merge m-c to b2g-inbound. 2014-02-21 15:01:50 -05:00
Fabrice Desré
65d0f739fe Backout 96eaa0f376ab (bug 961282) for smoketest regression. 2014-02-21 11:54:03 -08:00
B2G Bumper Bot
53a3645f3c Bumping manifests a=b2g-bump 2014-02-21 11:51:12 -08:00
B2G Bumper Bot
848578be89 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