Commit Graph

136337 Commits

Author SHA1 Message Date
Ryan VanderMeulen
214023b763 Merge m-c and inbound on a CLOSED TREE. 2013-06-24 21:00:41 -04:00
Ryan VanderMeulen
6c70133936 Merge birch and m-c. 2013-06-24 20:59:43 -04:00
Phil Ringnalda
bbedbe6765 Back out 398f67b7d629 (bug 874669) for mochitest-1 failures
CLOSED TREE
2013-06-24 17:26:36 -07:00
William Lachance
2c446feb25 Bug 885365 - Print testroot in mochitest/reftest for fennec;r=jmaher 2013-06-24 17:15:40 -07:00
Phil Ringnalda
f0f4f8bebd Merge m-c to m-i 2013-06-24 16:51:59 -07:00
Brian Smith
5db0a4cf74 Bug 759257: Remove InfallableCopyCString [sic], r=hurley 2013-06-24 16:46:08 -07:00
Gaia Pushbot
0fe5666050 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/72ed45c245c8
Author: John Ford <john@johnford.info>
Desc: Merge pull request #10539 from beber400/828915-fix-buttons-settings

fix bug 828915 - changed buttons style in Settings app

========

https://hg.mozilla.org/integration/gaia-central/rev/2fc97627d8bc
Author: beber400 <beber4c@gmail.com>
Desc: fix bug 828915 - changed buttons style in Settings app
2013-06-24 15:50:23 -07:00
Gaia Pushbot
87ee810739 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/0418622ce5f3
Author: John Ford <john@johnford.info>
Desc: Merge pull request #10494 from aajain/bug842551

Bug 884969 - SMS status report setting not getting updated correctly r=s...

========

https://hg.mozilla.org/integration/gaia-central/rev/8c1013fc95b9
Author: Anshul Jain <anshulj@codeaurora.org>
Desc: Bug 884969 - SMS status report setting not getting updated correctly r=schung

Change-Id: Id14aa62141b4f247f57e9b176c6be84a3b440339
2013-06-24 15:40:27 -07:00
Gaia Pushbot
e3122fb4b8 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/c9e0afc4d1f5
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #8726 from leob2g/Bug_852361_Device_is_shut_down_when_battery_level_become_two_percents

Bug 852361 - [System] Device is shut down when battery level become two percents

========

https://hg.mozilla.org/integration/gaia-central/rev/41bb7b46f7ed
Author: sungwoo.yoon <sungwoo.yoon@lge.com>
Desc: Bug 852361 - [System] When battery level become two percents, device is shut down
2013-06-24 14:00:23 -07:00
Gaia Pushbot
b409769f4f Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/2c1974f22ebb
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #10436 from rexboy7/fix-bug873301

Bug 873301 - [Video] Change path pattern with new device storage API on ... r=davidflanagan

========

https://hg.mozilla.org/integration/gaia-central/rev/217be4d4f6cb
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 873303 - [Video] Change path pattern with new device storage API on camera files
2013-06-24 13:15:23 -07:00
Gaia Pushbot
9e557db6e9 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/8b43df24bb79
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #10583 from KevinGrandon/bug_864751_add_profile_dir_define

Bug 864751 - Fix typo in Makefile

========

https://hg.mozilla.org/integration/gaia-central/rev/7c5d7781c327
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 864751 - Fix typo
2013-06-24 12:50:32 -07:00
Gaia Pushbot
1bcd9c66d9 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/4c52da9436b8
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #10498 from KevinGrandon/bug_864751_add_profile_dir_define

Bug 864751 - Add profile directory define

========

https://hg.mozilla.org/integration/gaia-central/rev/6b3559890576
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 864751 - Add profile directory define
2013-06-24 12:30:26 -07:00
Alex Keybl
b9c3fb2921 Merging in version bump NO BUG 2013-06-24 11:37:32 -07:00
Alex Keybl
2eb14a55a3 Added tag FIREFOX_AURORA_24_BASE for changeset 8d3810543edc 2013-06-24 11:36:44 -07:00
Tim Taubert
329c8ff36f merge m-c to fx-team 2013-06-24 14:29:27 -04:00
Tim Taubert
e9a9ebecd4 Bug 886376 - Reduce interval between swapping in a preloaded newtab page and preloading the next one; r=avih 2013-06-24 14:14:19 -04:00
Josh Matthews
af17c57cd0 Bug 886387, bug 886391, bug 886393 - Update missed IIDs for changed interfaces. 2013-06-24 19:07:03 +01:00
Ryan VanderMeulen
cfbe7ecee4 Merge m-c and fx-team. 2013-06-24 14:03:47 -04:00
Ryan VanderMeulen
b544b5db88 Merge birch and m-c. 2013-06-24 14:01:24 -04:00
Ryan VanderMeulen
25ad14f7a2 Merge inbound and m-c. 2013-06-24 14:00:41 -04:00
Gaia Pushbot
07134e1719 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/8625b71fabf9
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #10309 from lightsofapollo/bug-810007-disallow-zero-length-events

Bug 810007 - Disallow zero length events during event creation

========

https://hg.mozilla.org/integration/gaia-central/rev/0dd20d6fb26e
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 810007 - Disallow zero length events during event creation
2013-06-24 10:53:09 -07:00
Justin Wood
c8ef983178 Bug 885855 - [Build bustage] gfx\2d\RadialGradientEffectD2D1.h(9) : fatal error C1083: Cannot open include file: 'd2d1_1.h': No such file or directory. r=gps, f=InvisibleSmiley, f=Bas
--HG--
extra : rebase_source : aea4bba00ffa4701315ff563f31be6425a439a23
2013-06-24 13:29:09 -04:00
Gregory Szorc
fad7743b3f Bug 885572 - Fix upgrade_mercurial() in bootstrapper; r=khuey
DONTBUILD (NPOTB)

--HG--
extra : rebase_source : 3aa99eb3b3d2d273e4882779bb527ac96f757ef6
2013-06-24 10:23:14 -07:00
Nick Alexander
0aec49720d Merge m-c to s-c 2013-06-24 10:19:38 -07:00
Nick Alexander
5dea3e088b Bug 873569 - Follow-up: don't delete assets/omni.ja during unpack. r=me
The issue is that in INNER_UNMAKE_PACKAGE I was deleting
assets/omni.ja, which is needed in INNER_MAKE_PACKAGE.  This breaks
language repacks.  This fix should at least allow repacks to proceed
further.
2013-06-24 09:55:21 -07:00
Gaia Pushbot
982da74856 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/c18a9987518a
Author: Dale  Harvey <dale@arandomurl.com>
Desc: Merge pull request #10390 from gasolin/issue-853349

Issue 853349 - [camera] open with record mode when trigger camera with record/pick activity by video type. r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/e4d3dc707fae
Author: gasolin <gasolin@gmail.com>
Desc: Bug 853349 - [camera] open in record mode when trigger camera with record activity by video type
2013-06-24 09:00:23 -07:00
Richard Newman
384b86cf52 Bug 886231 - Rename datareporting_fhr_summary to reflect string change (follow-up from Bug 879558). r=trivial 2013-06-24 08:40:35 -07:00
Gaia Pushbot
ed5dc06db8 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/116611d26a2d
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #10306 from dominickuo/bug-857674

Bug 857674 - [music] hide sublist and player before entering to search mode, r=RudyLu

========

https://hg.mozilla.org/integration/gaia-central/rev/3bf1574f342a
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 857674 - [music] hide sublist and player before entering to search mode
2013-06-24 08:15:22 -07:00
Gaia Pushbot
0f81eed754 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/ba989feb2a38
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #10481 from crh0716/882095

Bug 882095 - Restart the connection only when APN related settings changed

========

https://hg.mozilla.org/integration/gaia-central/rev/c3bdda6736a0
Author: crh0716 <crh0716@gmail.com>
Desc: Bug 882095 - Restart the connection only when APN related settings changed
2013-06-24 08:05:22 -07:00
Benjamin Smedberg
c45f618df8 Bug 880735 part S followup review comment - put the plugin doorhanger styles into shared/ 2013-06-24 10:40:26 -04:00
Benjamin Smedberg
a8d5039490 Bug 880735 part D followup: flod pointed out that I changed these strings without changing the key, and since changing the key is hard I'm just going to revert them for now and do something better in a followup. 2013-06-24 10:16:30 -04:00
Benjamin Smedberg
4d2e11188a Bug 880735 part S - Basic styling so that this can land - add classes to the binding for styling hooks and fix space handling. Make the buttons fill the space, limit the doorhanger size, and add whitespace/separators for the multi-plugin UI, r=jaws 2013-06-24 08:51:08 -04:00
Benjamin Smedberg
d0ea1dfb67 Bug 880735 test fixups:
* Add a test-only setter to the center-item XBL binding
* add a head.js function to remove plugin permissions for use in cleanup functions
* browser_pluginnotification.js - lots of fixes for the core feature tests
* Alter test_bug751809 not to assume that clicking the page overlay will directly activate the plugin
* Alter browser_CTP_plugins.js because disabled plugins now do show up in the plugin doorhanger
* remove browser_CTPScriptPlugin.js and supporting files because we no longer auto-pop based on scripting
* fix browser_CTP_drag_drop.js so that active plugins still show the doorhanger icon, and other fixup
* fix browser_bug743421.js to expect the doorhanger all the time and activate it correctly
* fix browser_bug752516.js to check for doorhanger activation instead of plugin activation
* remove browser_bug818009.js and supporting files because they are testing something that no longer exists
* alter browser_bug820497.js so that it shows the popup notification before checking .centerActions, since we populate that data lazily now
* browser_plugins_added_dynamically.js: remove the "activate all" tests which are no longer relevant and fix the rest to match the new doorhanger structure.
2013-06-24 08:51:07 -04:00
Benjamin Smedberg
45a6cc401e Bug 880735 part F - Remove extra functions, strings, and styles which are no longer needed, r=jaws 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
5e06298e31 Bug 880735 part D - New doorhanger frontend code. Removes all logic which shows the plugin doorhanger automatically, including on scripting. Always show the doorhanger when there is a plugin present on the page, even if that plugin is currently enabled. Make the "always" choices clear to the user. r=jaws 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
71c97abfa3 Bug 880735 part E - Use the new permissionmanager.updateExpireTime method to make sure that plugin permissions are renewed properly, r=johns 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
02de42afbc Bug 883420 - Add an API to set a new expireTime for an existing permission, r=ehsan sr=mounir 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
d2813956df Bug 880735 part C - Disabled plugins should be always disabled, site-specific permissions do not override them. I'm sorry for the churn from bug 875454. At least the logic is in one place and easy to fix! r=johns 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
84e3611c1a Bug 880735 part B - add .getPluginTagForType and make .getBlocklistStateForType scriptable, r=johns 2013-06-24 08:51:07 -04:00
Benjamin Smedberg
35c0784726 Bug 880735 part A - Add a .defaultFallbackType to plugins so that we can avoid re-implementing the ShouldPlay logic in the frontend code. r=johns 2013-06-24 08:51:07 -04:00
Ed Morley
d05662a389 Merge mozilla-central and inbound 2013-06-24 13:41:39 +01:00
Ed Morley
01c97440e9 Merge latest green birch changeset and mozilla-central 2013-06-24 13:36:45 +01:00
Nicolas B. Pierron
ec97c44287 Bug 829841 - Add an option to enable eager compilation in the browser. r=dvander 2013-06-24 05:13:05 -07:00
Robert Longson
c3ff7dd93d Bug 865901 - make nsSVGTextFrame2::mPositioningDirty and mPositioningUsesPercentages SVG frame state bits. r=cam 2013-06-24 12:20:38 +01:00
Gaia Pushbot
2ca38da36d Bumping gaia.json for 3 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d816bb323b9c
Author: crh0716 <crh0716@gmail.com>
Desc: Revert "Bug 872976 - Delay the timing of restoring connection to decrease the failure rate"

This reverts commit 9db0247970e19fb0d57e3eed4fa5bbbfd79f1ebe.

========

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

Bug 884728 - [Facebook] Linking feature is broken deleting all local inf...

========

https://hg.mozilla.org/integration/gaia-central/rev/b150f7f1e531
Author: crdlc <crdlc@tid.es>
Desc: Bug 884728 - [Facebook] Linking feature is broken deleting all local information for a contact
2013-06-24 03:25:22 -07:00
Gaia Pushbot
13e5d8af81 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/aa565b81260a
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #10397 from ednapiranha/bug883148

Bug 883148 - Refactor to a constant; fixed typo

========

https://hg.mozilla.org/integration/gaia-central/rev/23c63ce291cd
Author: Jen Fong-Adwent <jen@ednapiranha.com>
Desc: Bug 883148 - Refactor to a constant; fixed typo
2013-06-24 02:45:25 -07:00
Robert Longson
fd050c27d1 Bug 601131 - Hang with feTurbulence with huge numOctaves. r=roc 2013-06-24 10:42:22 +01:00
Gaia Pushbot
9f757674fc Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/20e2e86553d5
Author: Sam Joch <samuel@guiora.com>
Desc: Merge pull request #10400 from pivanov/bug-829023

Bug 829023 - [Settings] Don't use dividers to separate paragraphs in thesame text block | Follow up patch r=@samjoch

========

https://hg.mozilla.org/integration/gaia-central/rev/9b4b4948696f
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 829023 - [Settings] Don't use dividers to separate paragraphs in thesame text block | Follow up patch
2013-06-24 01:35:23 -07:00
David Zbarsky
e438b2ce3d Bug 788549 Part 14: Add a test for async opacity animations r=dbaron 2013-06-24 01:09:40 -07:00
Gaia Pushbot
c69904465d Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/bc36d7553ee6
Author: Dale  Harvey <dale@arandomurl.com>
Desc: Merge pull request #10435 from dominickuo/bug-880571

Bug 880571 - [video] handle error codes for video element. r=daleharvey

========

https://hg.mozilla.org/integration/gaia-central/rev/9eb8fb8941b2
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 880571 - [video] handle error codes for video element
2013-06-24 01:05:24 -07:00