B2G Bumper Bot
bb47ee80ab
Bumping manifests a=b2g-bump
2014-06-11 12:14:09 -07:00
B2G Bumper Bot
0c256db0e7
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0c8884e1c043
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1023011 - (vertical-homescreen) Implement pressed state visual for App Icons"
This reverts commit 2728b437562eb0285b3f3279623d978537638bf6.
2014-06-11 12:11:35 -07:00
B2G Bumper Bot
ff20b5991f
Bumping manifests a=b2g-bump
2014-06-11 11:49:24 -07:00
B2G Bumper Bot
2a65d630d2
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/489e5d54633f
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1022052 - Add setting to disable searching remote provider. r=kgrandon, r=evelyn
2014-06-11 11:45:44 -07:00
B2G Bumper Bot
0013465646
Bumping manifests a=b2g-bump
2014-06-11 11:37:17 -07:00
B2G Bumper Bot
3fc1372ed7
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/389523ab2cb8
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #19613 from eeejay/bug-1015479
Bug 1015479 - Make header markup follow visual order. r=arnau
========
https://hg.mozilla.org/integration/gaia-central/rev/0ed2c333bd4c
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 1015479 - Make header markup follow visual order.
========
https://hg.mozilla.org/integration/gaia-central/rev/9282b03d2d2c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20364 from crdlc/bug-1023011
Bug 1023011 - (vertical-homescreen) Implement pressed state visual for App Icons
========
https://hg.mozilla.org/integration/gaia-central/rev/6a00afcf8dba
Author: crdlc <crdlc@tid.es>
Desc: Bug 1023011 - (vertical-homescreen) Implement pressed state visual for App Icons
2014-06-11 11:30:32 -07:00
B2G Bumper Bot
8c435c8440
Bumping manifests a=b2g-bump
2014-06-11 11:06:35 -07:00
B2G Bumper Bot
0d3629e4c0
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/ac41749c5404
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20359 from EverythingMe/1023312-floor-dimension
Bug 1023312 - [Vertical homescreen] Smart collection viewing fails on the flame because e.me server fails to return background. [r=amirn]
========
https://hg.mozilla.org/integration/gaia-central/rev/fd7ed5cbcc61
Author: Ran Ben Aharon <ran@ranbena.com>
Desc: Bug 1023312 - [Vertical homescreen] Smart collection viewing fails on the flame because e.me server fails to return background. [r=amirn]
========
https://hg.mozilla.org/integration/gaia-central/rev/ab926c616615
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #20372 from 6a68/revert-bug-1004251
Revert "Bug 1004251 - Add resend verification email to firefox accounts....
========
https://hg.mozilla.org/integration/gaia-central/rev/0a757abe9870
Author: Jared Hirsch <ohai@6a68.net>
Desc: Revert "Bug 1004251 - Add resend verification email to firefox accounts. r=ferjm,arthurcc"
This reverts commit f8f70f699d50d3669b507c1bad245b1709c95a50.
Conflicts:
apps/settings/js/firefox_accounts/panel.js
2014-06-11 11:01:29 -07:00
Ed Morley
bac7c78535
Merge mozilla-central and b2g-inbound
2014-06-11 18:06:52 +01:00
B2G Bumper Bot
dc6b466866
Bumping manifests a=b2g-bump
2014-06-11 09:44:06 -07:00
B2G Bumper Bot
8ae2ff199b
Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d6cf58c5909e
Author: Ben Francis <ben@tola.me.uk>
Desc: Revert "Bug 1020685: Close only over the URL string that we need. r=bfrancis"
This reverts commit dfa599e45b6da54439374d1983fc10d21d9ebf54.
========
https://hg.mozilla.org/integration/gaia-central/rev/5ac945b0696a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20255 from eeejay/bug-1022939
Bug 1022939 - Add ARIA markup for gaia-radio and give example for radio menu items.
========
https://hg.mozilla.org/integration/gaia-central/rev/776f0d952040
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 1022939 - Add ARIA markup for gaia-radio and give example for radio menu items.
========
https://hg.mozilla.org/integration/gaia-central/rev/f0c067a8de44
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #20220 from crdlc/bug-1022474
Bug 1022474 - Cannot add an e.me app to the homescreen via wrapper
========
https://hg.mozilla.org/integration/gaia-central/rev/1ed317d49f0a
Author: crdlc <crdlc@tid.es>
Desc: Bug 1022474 - Cannot add an e.me app to the homescreen via wrapper
2014-06-11 09:41:13 -07:00
Ed Morley
38d7d214af
Merge latest green fx-team changeset and mozilla-central; a=merge
2014-06-11 17:29:15 +01:00
Ed Morley
2b8182380e
Merge latest green b2g-inbound changeset and mozilla-central; a=merge
2014-06-11 17:14:10 +01:00
B2G Bumper Bot
7c168b8977
Bumping manifests a=b2g-bump
2014-06-11 08:44:05 -07:00
B2G Bumper Bot
0694c7f6f5
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c600a2871b21
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #20368 from arcturus/bug-1023908
Bug 1023908 - [Contacts] Disable interminent integration test r=rik
========
https://hg.mozilla.org/integration/gaia-central/rev/9db605e46a0e
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 1023908 - [Contacts] Disable interminent integration test
========
https://hg.mozilla.org/integration/gaia-central/rev/88fa6799f71d
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #20234 from crdlc/bug-1022390
Bug 1022390 - [Vertical] Cancel download of apps
========
https://hg.mozilla.org/integration/gaia-central/rev/7144e5a59a2b
Author: crdlc <crdlc@tid.es>
Desc: Bug 1022390 - [Vertical] Cancel download of apps
2014-06-11 08:41:22 -07:00
Ed Morley
32dc936979
Merge latest green inbound changeset and mozilla-central; a=merge
2014-06-11 16:13:26 +01:00
B2G Bumper Bot
6da9103349
Bumping manifests a=b2g-bump
2014-06-11 07:53:13 -07:00
B2G Bumper Bot
78d7f51807
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b8275b26a982
Author: gitmai <mri@tid.es>
Desc: Merge pull request #20298 from gitmai/bug-1008987-import-vcard
Bug 1008987 - [Contacts][Merger] Thumbnail on contacts list disappear wh...
r=jmcf
========
https://hg.mozilla.org/integration/gaia-central/rev/995c11726c4c
Author: mai <mri@tid.es>
Desc: Bug 1008987 - [Contacts][Merger] Thumbnail on contacts list disappear when importing same vCard/.vcf file several times
========
https://hg.mozilla.org/integration/gaia-central/rev/f5049ee5486f
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20249 from TheoChevalier/patch-3
Bug 1017918 - Add mai (Maithili) to Gaia languages
========
https://hg.mozilla.org/integration/gaia-central/rev/4f95c7b62d28
Author: Théo Chevalier <theo.chevalier11@gmail.com>
Desc: Bug 1017918 - Add mai (Maithili) to Gaia languages
========
https://hg.mozilla.org/integration/gaia-central/rev/4479cb0315b6
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #19727 from DouglasSherk/1005823-emergency-call
Bug 1005823 - [Dialer] Fix emergency calls with no SIM card. r=rik
========
https://hg.mozilla.org/integration/gaia-central/rev/00c18f2e8f69
Author: DouglasSherk <github@sherk.me>
Desc: Bug 1005823 - [Dialer] Fix emergency calls with no SIM card. r=rik
2014-06-11 07:53:02 -07:00
Gijs Kruitbosch
923ea4cf97
Bug 1020803 - make test only wait for popuphidden if the popup isn't already closed, rs=firebot,test-only
2014-06-11 13:46:22 +01:00
B2G Bumper Bot
8318652b34
Bumping manifests a=b2g-bump
2014-06-11 05:31:14 -07:00
B2G Bumper Bot
e275bddfe9
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/489903115b80
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1022132 - Disable test_a11y_unlock_to_homescreen.py
2014-06-11 05:25:59 -07:00
Dan Minor
dfcf1ceeb4
Bug 919595 - Stop skipping cppunit test TestTXMgr.cpp on Android; r=ehsan
2014-06-11 07:12:31 -04:00
B2G Bumper Bot
e2d84fcb29
Bumping manifests a=b2g-bump
2014-06-11 03:56:37 -07:00
B2G Bumper Bot
7db68d95f3
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/80ec483ebdf6
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #20301 from arcturus/bug-1020471
Bug 1020471 - WebrtcClient is not defined r=jmcf
========
https://hg.mozilla.org/integration/gaia-central/rev/4d2e7508fb3b
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1020471 - WebrtcClient is not defined
========
https://hg.mozilla.org/integration/gaia-central/rev/4c22359dee83
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #19968 from r-gaia-cs/bug-1019993
Bug 1019993 - Correct compositekey to compositeKey.
r=rudylu
========
https://hg.mozilla.org/integration/gaia-central/rev/bc4a124a8686
Author: Raniere Silva <raniere@ime.unicamp.br>
Desc: Bug 1019993 - Correct compositekey to compositeKey
Replace compositekey with compositeKey to follow interCaps coding
style guidelines.
2014-06-11 03:51:24 -07:00
Florian Quèze
51d8be3f01
Bug 1017560 - Choosing the same language will modify the state of Show Translation button, r=felipe.
2014-06-11 12:15:36 +02:00
Shashank Sabniveesu
87c6213671
Bug 1022214 - Remove the obsolete mTabstripCloseButton property. r=dao
2014-06-11 11:55:44 +02:00
B2G Bumper Bot
9709188a94
Bumping manifests a=b2g-bump
2014-06-11 02:29:13 -07:00
B2G Bumper Bot
6e7f6ea552
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/09d0d10233df
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #19761 from wilsonpage/1016393
Bug 1016393 - [Camera] Fix unit tests with a newer mocha
========
https://hg.mozilla.org/integration/gaia-central/rev/010b2a7ddf17
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1016393 - [Camera] Fix unit tests with a newer mocha
2014-06-11 02:26:09 -07:00
Ed Morley
331e17980a
Merge mozilla-central and b2g-inbound
2014-06-11 10:10:59 +01:00
Ed Morley
79089ba89e
Merge mozilla-central and fx-team
2014-06-11 10:10:34 +01:00
Ed Morley
fe08db8fc3
Bug 984528 - Touch CLOBBER file for rename of manifestdestiny -> manifestparser; a=clobber
2014-06-11 09:58:02 +01:00
B2G Bumper Bot
5ef8a04182
Bumping manifests a=b2g-bump
2014-06-11 01:31:31 -07:00
B2G Bumper Bot
1f9ada7179
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/bca9de42a115
Author: Fernando Campo <fernando.campo@telefonica.com>
Desc: Merge pull request #20238 from fcampo/import-merged-981674
Bug 981674 - [Contacts] Merged-name-contact imported is not is not shown fine (r=jmcf)
========
https://hg.mozilla.org/integration/gaia-central/rev/f00c31ac4f7d
Author: Fernando Campo <fernando.campo@telefonica.com>
Desc: Bug 981674 - [Contacts] Contact's name merged to another one previously then exported to sd card and imported again, is not shown fine
2014-06-11 01:26:25 -07:00
B2G Bumper Bot
97b842d5f6
Bumping manifests a=b2g-bump
2014-06-11 01:06:30 -07:00
B2G Bumper Bot
1d37c44f86
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e6fc71a3fe2e
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #20329 from gasolin/issue-1023238
Bug 1023238 - Remember my choice is not the default option pre-selected ..., r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/ae25fb338fca
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1023238 - Remember my choice is not the default option pre-selected in GUM permission
2014-06-11 01:01:34 -07:00
B2G Bumper Bot
17e3bb9a87
Bumping manifests a=b2g-bump
2014-06-11 00:59:00 -07:00
Ting-Yu Lin
ce82097dee
Bug 960897 - Add marionette test cases for touch caret. r=roc, r=mdas
...
Add marionette test cases for touch caret feature in bug 924692. Test
cases cover <input>, <textarea>, and contenteditable elements with
touch caret enabled and disabled.
Enlarge touch caret expiration time to 60 seconds to avoid intermittent
test failures in test cases which need to move touch caret.
Thanks Phoebe Chang <natsuki011077@gmail.com> for the WIP patch.
Thanks C.J. Ku <cku@mozilla.com> for various suggestions.
Run tests on browser manually:
./mach marionette-test layout/base/tests/marionette/test_touchcaret.py
2014-06-11 02:48:00 -04:00
Antonio M. Amaya
b22cb213b8
Bug 833633 - Remember permissions granted by users for PROMPT_ACTION through an update. r=ferjm
2014-06-11 04:47:00 -04:00
B2G Bumper Bot
13cad9c25c
Bumping manifests a=b2g-bump
2014-06-11 07:26:45 -07:00
B2G Bumper Bot
c373517914
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6e191494a8df
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #20139 from wilsonpage/1021284
Bug 1021284 - [camera] [flame] spinner appears after every photo capture
========
https://hg.mozilla.org/integration/gaia-central/rev/7a3d9c17024b
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1021284 - [camera] [flame] spinner appears after every photo capture
2014-06-11 07:16:38 -07:00
Alexandre Lissy
16d313fb97
Bug 1023857 - Add dosfstools dependency for usbdisk.img on Flame r=catlee a=qa
...
--HG--
extra : amend_source : 1f0e28649bc68bcfa805112da841d02630a86c8c
2014-06-11 06:52:00 +01:00
Alexandre Lissy
b0f9f38f28
Bug 1023857 - Add dosfstools dependency for usbdisk.img on Flame r=catlee
2014-06-11 06:52:00 +01:00
B2G Bumper Bot
a3f523b0c7
Bumping manifests a=b2g-bump
2014-06-11 06:41:43 -07:00
B2G Bumper Bot
3cf5ec0b77
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6ac60fe55430
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #20294 from chirarobert/tap_mp_icon
Bug 1023208 - [v2.0][v2.1] Fix test_marketplace_launch failure
========
https://hg.mozilla.org/integration/gaia-central/rev/255cd65fd715
Author: chirarobert <robert.chira@softvision.ro>
Desc: Bug 1023208 - [v2.0][v2.1] Fix test_marketplace_launch failure
2014-06-11 06:36:26 -07:00
Wes Kocher
dc91247abc
Back out three changesets (bug 932208) for robocop-1 failures
...
* * *
Backed out changeset d1e57e3cbba1 (bug 932208)
* * *
Backed out changeset aa4dc866e852 (bug 932208)
* * *
Backed out changeset 09caceb50f73 (bug 932208)
2014-06-10 19:04:07 -07:00
Wes Kocher
a70e6e8720
Merge m-c to fx-team
2014-06-10 18:58:39 -07:00
Wes Kocher
c9f1714389
Merge fx-team to m-c a=merge
2014-06-10 18:47:36 -07:00
Wes Kocher
a31895d720
Merge b2g-inbound to m-c a=merge
2014-06-10 18:37:54 -07:00
Wes Kocher
482f0c3456
Back out and reland changeset 99eee26d1017 (bug 1023472) so I can get around the m-c commit hook by adding a=merge
2014-06-10 18:27:19 -07:00
Richard Newman
9200daae01
Bug 1021922 - Follow-up: remove some debug logging I missed. r=trivial
2014-06-10 17:39:42 -07:00