Commit Graph

160017 Commits

Author SHA1 Message Date
Wes Kocher
57c984f4f3 Merge inbound to m-c 2013-12-09 20:35:07 -08:00
Wes Kocher
355389a051 Merge fx-team to m-c 2013-12-09 20:30:59 -08:00
Wes Kocher
ce006187a8 Merge b2g-inbound to m-c 2013-12-09 20:27:38 -08:00
Michael Comella
7a2f204cff Bug 947527 - Correct waitForPageIndex output per device. r=margaret 2013-12-09 17:52:36 -08:00
Stefan Sobering
f45491b9cd Bug 947610 - Fix spelling error in "remember password" string. r=mcomella 2013-12-10 10:29:38 -05:00
Wes Kocher
eac7c5c7e8 Backed out changeset 144cec97320a (bug 853356) despite the CLOSED TREE 2013-12-09 16:33:28 -08:00
Gaia Pushbot
3adacb9ab6 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/bb23044d4a97
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #14325 from mikehenrty/bug-942325-iframe

Bug 942325 - only display action buttons for non-frames, r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/3d89070e4873
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 942325 - update the style of net_error page when in an iframe

========

https://hg.mozilla.org/integration/gaia-central/rev/6a3bd7eb4d1b
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #14457 from Joshua-S/bug-946614

[Bug 946614] - [Email] Div Lines too dark. r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/e6a24bb3e2ba
Author: Joshua Smith <joshua-smith@verizon.net>
Desc: [Bug 946614] - [Email] Div Lines too dark
2013-12-09 15:00:31 -08:00
Masatoshi Kimura
cc6ac49bd5 Bug 942791 - Revert bug 427089. r=mayhemer 2013-12-10 07:47:30 +09:00
Ryan VanderMeulen
feef0a14f7 Merge m-c to fx-team. 2013-12-09 17:47:08 -05:00
Ryan VanderMeulen
3abf7905b0 Merge m-c to b2g-inbound. 2013-12-09 17:45:06 -05:00
Ryan VanderMeulen
72c57be9ea Merge m-c to inbound. 2013-12-09 17:43:44 -05:00
Gaia Pushbot
5c029fc2a8 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0c1ad0982497
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #14462 from wanderview/build-push-userjs

Bug 947204: Push user.js file using full path.  r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/da2f69045beb
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 947204: Push user.js file using full path.
2013-12-09 14:35:24 -08:00
Mark Hammond
95e28634b1 Bug 947764 - correct support-files for devtools commandline tests. r=ted 2013-12-10 09:27:06 +11:00
Ryan VanderMeulen
ca386608b9 Merge b2g-inbound to m-c. 2013-12-09 17:26:11 -05:00
Gaia Pushbot
fa2b5743cc Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/23c17f5b65cd
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #14493 from rnowm/contacts-add-oh

Bug 947819 - [Contacts] add overflow: hidden to contcats list r=jmcf

========

https://hg.mozilla.org/integration/gaia-central/rev/38f9d9acb28a
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 947819 - [Contacts] add overflow: hidden to contcats list
2013-12-09 14:25:36 -08:00
Mark Hammond
28aad2e698 Bug 947770 - Move remaining tests in browser/devtools/webconsole/test/Makefile.in to manifest. r=ted 2013-12-10 09:24:37 +11:00
Ryan VanderMeulen
40fc3e7026 Backed out changesets 572624d76edf and 17a5f2e554e8 (bug 934739) for causing bug 947879. 2013-12-09 17:24:14 -05:00
Ryan VanderMeulen
15c6ad1a06 Merge fx-team to m-c. 2013-12-09 17:21:47 -05:00
Gaia Pushbot
07660d6dd8 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/439b2b10e787
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14481 from davidflanagan/bug925216

Bug 925216: Add media info display to Gallery; change styles in Video to match r=pdahiya

========

https://hg.mozilla.org/integration/gaia-central/rev/e8c59ed2e2cc
Author: Tom Herold <therold@mozilla.com>
Desc: Bug 925216: Add media info display to Gallery; change styles in Video to match

add 1rem more padding on the left for dt and dd elements
2013-12-09 14:15:24 -08:00
Fabrice Desré
96e317fb1e Bug 937917 - [Facebook] Fix to support https and enable webshare activities r=ferjm 2013-12-09 14:05:14 -08:00
Ryan VanderMeulen
3083eba130 Merge inbound to m-c. 2013-12-09 16:45:25 -05:00
Gaia Pushbot
c2fea6f0f7 Bumping gaia.json for 6 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f256e81f9717
Author: Fabrice Desré <fabrice@desre.org>
Desc: Merge pull request #14285 from cvan/updated-mkt

Bug 942355 - Update Marketplace packaged app for dual SIM detection

========

https://hg.mozilla.org/integration/gaia-central/rev/98279412a1f1
Author: Chris Van <cvan@mozilla.com>
Desc: Bug 942355 - Update Marketplace packaged app for dual SIM detection r=fabrice

========

https://hg.mozilla.org/integration/gaia-central/rev/1736c7d1848b
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #14079 from pivanov/bug-939209

Bug 939209 - [Action Icons - Email] Remove shadows from action icons

========

https://hg.mozilla.org/integration/gaia-central/rev/af99e39bd529
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 939209 - [Action Icons - Email] Remove shadows from action icons

========

https://hg.mozilla.org/integration/gaia-central/rev/ddb2560e03ee
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #14513 from pivanov/bug-930600

Bug 930600 - Add new Illustrative Wallpapers for v.1.3

========

https://hg.mozilla.org/integration/gaia-central/rev/5dfcaaefd217
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 930600 - Add new Illustrative Wallpapers for v.1.3
2013-12-09 13:35:24 -08:00
Reuben Morais
e13d566dfb Bug 697343 - Create the results array in the content scope. r=bz
--HG--
extra : rebase_source : ae7ae1873dc1f074942858c4d37e3d5916e42223
2013-12-09 19:01:42 -02:00
Gaia Pushbot
c018348b9c Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d5f4a104c0b7
Author: John Ford <john@johnford.info>
Desc: Revert "Bug 944718 - [Cost Control] Broken access to usage widget from utility tray"

This reverts commit 31bbe151e0d92da77a86a3ae5edb6ca2643968e1.

This is the second time this patch has been backed out.
https://bugzilla.mozilla.org/show_bug.cgi?id=944718
2013-12-09 13:00:39 -08:00
Ryan VanderMeulen
c8ccf9a4f8 Backed out changeset 772c30e9e812 (bug 944255) for mochitest-mc orange. 2013-12-09 15:54:27 -05:00
Gaia Pushbot
fce1be3d2e Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/accec2f4e2c8
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Merge pull request #14479 from gregorwagner/disable

No Bug - Disable intermittent failures

========

https://hg.mozilla.org/integration/gaia-central/rev/108ef7a4ce0d
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Disable failing tests
2013-12-09 12:25:30 -08:00
Panos Astithas
0a88c79288 Forbid out of order resumption when two tabs with the same URL are paused (bug 947830); r=fitzgen
Also consider stepping actions as a form of resumption and require the same resumption order when multiple tabs are paused.
2013-12-09 22:09:15 +02:00
Ben Turner
91c13f9e27 Bug 924089 - 'Enable SharedWorker by default', r=ehsan+khuey. 2013-12-09 11:57:40 -08:00
Gaia Pushbot
23043066e7 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0f6e26b5cac9
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Merge pull request #14509 from etiennesegonzac/bug-946769-edge-gesture-intermittent

Bug 946769 - Trying to fix the egde gesture marionette test intermittent

========

https://hg.mozilla.org/integration/gaia-central/rev/81b96ac56ca3
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 946769 - Trying to fix the egde gesture marionette test intermittent
by properly waiting for the end of the last app-opening transition.
2013-12-09 11:50:23 -08:00
Kyle Huey
2d95621d99 Back out bug 935692 on this CLOSED TREE due to warnings-as-errors bustage. 2013-12-09 10:46:18 -08:00
Alex Keybl
ae274cdec0 Bug 946719 - [xh, an] Add Xhosa and Aragonese locales to shipped-locales r=pike CLOSED TREE 2013-12-09 13:41:37 -05:00
Alex Keybl
b260957292 Merging in version bump NO BUG 2013-12-09 13:38:06 -05:00
Ehsan Akhgari
3a2fb26a27 Bug 947735 - Build modules/libmar/ in unified mode; r=bbondy 2013-12-09 13:30:27 -05:00
Christian Holler
ad413f4eb3 Bug 938144 - Handle OOM in jit::SplitCriticalEdges. r=jandem
--HG--
extra : rebase_source : 0ea568be9d54dd072deaa5f02e1185f51007a81b
2013-12-09 19:28:18 +01:00
Kyle Huey
8ebc554a7b Bug 935692: Don't try to fire error events on non-DOM globals. r=bent 2013-12-09 10:20:06 -08:00
Jan de Mooij
79ca20b5d1 Bug 947683 - Fix --disable-threadsafe shell builds on OS X. r=luke 2013-12-09 18:56:24 +01:00
Christian Holler
0f196a3032 Bug 947958 - Use masm.propagateOOM to handle OOM in CodeGenerator. r=bhackett
--HG--
extra : rebase_source : 9f3d339b6e15777cff52465f846eaf55f90e8ed7
2013-12-09 17:29:06 +01:00
Christian Holler
f26bacb2e1 Bug 947902 - Make dumpHeapComplete ignore file args with --fuzzing-safe. r=billm
--HG--
extra : rebase_source : b9c2d6441b095cb92586a24d4471174c65173195
2013-12-09 19:27:51 +01:00
Kyle Huey
bc5929c9db Bug 935692: Don't try to fire error events on non-DOM globals. r=bent 2013-12-09 13:59:15 -08:00
Ryan VanderMeulen
6a9240e026 Backed out changesets fabe232e8be9 and c84b0156ae03 (bug 793860) for Linux mochitest-2 timeouts. 2013-12-09 16:40:03 -05:00
Brian Hackett
a34ee4edbc Bug 946939 - Disable test that is intermittently failing under GGC. 2013-12-09 13:32:50 -08:00
Dan Gohman
e6eb490d48 Bug 943442 - IonMonkey: Step the instruction id by 1 instead of 2, to facilitate using it as a table index. r=dvander 2013-12-09 13:12:25 -08:00
Dan Gohman
87e00e0c35 Bug 943442 - IonMonkey: Compare instructions by pointer rather than by id(), since it's equivalent. r=dvander 2013-12-09 13:12:25 -08:00
Dan Gohman
52f969a7bb Bug 935834 - IonMonkey: Fix a memory leak and revive an offset calculation. r=bhackett 2013-12-09 13:12:25 -08:00
Brian Grinstead
46c44615a9 Bug 945697 - Responsive Mode gets closed when ESC is used in the varilable view, in the rule view and in the variable view. r=paul 2013-12-09 10:06:11 -06:00
John Hood
16436371e3 Bug 944375 - Add a new const array named TAB_OBSERVING to SessionStore.jsm and modify onTabAdd and onTabRemove to subscribe to events by iterating through this array. r=ttaubert 2013-12-09 12:19:15 -08:00
Patrick Wang
17da5c5b69 Bug 930282: Part 3: Don't fork after xpcom shutdown. r=khuey 2013-12-09 22:42:48 +08:00
Carsten "Tomcat" Book
d1456b8d0e Backed out changeset 85196889c598 (bug 945042) PGO Test Bustage 2013-12-09 13:00:59 +01:00
Carsten "Tomcat" Book
4408dc08c5 merge b2g-inbound to mozilla-central 2013-12-09 09:32:02 +01:00
Carsten "Tomcat" Book
488d65b1a9 merge mozilla-inbound to mozilla-central 2013-12-09 09:02:29 +01:00