7e518b8b1e
Merge mozilla-central and b2g-inbound
2013-09-17 15:22:02 +01:00
a1f075e5c4
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c51f09ca8ebb
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #12266 from comoyo/profanity2
Bug 803189 - Allow profane words in dictionary but dont suggest them. r=RudyL
========
https://hg.mozilla.org/integration/gaia-central/rev/e3cfd8b71c6c
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 803189 - Allow profane words in dictionary but dont suggest them
2013-09-17 06:45:22 -07:00
78cc8a9f85
Merging in version bump NO BUG
2013-09-17 09:38:37 -04:00
e9cd106832
Added tag FIREFOX_AURORA_26_BASE for changeset 2520866d5874
2013-09-17 09:36:55 -04:00
fbfc359172
Bug 916116 - Avoid some code duplication in Gralloc textures. r=sotaro
2013-09-17 15:29:19 +02:00
5105ebac1e
Bug 916116 - Move SetCompositableQuirks to AddTextureHost. r=sotaro
2013-09-17 15:28:35 +02:00
85a9c933ff
Backed out 2 debugging changesets (bug 916757) to avoid uplifting, now the failures have been identified; CLOSED TREE
...
Backed out changeset 1713de744990 (bug 916757)
Backed out changeset 861e1c86d759 (bug 916757)
--HG--
extra : transplant_source : %A0%FC%C3%EB%89/%BD%B9%08lv%3F%C1q%AD%DC%B5%E0bE
2013-09-17 07:42:40 -04:00
61ea412a96
Merge m-i to a CLOSED TREE m-c
2013-09-16 23:12:03 -07:00
7359294014
Bug 899420 - Disable accidentally enabled Android x86 media tests on a CLOSED TREE r=bustage
...
--HG--
extra : amend_source : 30e839e40d27414167bb7a99e9767f7c3123912c
2013-09-17 15:41:39 +12:00
8ba7f243f2
Backed out changeset 4d44bc8da75c (bug 913110)
...
CLOSED TREE
2013-09-16 22:45:42 -04:00
d41e108a3f
Backed out changeset 0d92b16a748b (bug 906620)
2013-09-16 22:45:33 -04:00
1ae2973b6d
Backed out changeset a04d4a573863 (bug 914435)
2013-09-16 22:45:27 -04:00
5cc87d9147
Backed out changeset 1d12266ddc4c (bug 914927)
...
CLOSED TREE
2013-09-16 17:55:17 -07:00
b770c3935d
Backed out changeset acce93fb65a1 (bug 914926)
...
CLOSED TREE
2013-09-16 17:55:08 -07:00
78b3dbc50a
Merge b2g-inbound to m-c on a CLOSED TREE and DONTBUILD because it's just pushbot stuff.
2013-09-16 13:37:32 -04:00
31a2144ac4
Merge fx-team to m-c on a CLOSED TREE.
2013-09-16 13:33:25 -04:00
dcc027a23f
Bug 916116 - Remove useless #if 1. r=bjacob
2013-09-16 19:04:36 +02:00
ada450f7a3
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b0a4e617d7f0
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12242 from crdlc/bug-916690
Bug 916690 - Reduce memory consumption with a lazy load of the dragdrop and wallpaper components
========
https://hg.mozilla.org/integration/gaia-central/rev/5344f1cf04ba
Author: crdlc <crdlc@tid.es>
Desc: Bug 916690 - Reduce memory consumption with a lazy load of the dragdrop and wallpaper components
2013-09-17 06:20:25 -07:00
5487688aad
Bug 917220 - Fix IS_HEADSET, r=echou
2013-09-17 19:40:06 +08:00
f7bf4d781e
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b47ac7c2176b
Author: b2gautomation <jonallengriffin@gmail.com>
Desc: Update gaia-ui-tests.json; Merge pull request #1374 from bebef1987/master
Add move notice
========
https://hg.mozilla.org/integration/gaia-central/rev/ab6cc3ef3a8f
Author: b2gautomation <jonallengriffin@gmail.com>
Desc: Merge branch 'master' of github.com:mozilla-b2g/gaia
========
https://hg.mozilla.org/integration/gaia-central/rev/bcc1434d9e43
Author: b2gautomation <jonallengriffin@gmail.com>
Desc: Update gaia-ui-tests.json; wait for permission details to be visibile
2013-09-17 04:20:29 -07:00
3b00dd02e7
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8dd238333b06
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12262 from crdlc/bug-916936
Bug 916936 - Two dashes / underscores can be seen on each page of the homescreen
========
https://hg.mozilla.org/integration/gaia-central/rev/7c4be8321ea4
Author: crdlc <crdlc@tid.es>
Desc: Bug 916936 - Two dashes / underscores can be seen on each page of the homescreen
2013-09-17 04:10:22 -07:00
95250001f8
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b6c2bc179775
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #12241 from snowmantw/issue903924
Bug 903924 - [Flatfish][LockScreen] add support for large device, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/ea5dcda9f379
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 903924 - [Flatfish][LockScreen] add support for large device
2013-09-17 01:25:22 -07:00
72754d4434
Bug 916848: Added .oga to the Device Storage's list of supported file types, r=doublec
2013-09-17 09:34:39 +02:00
425c13378b
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/8bdef350c0a6
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #12182 from alivedise/bugzilla/915070/app-default-channel
Bug 915070 - Default volume control channel for app, r=timdream
========
https://hg.mozilla.org/integration/gaia-central/rev/00bb233e918e
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 915070 - Default volume control channel for app
2013-09-16 23:48:39 -07:00
6479c93d8c
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e9705799bd9f
Author: cctuan <georgeiscoming@gmail.com>
Desc: Revert "Bug 903919 - [Flatfish][Gallery] add support for large device"
This reverts commit a206eac5a8ac8743270d01846c2bf004b56cf02c.
2013-09-16 23:48:13 -07:00
41b24993cf
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/a49e67338951
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #12076 from gaye/bug-821519-again
Bug 821519 - Enable sharing urls from the browser through email r=jrburke
========
https://hg.mozilla.org/integration/gaia-central/rev/1c11925f64cf
Author: gaye <gaye@mozilla.com>
Desc: Bail from app_messages_test.js if missing mozSetMessageHandler
========
https://hg.mozilla.org/integration/gaia-central/rev/556528f82e24
Author: gaye <gaye@mozilla.com>
Desc: Bug 821519 - Enable sharing urls from the browser through email r=jrburke
2013-09-16 23:36:15 -07:00
58b15aa436
Bumping gaia.json for 2 gaia-central revision(s)
...
Truncated some number of revisions since the previous bump.
========
https://hg.mozilla.org/integration/gaia-central/rev/5e679bc5816c
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #12251 from mikehenrty/bug-916730-skiptest
Bug 916730 - Intermittent integration test failure "notification tests e...
========
https://hg.mozilla.org/integration/gaia-central/rev/fe93cc57f555
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 916730 - Intermittent integration test failure "notification tests email notification should not wake screen"
2013-09-16 23:35:54 -07:00
c3e19fa1f1
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/eb5973515698
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #12238 from dwi2/916066_wording_of_active_keyboard_page
Bug 916066 - [Keyboard][V1.2] Need to modify the wording of Active Keyboard page r=crh0716
========
https://hg.mozilla.org/integration/gaia-central/rev/d41b761bcfa5
Author: tzhuang <tzhuang@mozilla.com>
Desc: Bug 916066 - [Keyboard][V1.2] Need to modify the wording of Active Keyboard page
2013-09-16 04:20:22 -07:00
251db9b4ae
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/fdb817bb9058
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #12090 from benfrancis/908927
Bug 908927 - Use templates instead of string concatenation for search URIs
========
https://hg.mozilla.org/integration/gaia-central/rev/03070fa85815
Author: Ben Francis <ben@tola.me.uk>
Desc: Bug 908927 - Use templates instead of string concatenation for search URIs
2013-09-16 04:05:22 -07:00
a5da31befb
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/893d7a1cf6b6
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12202 from crdlc/bug-916050
Bug 916050 - We can save 700-1000kbs of memory loading confirm dialog in a lazy mode and deleting IccHelper when is finished
========
https://hg.mozilla.org/integration/gaia-central/rev/55033a80bf3d
Author: crdlc <crdlc@tid.es>
Desc: Bug 916050 - We can save 700-1000kbs of memory loading confirm dialog in a lazy mode and deleting IccHelper when is finished
2013-09-16 02:31:24 -07:00
dd795ac6f6
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e30273e5aca9
Author: Hans Liss <Hans@Liss.nu>
Desc: Bug 906767 - Swedish keyboard layout. r=rudylu
Removed country distinction for Swedish keyboard layout
Removed country marker on sv keyboard layout name
2013-09-16 01:35:22 -07:00
0aa06cef5c
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7d05f26ed46c
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 916023 - Add Gaia functional tests. r=jgriffin
2013-09-16 01:25:23 -07:00
cc0cdb7a29
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7949dab98fbf
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #10838 from comoyo/profanity
Bug 803189 - Allow profane words in dictionary but dont suggest them. r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/ee2ff8dbf603
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 803189 - Allow profane words in dictionary but dont suggest them
2013-09-16 01:10:24 -07:00
4abe2b9d25
Backed out changeset acf80b86d630 (bug 904617) for compilation failures
2013-09-16 08:44:44 +01:00
7766485842
Backed out changeset 9cc6dd50c93a (bug 904617)
2013-09-16 08:43:56 +01:00
3cf7ed846a
Backed out changeset 81cee5ae7973 (bug 904617)
2013-09-16 08:43:47 +01:00
77ff767b7d
Backed out changeset a317a2d59ed5 (bug 904617)
2013-09-16 08:43:37 +01:00
32315b86ba
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7405487508e2
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #12203 from comoyo/globalkey
Bug 910713 - Global key isnt hidden if there is only one layout. r=RudyL
========
https://hg.mozilla.org/integration/gaia-central/rev/d18133b60624
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 910713 - Global key isnt hidden if there is only one layout
========
https://hg.mozilla.org/integration/gaia-central/rev/f329d89b9b55
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #12234 from EragonJ/bug-914317
Bug 914317 - [B2G] [Bluetooth] "Unable to Pair" message has placeholder text. r=@alivedise
========
https://hg.mozilla.org/integration/gaia-central/rev/32bfa536a0d0
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 914317 - Add a check to remove title in prompts
2013-09-16 00:35:22 -07:00
7f3a3729b9
Bug 904617: Part 4 - Add windows wasapi latency entries for cubeb r=kinetik
2013-09-16 03:26:31 -04:00
e49df05ddc
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/13e01795177d
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12237 from lightsofapollo/bug-916655
Bug 916655 - vbump marionette client (5s element search timeout)
========
https://hg.mozilla.org/integration/gaia-central/rev/a9f87605b70f
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 916655 - vbump marionette client (5s element search timeout)
2013-09-15 21:20:23 -07:00
c2887a3df1
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0bd51266be55
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #12232 from JinhoHwang/Bug_907505_Screen_Manager_registers_duplicated_event_listeners
Bug 907505 - [System] Screen_Manager registers duplicated event listener... r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/54a8c48fc105
Author: jinho.hwang <jinho.hwang@lge.com>
Desc: Bug 907505 - [System] Screen_Manager registers duplicated event listeners
2013-09-15 20:45:28 -07:00
6e4df608cd
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/596dd2c001aa
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #12198 from huchengtw-moz/video/Bug_916032_unable_to_pick_file
Bug 916032 - pick activity of video unable to choose file, r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/7bd29d92ecab
Author: John Hu <johu@mozilla.com>
Desc: Bug 916032 - pick activity of video unable to choose file
2013-09-15 20:35:24 -07:00
114e193d06
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/23bdefe73507
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12235 from lightsofapollo/revert-11915
Revert "Merge pull request #11915 from reubenmorais/contacts-customizati...
========
https://hg.mozilla.org/integration/gaia-central/rev/ead989351aad
Author: James Lal <james@lightsofapollo.com>
Desc: Revert "Merge pull request #11915 from reubenmorais/contacts-customization"
This reverts commit 84e2d96144ce9e94cc1bd2f8da6a1d2f97c39181, reversing
changes made to 9cb0bf07dd6b8c23ee4c4db3d866464077f81e45.
========
https://hg.mozilla.org/integration/gaia-central/rev/09c2b6e4e082
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #12223 from yxl/setInputMethodActive
Bug 842436 - Keyboard API: There should only be one keyboard active, and...
r=rudylu
========
https://hg.mozilla.org/integration/gaia-central/rev/9e6440eede90
Author: Yuan Xulei <xyuan@mozilla.com>
Desc: Bug 842436 - Keyboard API: There should only be one keyboard active, and Gecko should block interaction from non-active keyboards. r=rudyl
2013-09-15 20:25:22 -07:00
b86e8eccaf
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7aa503060000
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #12189 from huchengtw-moz/camera/Bug_915994_show_preview_when_preview_is_not_big_enough
Bug 915994 - [Camera][REG] reset of media frame still trying to show pre..., r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/43b6068f4806
Author: John Hu <johu@mozilla.com>
Desc: Bug 915994 - [Camera][REG] reset of media frame still trying to show preview image when it is not big enough
2013-09-15 20:10:23 -07:00
cadfa392b8
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b44ba604bd3b
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12231 from qdot/revert-revert-915920
Revert revert 915920
========
https://hg.mozilla.org/integration/gaia-central/rev/093f08b9789b
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 915920 - Fix gjslint quote errors
========
https://hg.mozilla.org/integration/gaia-central/rev/0c597b9bcea7
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Revert "Revert "Merge pull request #12206 from qdot/915920""
This reverts commit 4433c772ad5d1367157dddae08ce235ee28096b2.
2013-09-15 19:50:23 -07:00
40173a35b1
Merge b2g-inbound to m-c.
2013-09-15 21:53:23 -04:00
13efcd8ed8
Merge inbound to m-c.
2013-09-15 21:48:02 -04:00
6328c989fc
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e089fe3d2b9a
Author: Reuben Morais <reuben.morais@gmail.com>
Desc: Merge pull request #11915 from reubenmorais/contacts-customization
Bug 891723 - Implement preloaded contacts customization by SIM. r=arcturus
========
https://hg.mozilla.org/integration/gaia-central/rev/4fed03c0b3b4
Author: Reuben Morais <reuben.morais@gmail.com>
Desc: Bug 891723 - Implement preloaded contacts customization by SIM. r=arcturus
2013-09-15 16:55:22 -07:00
697e59b489
Bug 916531 - Backed out changeset 47e05e8df03b (bug 915482, part 4) for causing hangs on Windows. r=me.
...
--HG--
extra : rebase_source : 1c3d96a670c031137d984584449704f32f728c3f
2013-09-15 16:20:17 -07:00
a3f1ea6990
Backed out 7 changesets (bug 902525) for B2G reftest failures.
...
Backed out changeset bbca63772c83 (bug 902525)
Backed out changeset edb386989dbd (bug 902525)
Backed out changeset 3137dadb4fcd (bug 902525)
Backed out changeset e562afcb3c89 (bug 902525)
Backed out changeset 8ef3a516bd68 (bug 902525)
Backed out changeset 520fcd422150 (bug 902525)
Backed out changeset 4e553e8da44e (bug 902525)
2013-09-15 18:59:27 -04:00
Ed Morley
Gaia Pushbot
Alex Keybl
Nicolas Silva
Ehsan Akhgari
Phil Ringnalda
Edwin Flores
Ryan VanderMeulen
Gina Yeh
Thomas Zimmermann
Paul Adenot
Nicholas Nethercote