Commit Graph

181249 Commits

Author SHA1 Message Date
Patrick Brosset
b5f5065758 Bug 971628 - Avoid exceptions when entering invalid property names in the rule-view; r=miker 2014-05-05 14:46:11 +02:00
Carsten "Tomcat" Book
c4665cdb35 Merge m-c to fx-team 2014-05-05 14:27:11 +02:00
Carsten "Tomcat" Book
cb85932802 merge b2g-inbound to mozilla-central 2014-05-05 14:23:27 +02:00
Carsten "Tomcat" Book
79ea1730c2 merge fx-team to mozilla-central 2014-05-05 14:22:03 +02:00
Carsten "Tomcat" Book
50071425b9 Backed out changeset a7b80bdc8a7c (bug 997328) for Android RC testfailures 2014-05-05 12:51:05 +02:00
Carsten "Tomcat" Book
971500f6cb Backed out changeset 2b5863a3f0ae (bug 997328) 2014-05-05 12:50:02 +02:00
B2G Bumper Bot
c1a7430d26 Bumping manifests a=b2g-bump 2014-05-05 02:16:26 -07:00
B2G Bumper Bot
c2c2487f41 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1003787 - [Contacts] Different texts to delete contacts: Delete X co...

========

https://hg.mozilla.org/integration/gaia-central/rev/a6acb4efcc8a
Author: crdlc <crdlc@tid.es>
Desc: Bug 1003787 - [Contacts] Different texts to delete contacts: Delete X contact?.. in title and text Remove in button
2014-05-05 02:10:52 -07:00
Carsten "Tomcat" Book
ec53620a35 Backed out changeset 79686836f1f7 "(bug 1005089) r=bz" for bustage on a CLOSED TREE
--HG--
extra : amend_source : 5170a31dc799f4401d30c8d6c4423dad2e84535f
2014-05-05 09:41:27 +02:00
Phil Ringnalda
e5faff071e Merge m-c to f-t 2014-05-04 17:16:16 -07:00
Phil Ringnalda
56b10ed203 Merge b-i to m-c 2014-05-04 17:13:16 -07:00
Monica Chew
1295971f2d Bug 1005364: Disable pinning for all mozilla properties (r=keeler) 2014-05-04 17:05:58 -07:00
Jared Wein
daa4d6d787 Backed out changeset 928eebe0592e (bug 738797) for failing browser_experiments.js. 2014-05-04 17:15:06 -05:00
B2G Bumper Bot
53e536700a Bumping manifests a=b2g-bump 2014-05-04 14:16:25 -07:00
B2G Bumper Bot
341f5cda7f Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1b0c17f90885
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1005708 - Disable intermittent failing test, Contacts shortcuts > touch touch on shortcuts shortcut text should change after moving some distance
2014-05-04 14:10:59 -07:00
Jared Wein
be2e5a84a1 Bug 738797 - Enable the in-content preferences by default. r=Unfocused 2014-05-04 15:54:29 -05:00
B2G Bumper Bot
bdfe7e62cb Bumping manifests a=b2g-bump 2014-05-04 13:06:14 -07:00
B2G Bumper Bot
8fa7e44b72 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b9b597834441
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 983171 - [Settings] Disable intermittent failing test in screen_lock_settings_test.js
2014-05-04 13:00:44 -07:00
B2G Bumper Bot
bfac5c75af Bumping manifests a=b2g-bump 2014-05-04 12:01:24 -07:00
B2G Bumper Bot
1ba06f1b5d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5a6fb77ccd6c
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Merge pull request #18860 from jaoo/1003023

 Bug 1003023 - [Sora] OMA CP - Parse provisioning document correctly. r=gsvelto

========

https://hg.mozilla.org/integration/gaia-central/rev/9e9f7835d248
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Bug 1003023 - [Sora] OMA CP - Parse provisioning document correctly
2014-05-04 11:56:01 -07:00
B2G Bumper Bot
893cb775bf Bumping manifests a=b2g-bump 2014-05-04 11:07:53 -07:00
Phil Ringnalda
28ed4f661d Bug 926155 followup, set the sticky pref so it still works in release builds
--HG--
extra : rebase_source : 28390cdf7de273c1358a699a7a697819df76e9ed
2014-05-04 09:11:44 -07:00
Brian Smith
a97bc4147c Bug 1005667: Fix build warning due to buggy test code in pkixtestutil.cpp, r=dholbert 2014-05-04 11:04:48 -07:00
Daniel Holbert
fb1252420a Bug 996945: Remove prohibition on flex-grow & flex-shrink properties transitioning between 0 and other values. r=mats 2014-05-04 09:12:32 -07:00
Daniel Holbert
c243f023e3 Bug 985304 part 3: Extend flexbox layout mochitest to cover cases with flex values that sum to less than 1. f=mats 2014-05-04 09:10:40 -07:00
Daniel Holbert
2eba58f98a Bug 985304 part 2: Make flex algorithm gracefully handle flex factors that sum to < 1. r=mats
When our flexibilities sum to a fraction < 1, we clamp the free space to be no
greater than that same fraction of the original free space. This effectively
makes us treat a flexibility of e.g. "0.01" as "1% of the original free space"
in that sort of situation (while still treating it as a normal flex factor if
the sum of the flex factors is greater than 1).
2014-05-04 09:10:28 -07:00
Daniel Holbert
4385fc88a0 Bug 985304 part 1: Shorten "flex weight" to "weight" in variable & function names. r=mats
The phrase "flex weight" used to be a term defined in the spec, but it's
long-since been replaced with "flex factor" and "scaled flex factor".

I'm now using the term "weight" to mean "flex factor, with any necessary scaling already done, ready to be used as a weight for apportioning free space".

I'm dropping the "flex" modifier from "flex weight" both for brevity & to make
it more clearly-distinguishable from actual "flex factor" usages in the code.
2014-05-04 09:10:28 -07:00
Daniel Holbert
613a3f6f4e Bug 985304 part 0: Drop "running" prefix on variable 'runningFlexWeightSum', for clarity. r=mats 2014-05-04 09:10:27 -07:00
B2G Bumper Bot
b7827d624d Bumping manifests a=b2g-bump 2014-05-04 04:42:56 -07:00
B2G Bumper Bot
a2b838a765 Bumping manifests a=b2g-bump 2014-05-04 04:16:23 -07:00
B2G Bumper Bot
bae3da8d57 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/da85955beafd
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #18749 from EverythingMe/bug1002470

[Bug 1002470] Support for extra page on left [r=ranbena]

========

https://hg.mozilla.org/integration/gaia-central/rev/1fea6cc32dc5
Author: Amir Nissim <amirnissim@gmail.com>
Desc: [Bug 1002470] Support for extra page on left [r=ranbena]
2014-05-04 04:10:48 -07:00
Phil Ringnalda
27c1fa6fb6 Merge m-c to b-i 2014-05-03 17:40:02 -07:00
Phil Ringnalda
154fef74b2 Merge b-i to m-c 2014-05-03 17:36:35 -07:00
Phil Ringnalda
be1c8eb709 Merge m-i to m-c 2014-05-03 17:35:09 -07:00
B2G Bumper Bot
1f3a0ef84f Bumping manifests a=b2g-bump 2014-05-03 16:16:25 -07:00
B2G Bumper Bot
5f70f4e3a9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1005311 - Update css error count

========

https://hg.mozilla.org/integration/gaia-central/rev/69741d5406b6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1005311 - Update css error count
2014-05-03 16:10:57 -07:00
David Burns
d6e3620d40 Bug 967813: Put the error reason in the message that is reported on TBPL for easier starring; r=philor 2014-05-03 21:02:38 +01:00
Till Schneidereit
a8b0a5dff9 Bug 1005472 - Make trace-logging work on OS X again. r=h4writer
--HG--
extra : rebase_source : 293de5fe9aed1df6da80a05953759b81e4c5d9c0
2014-05-03 16:09:34 +02:00
Till Schneidereit
74ebff051b Bug 1004503 - Backout of failed attempt to fix relazification-related crash. r=jandem
--HG--
extra : rebase_source : e3b1a9f60f34d0b366cbc4f3bb98212f714525ce
2014-05-03 16:09:33 +02:00
Mats Palmgren
2294d72e55 Bug 1000376 - part 4, Add some grid item tests. r=dholbert
These are only for detecting assertions/crashes for now since grid layout isn't implemented yet.

--HG--
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-whitespace-handling-1-ref.xhtml => layout/reftests/css-grid/grid-whitespace-handling-1-ref.xhtml
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-whitespace-handling-1a.xhtml => layout/reftests/css-grid/grid-whitespace-handling-1a.xhtml
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-whitespace-handling-1b.xhtml => layout/reftests/css-grid/grid-whitespace-handling-1b.xhtml
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-whitespace-handling-2-ref.xhtml => layout/reftests/css-grid/grid-whitespace-handling-2-ref.xhtml
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-whitespace-handling-2.xhtml => layout/reftests/css-grid/grid-whitespace-handling-2.xhtml
rename : layout/reftests/w3c-css/submitted/flexbox/support/ahem.css => layout/reftests/css-grid/support/ahem.css
rename : layout/reftests/w3c-css/submitted/flexbox/support/solidblue.png => layout/reftests/css-grid/support/solidblue.png
2014-05-03 13:42:33 +00:00
Mats Palmgren
68128d6d60 Bug 1000376 - part 3, s/FlexItemStyleFixup/FlexOrGridItemStyleFixup/ and corresponding comment changes. r=dholbert 2014-05-03 13:42:33 +00:00
Mats Palmgren
b0e008a8f9 Bug 1000376 - part 2, Implement frame construction part for anonymous grid items (reusing the anon flex item code). r=dholbert 2014-05-03 13:42:33 +00:00
Mats Palmgren
c02dccfb46 Bug 1000376 - part 1, Add -moz-anonymous-grid-item in the style system. r=dholbert 2014-05-03 13:42:33 +00:00
Mats Palmgren
dedc02abed Bug 1002607 - Increment the number of columns, 'column', only after we have seen a new token. r=simon.sapin 2014-05-03 13:42:32 +00:00
Mats Palmgren
3d2871ab00 Bug 1000431 - Add "layout.css.grid.enabled" to all.js, disabled by default. r=dholbert 2014-05-03 13:42:32 +00:00
ffxbld
b43b9dd445 No bug, Automated HSTS preload list update from host bld-linux64-spot-043 - a=hsts-update 2014-05-03 03:18:44 -07:00
ffxbld
5d80653390 No bug, Automated blocklist update from host bld-linux64-spot-020 - a=blocklist-update 2014-05-03 03:12:10 -07:00
B2G Bumper Bot
25a1d063bb Bumping manifests a=b2g-bump 2014-05-03 02:27:59 -07:00
B2G Bumper Bot
4d2ce48c92 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5262006180e3
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #18888 from etiennesegonzac/bug-1002459-hold-l10n

Bug 1002459 - Fixing an l10n issue with the hold button. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/b471d97fd7e1
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1002459 - Fixing an l10n issue with the hold button.
/!\ No change to the main en-US file.
2014-05-03 02:25:55 -07:00
Jan de Mooij
603f68a4fa Bug 1004923 part 5 - Reduce indentation level in PRMJ_Now. r=njn 2014-05-03 11:08:29 +02:00