Commit Graph

148604 Commits

Author SHA1 Message Date
Gijs Kruitbosch
6a4e83eb90 Merge mozilla-central and ux 2013-09-23 17:59:41 +02:00
Carsten "Tomcat" Book
ef0fd7c4b7 merge b2g-inbound to mozilla-central 2013-09-23 13:10:00 +02:00
Carsten "Tomcat" Book
083981729e merge fx-team to mozilla-central 2013-09-23 13:07:38 +02:00
Patrick Brosset
26764583e3 Bug 911982 - Markup mutations are flashed in the markup-view; r=jwalker 2013-09-23 08:46:12 +02:00
Gaia Pushbot
7add929e53 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/c062ff36671e
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #12354 from jrburke/bug919006-xhr-responsetype

Bug 919006 -  Email fails to start properly (xhr needs responseType text) r=me, due to severity of blockage due to recent gecko change (nothing in gaia to roll back), and simplicity of the fix.

========

https://hg.mozilla.org/integration/gaia-central/rev/ac9afe74fc10
Author: jrburke <jrburke@gmail.com>
Desc: Bug 919006 -  Email fails to start properly (xhr needs responseType text)
2013-09-22 19:35:23 -07:00
Phil Ringnalda
942d8409ef Merge m-i to m-c 2013-09-22 09:13:14 -07:00
Phil Ringnalda
c3a2ecbb97 Merge b-i to m-c 2013-09-22 09:10:47 -07:00
Ehsan Akhgari
375d25b349 Bug 918928 - Minimize the #includes in netwerk/base; r=mcmanus 2013-09-21 23:04:57 -04:00
Ehsan Akhgari
db700056d9 Bug 918926 - Minimize the crashreporter #includes; r=ted 2013-09-21 23:04:10 -04:00
Phil Ringnalda
bc7b010710 Backed out 6 changesets (bug 881804) for frequent Android reftest and jsreftest timeouts
Backed out changeset 61972f55702b (bug 881804)
Backed out changeset 0a24b77d4ffb (bug 881804)
Backed out changeset 9fbcf4c3ab2b (bug 881804)
Backed out changeset 2d35068ec2f5 (bug 881804)
Backed out changeset 757790e5cd9f (bug 881804)
Backed out changeset d8a172fa4b20 (bug 881804)
2013-09-21 17:59:14 -07:00
Timothy Nikkel
d37d48d6ae Bug 919129. Fix nsLayoutUtils::UpdateImageVisibilityForFrame so that it doesn't expand the image rect so much by replacing it with the scroll port rect. r=matspal 2013-09-21 16:20:22 -05:00
Gijs Kruitbosch
8ed9c0d44e Merge mozilla-central and ux 2013-09-21 13:14:05 +02:00
ffxbld
ede4ff2180 No bug, Automated HSTS preload list update from host bld-linux64-ec2-437 - a=hsts-update 2013-09-21 03:30:50 -07:00
ffxbld
1491dc9b91 No bug, Automated blocklist update from host bld-linux64-ec2-315 - a=blocklist-update 2013-09-21 03:27:52 -07:00
Nicholas D. Matsakis
0e38863b88 Bug 898349 - Correct indentation nits r=jandem 2013-09-21 05:34:30 -04:00
Wes Kocher
7055da100e Merge inbound to m-c 2013-09-20 19:28:47 -07:00
Gaia Pushbot
eb447d8cdb Bumping gaia.json for 4 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/c8947b9d62ee
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12349 from lightsofapollo/skip-calendar-test

Disable calendar create event integration test

========

https://hg.mozilla.org/integration/gaia-central/rev/1e1cf4cfcdd5
Author: James Lal <james@lightsofapollo.com>
Desc: Disable calendar create event integration test

========

https://hg.mozilla.org/integration/gaia-central/rev/c5a16edb7747
Author: Jim Porter <squibblyflabbetydoo@gmail.com>
Desc: Merge pull request #11847 from jimporter/music-nowplaying-notification

Bug 902974 - [Music] [User Story] Utility tray should display information about the song when music is still playing; r=alive, r=lightsofapollo, r=dkuo, r=djf, ui-r=robmac

========

https://hg.mozilla.org/integration/gaia-central/rev/42356a0e37df
Author: Jim Porter <jporter@mozilla.com>
Desc: Bug 902974 - [Music] [User Story] Utility tray should display information about the song when music is still playing
2013-09-20 17:15:26 -07:00
Gaia Pushbot
bafc167f46 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/745cc77244fc
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12343 from lightsofapollo/marionette-vbump

vbump 0.15.5

========

https://hg.mozilla.org/integration/gaia-central/rev/33ed527d4d6d
Author: James Lal <james@lightsofapollo.com>
Desc: vbump 0.15.5
2013-09-20 16:50:24 -07:00
Ryan VanderMeulen
20d93fe2a7 Merge m-c to b2g-inbound. 2013-09-20 18:18:02 -04:00
J. Ryan Stinnett
37628306ab Bug 902421 - Add correct paths to the SrcdirProvider. r=dcamp 2013-09-20 16:22:48 -05:00
Philipp Kewisch
80be5dcb15 Fix bug 880930 - JS debugger: RootActor needs its own definition of windowMediator. r=past
--HG--
extra : transplant_source : %DB%A6H%9B%D0%00%B4%24t%89%F0r%F9r%9C%7B%EC%07%D0%1B
2013-09-21 11:38:32 +02:00
Phil Ringnalda
0e2b15772a Merge m-c to fx-team 2013-09-22 09:16:05 -07:00
Victor Porof
40aa8fa68c Bug 918797 - Trying to prettify html irrevocably loses the source until the page is refreshed (relanded), r=fitzgen 2013-09-22 19:03:15 +03:00
Victor Porof
7fcb94d6dc Backed out bug 918797, r=me 2013-09-21 19:07:52 +03:00
Gabor Krizsanits
5616363374 Bug 892214 - atob and btoa for Sandbox. r=bholley 2013-09-21 15:25:47 +02:00
Gabor Krizsanits
1abd57715b Bug 892214 - Moving atob to xpcprivate. r=bholley 2013-09-21 15:25:47 +02:00
Gabor Krizsanits
a74540b370 Bug 892214 - Rename DOMConstructors to GlobalProperties in SandboxOptions. r=bholley, r=mossop 2013-09-21 15:25:46 +02:00
Victor Porof
87208d76b2 Bug 918797 - Fix the potential source of oranges in browser_dbg_pretty-print-06.js, r=me 2013-09-21 12:44:01 +03:00
Victor Porof
ba5c8bd04c Bug 918797 - Trying to prettify html irrevocably loses the source until the page is refreshed, r=fitzgen 2013-09-21 10:18:32 +03:00
Victor Porof
bd3ddd825c Bug 918329 - Fix XUL 'inline #text child' warning for the toolbarbutton element added in bug 762761, r=fitzgen 2013-09-21 10:18:32 +03:00
Drew Willcoxon
b6619c50b7 Bug 917610 - Fix backgroundPageThumbsContent.js's use of nsIDOMWindowUtils.preventFurtherDialogs. r=markh 2013-09-20 21:40:37 -07:00
Ryan VanderMeulen
037e6edcf3 Merge m-c to fx-team. 2013-09-20 18:19:03 -04:00
Nick Fitzgerald
c952e05260 Bug 904144 - Parse "//# sourceURL=..." directives and expose them on Debugger.Source; r=jimb 2013-09-20 14:57:09 -07:00
Nick Fitzgerald
5777d1f3d2 Backed out changeset 951090191c43 because of bad commit message. 2013-09-20 14:53:22 -07:00
Nick Fitzgerald
22547e920c Backout 66f4df0b1cb8 because the commit message got mangled; r=me 2013-09-20 14:48:48 -07:00
Nick Fitzgerald
7d7100f266 Bug 904144 - Parse //# 2013-09-20 14:45:14 -07:00
Gaia Pushbot
10ce720489 Bumping gaia.json for 1 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/8b2bd22d66c5
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 917835 - [Clock] Timer does not honor settings - r=jugglinmike
2013-09-20 13:40:22 -07:00
Gaia Pushbot
e360e615cc Bumping gaia.json for 1 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/06dcd80b7ed3
Author: Evelyn Eastmond <evelyn@bocoup.com>
Desc: Bug 916774 - [Clock] Rename StopwatchPanel => Stopwatch.Panel, move Timer.Panel to timer_panel.js

r=jugglinmike
2013-09-20 13:05:24 -07:00
Gaia Pushbot
5733ff7e68 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/0b0977000fca
Author: Gregor Wagner <anygregor@gmail.com>
Desc: Merge pull request #12340 from JonHylands/jhylands-867320-calendar-reference-workloads-master

Bug 867320 - Calendar reference workloads

========

https://hg.mozilla.org/integration/gaia-central/rev/6c00ecfa5fa3
Author: Jon Hylands <jhylands@mozilla.com>
Desc: Bug 867320 - Calendar reference workloads
2013-09-20 12:55:22 -07:00
Lucas Rocha
cd587cae73 Bug 917455 - Implement missing getInt() in TopSitesCursorWrapper (r=sriram) 2013-09-20 15:53:04 -04:00
Lucas Rocha
086b9db6de Bug 917806 - Immediately update title in toolbar on ACTION_VIEW intent (r=margaret) 2013-09-20 15:22:35 -04:00
Margaret Leibovic
d503f21634 merge m-c to fig 2013-09-20 14:50:31 -04:00
Mihai Sucan
fb0b0ea758 Bug 918210 - Fix for intermittent browser_webconsole_bug_613642_maintain_scroll.js | Test timed out; r=me 2013-09-20 21:49:29 +03:00
Ryan VanderMeulen
e36683f8cf Merge fx-team to m-c. 2013-09-20 14:10:27 -04:00
Gaia Pushbot
930f0a6b9b Bumping gaia.json for 1 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/6403da25727a
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 910430 - Re-enable three clock tests for TBPL. a=test-only
2013-09-20 10:45:26 -07:00
Chenxia Liu
b0ca674a57 Bug 917398 - Include test for new top sites. r=margaret 2013-09-20 13:35:29 -04:00
Chenxia Liu
e580cd6ad4 Bug 917398 - Update tests for the new tabs in about:home. r=margaret 2013-09-20 13:35:29 -04:00
Mike de Boer
762447b45d Bug 872548: panel subviews should swipe to the right in RTL mode. r=gkruitbosch 2013-09-20 18:04:41 +02:00
Gaia Pushbot
ac84be43dc Bumping gaia.json for 1 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/2815b6670938
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 917525 - Unxfail test_clock_turn_on_off_alarm.py r=bebe
2013-09-20 08:25:22 -07:00
Gaia Pushbot
092a834b77 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/0c00581fd96b
Author: AlinT <trifandreialin@gmail.com>
Desc: Bug 918727 - Update locator for video tests. r=zcampbell r=fstrugariu

========

https://hg.mozilla.org/integration/gaia-central/rev/44a20b1eb2d8
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 918755 - Unxfail camera tests due to bug 913418 was fixed. r=zcampbell r=atrif
2013-09-20 07:50:22 -07:00