187902 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
B2G Bumper Bot	3520238706	Bumping manifests a=b2g-bump	2014-06-11 13:56:22 -07:00
B2G Bumper Bot	cfbd15687e	Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ... ======== https://hg.mozilla.org/integration/gaia-central/rev/d108bbdfe550 Author: Hubert Figuière <hub@figuiere.net> Desc: Merge pull request #20366 from hfiguiere/Bug1023878 Bug 1023878 - make sure we stop if the make targets fail. r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/83a3b15ea18e Author: Hubert Figuière <hub@figuiere.net> Desc: Bug 1023878 - make sure we stop if the make targets fail.	2014-06-11 13:51:53 -07:00
B2G Bumper Bot	7055034697	Bumping manifests a=b2g-bump	2014-06-11 12:14:09 -07:00
B2G Bumper Bot	851360459b	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	d32b221e90	Bumping manifests a=b2g-bump	2014-06-11 11:49:24 -07:00
B2G Bumper Bot	73bb055778	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	fa23bfa116	Bumping manifests a=b2g-bump	2014-06-11 11:37:17 -07:00
B2G Bumper Bot	c7d9aa509d	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	802b1509ed	Bumping manifests a=b2g-bump	2014-06-11 11:06:35 -07:00
B2G Bumper Bot	f2144d320d	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	446d6e3518	Merge mozilla-central and b2g-inbound	2014-06-11 18:06:52 +01:00
B2G Bumper Bot	23a9eb00b3	Bumping manifests a=b2g-bump	2014-06-11 09:44:06 -07:00
B2G Bumper Bot	7794bcc93f	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	382d0ba8d2	Merge latest green fx-team changeset and mozilla-central; a=merge	2014-06-11 17:29:15 +01:00
Ed Morley	970f69844d	Merge latest green b2g-inbound changeset and mozilla-central; a=merge	2014-06-11 17:14:10 +01:00
B2G Bumper Bot	d93c00cf2e	Bumping manifests a=b2g-bump	2014-06-11 08:44:05 -07:00
B2G Bumper Bot	dc753ebfc7	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	3ac740dd8d	Merge latest green inbound changeset and mozilla-central; a=merge	2014-06-11 16:13:26 +01:00
B2G Bumper Bot	9b33f170ba	Bumping manifests a=b2g-bump	2014-06-11 07:53:13 -07:00
B2G Bumper Bot	b79e246b03	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	a308af3a3c	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	9f5141bf78	Bumping manifests a=b2g-bump	2014-06-11 05:31:14 -07:00
B2G Bumper Bot	52d448e276	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	67f33729cf	Bug 919595 - Stop skipping cppunit test TestTXMgr.cpp on Android; r=ehsan	2014-06-11 07:12:31 -04:00
B2G Bumper Bot	1692968557	Bumping manifests a=b2g-bump	2014-06-11 03:56:37 -07:00
B2G Bumper Bot	649f6d8a01	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	d72733a216	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	aaab06bdc3	Bug 1022214 - Remove the obsolete mTabstripCloseButton property. r=dao	2014-06-11 11:55:44 +02:00
B2G Bumper Bot	341bb82e2e	Bumping manifests a=b2g-bump	2014-06-11 02:29:13 -07:00
B2G Bumper Bot	cb917a915e	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	b5cbfad97d	Merge mozilla-central and b2g-inbound	2014-06-11 10:10:59 +01:00
Ed Morley	533841067d	Merge mozilla-central and fx-team	2014-06-11 10:10:34 +01:00
Ed Morley	e0d8727f73	Bug 984528 - Touch CLOBBER file for rename of manifestdestiny -> manifestparser; a=clobber	2014-06-11 09:58:02 +01:00
B2G Bumper Bot	de83d05c98	Bumping manifests a=b2g-bump	2014-06-11 01:31:31 -07:00
B2G Bumper Bot	5551f11be0	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	41b6409fed	Bumping manifests a=b2g-bump	2014-06-11 01:06:30 -07:00
B2G Bumper Bot	e20c760ee4	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	372845e04f	Bumping manifests a=b2g-bump	2014-06-11 00:59:00 -07:00
Ting-Yu Lin	0c30fcf209	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	aaae4a79a0	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	404db5d945	Bumping manifests a=b2g-bump	2014-06-11 07:26:45 -07:00
B2G Bumper Bot	243198f322	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	ec4fce1189	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	2db0a47e2e	Bug 1023857 - Add dosfstools dependency for usbdisk.img on Flame r=catlee	2014-06-11 06:52:00 +01:00
B2G Bumper Bot	f7d1c7d302	Bumping manifests a=b2g-bump	2014-06-11 06:41:43 -07:00
B2G Bumper Bot	6de6d2a69c	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	c131f3f588	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	fc3c9b85dd	Merge m-c to fx-team	2014-06-10 18:58:39 -07:00
Wes Kocher	c37442c812	Merge fx-team to m-c a=merge	2014-06-10 18:47:36 -07:00
Wes Kocher	1065aa48a9	Merge b2g-inbound to m-c a=merge	2014-06-10 18:37:54 -07:00