Commit Graph

148023 Commits

Author SHA1 Message Date
Gijs Kruitbosch
18f10e54d8 Merge mozilla-central and ux 2013-09-18 14:54:29 +02:00
Mike de Boer
6d5e69bdf1 Bug 885086: constrain max width of overflowItems, correct layout and centering of elements and update zoom/ edit controls in overflow panel. r=jaws 2013-09-18 14:48:19 +02:00
Carsten "Tomcat" Book
deae2bca56 merge b2g-inbound to mozilla-central 2013-09-18 12:14:05 +02:00
Carsten "Tomcat" Book
a5d24f9255 merge fx-team to mc 2013-09-18 12:12:28 +02:00
Gijs Kruitbosch
1ad320d951 Merge m-c to UX 2013-09-18 10:31:05 +02:00
Gaia Pushbot
fb32f85c56 Bumping gaia.json for 2 gaia-central revision(s)
========

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

Bug 916782 - Remove progress_activity.css and status.css from homescreen (it is only needed for ev.me)

========

https://hg.mozilla.org/integration/gaia-central/rev/7aefd8280725
Author: crdlc <crdlc@tid.es>
Desc: Bug 916782 - Remove progress_activity.css and status.css from homescreen (it is only needed for ev.me)
2013-09-17 23:50:26 -07:00
Robert Strong
e94b4e7407 Most entries in removed-files.in are no longer needed - Bug 649607 - Update removed-files.in after requiring update to the version with bug 563318. r=bbondy 2013-09-17 22:15:53 -07:00
Mark Hammond
14a9ab5823 Bug 914615 - use http://mochi.test:8888 instead of http://foo.bar to test same origin in social tests. r=gavin 2013-09-18 15:08:22 +10:00
Phil Ringnalda
3e6a030f38 Back out 2e69de47685e (bug 896291) on suspicion of timing out browser_homeDrop.js 2013-09-17 21:49:31 -07:00
Gaia Pushbot
135df49e13 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/ebb38d4126d0
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12287 from lightsofapollo/reallyreallyhide-keyboard-tets

[really] per bug 917523 disable test on tbpl

========

https://hg.mozilla.org/integration/gaia-central/rev/290853690b8c
Author: James Lal <james@lightsofapollo.com>
Desc: [really] per bug 917523 disable test on tbpl
2013-09-17 21:40:27 -07:00
Mark Capella
b24da8d2f0 Bug 770101 - about:config should label integer fields correctly so keyboard uses numerical mode, r=wesj 2013-09-17 23:54:48 -04:00
Mark Capella
3d365633c5 Bug 913214 - Create StringUtils method to provide readable URL / title string, r=wesj, sriram 2013-09-17 23:54:48 -04:00
Nicholas Cameron
0ea0f5ebb7 Bug 902591. Check for Azure in ContentClientIncremental. r=mattwoodrow
--HG--
extra : rebase_source : 134ddc6a2fd891179b7531cea4222188b518f19a
2013-09-18 15:47:23 +12:00
Jesse Ruderman
f4099a7205 Crashtest for bug 861489. 2013-09-17 20:46:17 -07:00
L. David Baron
0f7222c881 Bug 861489: Fix SkipAnimationRule to do the right thing in the presence of new cascading rules. r=bzbarsky 2013-09-17 20:46:17 -07:00
Phil Ringnalda
afee847b66 Backed out changeset 505e8f8480d2 (bug 913597) for Android failure
--HG--
extra : rebase_source : d9ffe836559fb5a63d895d40b4f89324c2932216
2013-09-17 20:45:48 -07:00
Joshua Cranmer
84029df5aa Bug 904985 - Use Char16.h in favor of NS_LL, Part 3: kill NS_LL. r=dbaron
--HG--
extra : rebase_source : bc105a8cbb87cc9b6b2db0734d9841fe599e794b
2013-09-17 22:43:21 -05:00
Joshua Cranmer
0706184d74 Bug 904985, part 2: Use char16_t for NS_LITERAL_STRING, r=glandium, dbaron.
--HG--
extra : rebase_source : b4c9def93d907724fb4a1bc3f6279db87a11fb1f
2013-09-17 22:43:12 -05:00
Joshua Cranmer
2ecbbf20ab Bug 904985, part 1: Add better support for char16_t in type traits, r=Waldo.
--HG--
extra : rebase_source : 45cb9155312ead0b8164e1e460c9fd2e39f0d6fc
2013-09-17 22:43:04 -05:00
Nicholas Cameron
1ca2ec9d39 Backed out changeset: 0ae388d62a87. r=me 2013-09-18 15:43:26 +12:00
Nicholas Cameron
afbd33c5ad Bug 907463. Backout OP_SOURCE optimisation from bug 907926. r=mattwoodrow
--HG--
extra : rebase_source : eac66979f88c7801bc19646cf81d7c94a77281c0
2013-09-18 15:39:34 +12:00
Chris Pearce
499a20ae5f Bug 915957 - Move MediaDecoder::NotifyBytesConsumed() calls into MediaResource, so we don't need to remember to do them in all decoder backends. r=kinetik 2013-09-18 15:37:23 +12:00
Gaia Pushbot
dbfee1394b Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/31d028bfcc44
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #12236 from gasolin/issue-911696

Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no tel..., r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/c0226574c7ea
Author: gasolin <gasolin@gmail.com>
Desc: Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no telephony support
2013-09-17 20:20:22 -07:00
Ryan VanderMeulen
cc4947aef6 Merge m-c to fx-team. 2013-09-17 22:49:31 -04:00
Ryan VanderMeulen
8a6a806c2a Merge m-c to inbound. 2013-09-17 22:47:28 -04:00
Ryan VanderMeulen
871fb32207 Merge b2g-inbound to m-c. 2013-09-17 22:46:32 -04:00
Marco Castelluccio
909a441d97 Bug 917310 - Apps install path is broken on b2g desktop for windows and mac r=fabrice 2013-09-17 17:36:36 -07:00
Ryan VanderMeulen
5be5179c2d Merge m-c to fx-team on a CLOSED TREE. 2013-09-17 20:27:03 -04:00
Ryan VanderMeulen
77a8785c0c Backed out changeset d63424e06b3e (bug 916446) for B2G mochitest-1 failures. 2013-09-17 20:25:48 -04:00
Gaia Pushbot
0309ea7d5b Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/94340fb19f68
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12283 from lightsofapollo/reallyhide-keyboard-tests

per bug 917523 disable test on tbpl

========

https://hg.mozilla.org/integration/gaia-central/rev/d817d867b7ae
Author: James Lal <james@lightsofapollo.com>
Desc: per bug 917523 disable test on tbpl
2013-09-17 17:10:24 -07:00
Gaia Pushbot
1f9d0fdc59 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/99a07b8780aa
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #12095 from eeejay/bug-914882

Bug 914882 - Style clipped settings panels as invisible. r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/7d4f34845e97
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 914882 - Style clipped settings panels as invisible.
2013-09-17 16:15:26 -07:00
Gaia Pushbot
f032f4ad00 Bumping gaia.json for 2 gaia-central revision(s)
========

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

Bug 916231 - Add screen reader toggle to developer options. r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/706499ea0abd
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 916231 - Add screen reader toggle to developer options.
2013-09-17 15:50:25 -07:00
Jared Wein
8996f6fc6d Bug 914863 - Help and Quit buttons stay disabled after exiting customization mode. r=mconley,Gijs 2013-09-17 18:20:19 -04:00
Gaia Pushbot
8a8bc6c735 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/2abf97674c6a
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12279 from lightsofapollo/disable-modify-event-view

disable modify_event_test a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/b12465654e88
Author: James Lal <james@lightsofapollo.com>
Desc: disable modify_event_test a=test-only
2013-09-17 14:50:22 -07:00
Gaia Pushbot
440374fcd3 Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/49950f830ee6
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12259 from lightsofapollo/gaia-ui-tests-travis

Bug 916305 - Gaia ui tests travis

========

https://hg.mozilla.org/integration/gaia-central/rev/13c2ca7c1f26
Author: James Lal <james@lightsofapollo.com>
Desc: xfail test_clock_turn_on_off_alarm.py

========

https://hg.mozilla.org/integration/gaia-central/rev/3a93cb8a84ef
Author: James Lal <james@lightsofapollo.com>
Desc: xfail test_settings_change_keyboard_language.py

========

https://hg.mozilla.org/integration/gaia-central/rev/a2031a207635
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 916305 - Gaia ui test travis setup
2013-09-17 14:40:24 -07:00
Gaia Pushbot
93eb55d7da Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/36097dafad3c
Author: John Ford <john@johnford.info>
Desc: Revert "Merge pull request #12234 from EragonJ/bug-914317"

https://bugzilla.mozilla.org/show_bug.cgi?id=914317#c13

This reverts commit bda5c4a902793934467b689a118a2c68f745706e, reversing
changes made to bc85e07011c2c40986693657fa7647ee5c9f8eea.
2013-09-17 14:15:23 -07:00
Ryan VanderMeulen
8babb6cb0e Merge m-c to inbound on a CLOSED TREE. 2013-09-17 16:55:23 -04:00
Ryan VanderMeulen
19805ff01e Merge m-c to b2g-inbound. 2013-09-17 16:51:34 -04:00
Gaia Pushbot
160664d665 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d61ac2e84b83
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #12276 from gaye/waitForAlert

Use MarionetteHelper#waitForAlert in share_url_test.js r=lightsofapollo a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/958033f9d148
Author: gaye <gaye@mozilla.com>
Desc: Use MarionetteHelper#waitForAlert in share_url_test.js r=lightsofapollo
2013-09-17 13:50:23 -07:00
Ryan VanderMeulen
a185ae5d5b Merge b2g-inbound to m-c. 2013-09-17 16:50:17 -04:00
Wes Kocher
2a660a631c Backed out changeset 2d9b7fe69276 (bug 906620) for debug OSX mochitest leaks on a CLOSED TREE 2013-09-17 13:40:10 -07:00
Nicholas Nethercote
cc1558fe8d Bug 917489 - Fix an observer leak in about:memory. r=mccr8. 2013-09-17 13:13:25 -07:00
Peter Chang
f4049067a4 Bug 915077 - Change the debug log level of HWC, r=nrc 2013-09-18 10:10:35 +08:00
Ryan VanderMeulen
449cad53d5 Backed out changeset 9fa8dd98a23c (bug 911325) for Android Armv6 xpcshell orange.
CLOSED TREE
2013-09-17 21:56:51 -04:00
Gaia Pushbot
cf46f24c4e Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/ca3cef257ae1
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #12274 from flodolo/bug917198_master

Bug 917198 - inconsistent use of "OK" and "KB" across Gaia apps and settings, r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/76e3a2829ed1
Author: Francesco Lodolo <flod@lodolo.net>
Desc: Bug 917198 - en-US: inconsistent use of "OK" and "KB" across Gaia apps and settings
2013-09-17 12:50:25 -07:00
Gaia Pushbot
18b44328e9 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/a54cc0c1ff0d
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12255 from lightsofapollo/travis-parallel

Bug 917044 - Run gjslint, unit tests and integration tests in parallel

========

https://hg.mozilla.org/integration/gaia-central/rev/2f6b3ef3d6ee
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 917044 - Run gjslint, unit tests and integration tests in parallel
2013-09-17 12:20:27 -07:00
Benoit Jacob
24afddf9d1 Bug 915869 - Let the GrallocBufferActor keep an _array_ of backrefs to TextureHosts referencing it - r=nical 2013-09-17 14:48:08 -04:00
Benoit Jacob
21762ea6b2 Bug 915869 - Let the GrallocBufferActor inform its old TextureHost when it's switching to another TextureHost - r=jrmuizel 2013-09-17 14:47:27 -04:00
Alexandre Poirot
59c8663b59 Bug 917331 - Fix exception on b2g desktop about undefined AdbController object. r=fabrice 2013-09-17 14:29:38 -04:00
Alex Keybl
b16740d8c4 m-c is now FxOS 1.3 r=merge NO BUG 2013-09-17 14:26:06 -04:00