Commit Graph

38601 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
4ae0332034 Merge mozilla-central to fx-team 2015-11-09 14:59:44 +01:00
Carsten "Tomcat" Book
4d6f05d2f8 merge mozilla-inbound to mozilla-central a=merge 2015-11-09 14:55:30 +01:00
Gijs Kruitbosch
d47b63ada3 Bug 1221500 - followup: re-enable inadvertently-disabled-test, rs=green try
https://treeherder.mozilla.org/#/jobs?repo=try&revision=5aa4d4df6383

--HG--
extra : commitid : BbH691kPhC3
extra : rebase_source : a1cb16735b599c5ab6bda4f7527e86ffb3d3342c
2015-11-09 11:11:12 +00:00
Harshit Bansal
5bef1f4b9f Bug 1216955 - Use chrome override for download-glow-menuPanel-XPVista7.png. r=dao 2015-11-07 09:15:36 +01:00
Eduard Hanu
814319bd6d Bug 1218189 - Remove unused abouthome-search-panel. r=ntim,dao 2015-11-07 09:14:49 +01:00
Fernando Campo
88c0ef837d Bug 1221732 - Long page titles wrap in the panel conversation list, ui-r=sevaan, r=dmose 2015-11-06 13:57:07 -08:00
Ryan VanderMeulen
dcca1994a7 Bug 1222198 - Update pdf.js to version 1.2.68. r=bdahl, r=Mossop
--HG--
extra : rebase_source : 27058d7e12388176763eda7cb3a769f6bf9017b1
2015-11-05 17:22:25 -05:00
Dan Mosedale
c4b8c9e1e5 Bug 1147167-Upgrade React in Hello to 0.13.3, r=Standard8
--HG--
rename : browser/components/loop/content/shared/libs/react-0.12.2.js => browser/components/loop/content/shared/libs/react-0.13.3.js
2015-11-06 12:23:03 -08:00
Gijs Kruitbosch
eb15932c91 Bug 1221500 - followup: allow space for permanent banner, fix tests to deal with this, rs=bustage on a CLOSED TREE
--HG--
extra : commitid : LyDaMmjP8YQ
extra : rebase_source : c461bd4a82a6501405242d6759cda3fd21e54fbd
2015-11-06 19:25:17 +00:00
Kit Cambridge
332295eb06 Bug 1221330 - Show the app icon in the XUL upgraded notifications alert. r=MattN
--HG--
extra : commitid : 5Cg8eZkKxQd
2015-11-06 10:30:25 -08:00
Gijs Kruitbosch
1a3e2a1935 Bug 1221500 - use a notification to warn people that panorama is going away, r=ttaubert
--HG--
extra : commitid : 7FUHBIsSUnq
extra : rebase_source : 3c98289ff36fae3e6e35c28998ef153e99c30b66
2015-11-04 11:53:52 +00:00
Carsten "Tomcat" Book
672fda2c82 Merge mozilla-central to fx-team 2015-11-06 13:59:27 +01:00
Carsten "Tomcat" Book
9dc37c18b3 merge mozilla-inbound to mozilla-central a=merge 2015-11-06 13:44:30 +01:00
Wes Kocher
0614b39cb9 Merge m-c to fx-team, a=merge
--HG--
extra : commitid : J6I6LGuQcFJ
2015-11-05 18:47:26 -08:00
Wes Kocher
0069e6af90 Merge inbound to central, a=merge
--HG--
extra : commitid : 426lsCwC1FX
2015-11-05 18:44:24 -08:00
Dan Mosedale
c872896c82 Bug 1222146-Allow test API server to be run on env-specified port, r=Mardak, NPOTB, DONTBUILD 2015-11-05 13:12:20 -08:00
Sebastian Hengst
c1930e0865 Bug 1221970 - Black stripe on the right side of About Firefox dialog in unofficial builds - port (bug 890973). r=Gijs 2015-11-05 13:19:21 +01:00
Sebastian Hengst
6a801a6e69 Bug 682741 - About dialog: Properly format and align version number in right-to-left languages. r=Gijs 2015-11-05 16:22:51 +01:00
Manuel Casas
0a57d4effa Bug 1221168 - The pen menu item on a given conversation should say "Delete", NOT "Delete conversation". r=Standard8 2015-11-06 11:52:24 +00:00
Manuel Casas
54526e2604 Bug 1213984 - Remove contacts code from Loop's backend. r=Standard8 2015-11-06 11:52:24 +00:00
Mark Hammond
65f4ae086d Bug 1209204 - allow the focus manager to select the appropriate control to focus after editing the computer name in Sync prefs. r=MattN 2015-11-06 14:13:55 +11:00
Fernando Campo
4a37911a65 Bug 1065714 - Right-click context menu should not be shown on Panel nor Conversation [r=Mardak]
--HG--
extra : amend_source : 6d4d38370df44f74ff0d526d2b48206483c7fdd5
2015-11-05 08:12:20 -08:00
Paolo Amadini
ed9f1a7319 Bug 1212520 - Rewrite browser_bug906190.js with Tasks and re-enable it on Linux. r=tanvi
--HG--
extra : commitid : KwtdVX1rAqN
extra : rebase_source : 29d92eac6235fc3a02c033b3e651d79dc72023c3
2015-11-03 14:47:37 +00:00
Gijs Kruitbosch
4ad811ac72 Bug 1219479 - revert linux !important removal per bug feedback, rs=dao
--HG--
extra : commitid : BwY7onnGZgV
2015-11-05 14:25:15 +00:00
Carsten "Tomcat" Book
0a34392a9e Merge mozilla-central to fx-team 2015-11-05 12:17:28 +01:00
Carsten "Tomcat" Book
bb068eacd7 merge mozilla-inbound to mozilla-central a=merge
--HG--
rename : browser/locales/en-US/chrome/browser/devtools/memory.properties => devtools/client/locales/en-US/memory.properties
2015-11-05 11:58:55 +01:00
J. Ryan Stinnett
d083caf63c Bug 1182722 - Add quotes for l10n-check on Windows. rs=glandium on a CLOSED TREE 2015-11-05 02:16:11 -06:00
Wes Kocher
7ea3443ef1 Merge m-c to inbound, a=merge CLOSED TREE
--HG--
extra : commitid : BZ5NGmCCVs
2015-11-05 18:45:29 -08:00
Mike Hommey
762aba02cd Bug 1221453 - Use ObjDirPaths for GENERATED_INCLUDES and merge with LOCAL_INCLUDES. r=gps 2015-11-06 09:59:21 +09:00
Dan Mosedale
30c2dfa81b Bug 1220878-switch Hello from React.addons.classSet to classnames package, r=edilee,gerv 2015-11-05 16:40:11 -08:00
J. Ryan Stinnett
5d6812e289 Bug 1182722 - Move DevTools l10n files. r=ochameau,glandium,Pike,bgrins
Move DevTools l10n files under /devtools/client and /devtools/shared.
A script is attached to the bug for l10n repos to migrate their strings.

--HG--
rename : browser/locales/en-US/chrome/browser/devtools/VariablesView.dtd => devtools/client/locales/en-US/VariablesView.dtd
rename : browser/locales/en-US/chrome/browser/devtools/aboutdebugging.dtd => devtools/client/locales/en-US/aboutdebugging.dtd
rename : browser/locales/en-US/chrome/browser/devtools/aboutdebugging.properties => devtools/client/locales/en-US/aboutdebugging.properties
rename : browser/locales/en-US/chrome/browser/devtools/animationinspector.dtd => devtools/client/locales/en-US/animationinspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/animationinspector.properties => devtools/client/locales/en-US/animationinspector.properties
rename : browser/locales/en-US/chrome/browser/devtools/app-manager.properties => devtools/client/locales/en-US/app-manager.properties
rename : browser/locales/en-US/chrome/browser/devtools/appcacheutils.properties => devtools/client/locales/en-US/appcacheutils.properties
rename : browser/locales/en-US/chrome/browser/devtools/canvasdebugger.dtd => devtools/client/locales/en-US/canvasdebugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/canvasdebugger.properties => devtools/client/locales/en-US/canvasdebugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd => devtools/client/locales/en-US/connection-screen.dtd
rename : browser/locales/en-US/chrome/browser/devtools/connection-screen.properties => devtools/client/locales/en-US/connection-screen.properties
rename : browser/locales/en-US/chrome/browser/devtools/debugger.dtd => devtools/client/locales/en-US/debugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/debugger.properties => devtools/client/locales/en-US/debugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/device.properties => devtools/client/locales/en-US/device.properties
rename : browser/locales/en-US/chrome/browser/devtools/eyedropper.properties => devtools/client/locales/en-US/eyedropper.properties
rename : browser/locales/en-US/chrome/browser/devtools/filterwidget.dtd => devtools/client/locales/en-US/filterwidget.dtd
rename : browser/locales/en-US/chrome/browser/devtools/filterwidget.properties => devtools/client/locales/en-US/filterwidget.properties
rename : browser/locales/en-US/chrome/browser/devtools/font-inspector.dtd => devtools/client/locales/en-US/font-inspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/graphs.properties => devtools/client/locales/en-US/graphs.properties
rename : browser/locales/en-US/chrome/browser/devtools/har.properties => devtools/client/locales/en-US/har.properties
rename : browser/locales/en-US/chrome/browser/devtools/inspector.dtd => devtools/client/locales/en-US/inspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/inspector.properties => devtools/client/locales/en-US/inspector.properties
rename : browser/locales/en-US/chrome/browser/devtools/jsonview.properties => devtools/client/locales/en-US/jsonview.properties
rename : browser/locales/en-US/chrome/browser/devtools/layoutview.dtd => devtools/client/locales/en-US/layoutview.dtd
rename : browser/locales/en-US/chrome/browser/devtools/markers.properties => devtools/client/locales/en-US/markers.properties
rename : browser/locales/en-US/chrome/browser/devtools/memory.properties => devtools/client/locales/en-US/memory.properties
rename : browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd => devtools/client/locales/en-US/netmonitor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/netmonitor.properties => devtools/client/locales/en-US/netmonitor.properties
rename : browser/locales/en-US/chrome/browser/devtools/performance.dtd => devtools/client/locales/en-US/performance.dtd
rename : browser/locales/en-US/chrome/browser/devtools/performance.properties => devtools/client/locales/en-US/performance.properties
rename : browser/locales/en-US/chrome/browser/devtools/projecteditor.properties => devtools/client/locales/en-US/projecteditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/promisedebugger.dtd => devtools/client/locales/en-US/promisedebugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/promisedebugger.properties => devtools/client/locales/en-US/promisedebugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/responsiveUI.properties => devtools/client/locales/en-US/responsiveUI.properties
rename : browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd => devtools/client/locales/en-US/scratchpad.dtd
rename : browser/locales/en-US/chrome/browser/devtools/scratchpad.properties => devtools/client/locales/en-US/scratchpad.properties
rename : browser/locales/en-US/chrome/browser/devtools/shadereditor.dtd => devtools/client/locales/en-US/shadereditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/shadereditor.properties => devtools/client/locales/en-US/shadereditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/shared.properties => devtools/client/locales/en-US/shared.properties
rename : browser/locales/en-US/chrome/browser/devtools/sourceeditor.dtd => devtools/client/locales/en-US/sourceeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties => devtools/client/locales/en-US/sourceeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/storage.properties => devtools/client/locales/en-US/storage.properties
rename : browser/locales/en-US/chrome/browser/devtools/styleeditor.dtd => devtools/client/locales/en-US/styleeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/styleeditor.properties => devtools/client/locales/en-US/styleeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd => devtools/client/locales/en-US/styleinspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/tilt.properties => devtools/client/locales/en-US/tilt.properties
rename : browser/locales/en-US/chrome/browser/devtools/toolbox.dtd => devtools/client/locales/en-US/toolbox.dtd
rename : browser/locales/en-US/chrome/browser/devtools/toolbox.properties => devtools/client/locales/en-US/toolbox.properties
rename : browser/locales/en-US/chrome/browser/devtools/webConsole.dtd => devtools/client/locales/en-US/webConsole.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webaudioeditor.dtd => devtools/client/locales/en-US/webaudioeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webaudioeditor.properties => devtools/client/locales/en-US/webaudioeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/webconsole.properties => devtools/client/locales/en-US/webconsole.properties
rename : browser/locales/en-US/chrome/browser/devtools/webide.dtd => devtools/client/locales/en-US/webide.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webide.properties => devtools/client/locales/en-US/webide.properties
rename : toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd => devtools/shared/locales/en-US/csscoverage.dtd
rename : toolkit/locales/en-US/chrome/global/devtools/csscoverage.properties => devtools/shared/locales/en-US/csscoverage.properties
rename : toolkit/locales/en-US/chrome/global/devtools/debugger.properties => devtools/shared/locales/en-US/debugger.properties
rename : toolkit/locales/en-US/chrome/global/devtools/gcli.properties => devtools/shared/locales/en-US/gcli.properties
rename : toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties => devtools/shared/locales/en-US/gclicommands.properties
rename : toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties => devtools/shared/locales/en-US/styleinspector.properties
extra : commitid : 8hcm3tr7AAi
2015-11-04 15:35:53 -06:00
Carsten "Tomcat" Book
87ca5f5de2 Merge mozilla-central to mozilla-inbound 2015-11-05 12:15:35 +01:00
David Rajchenbach-Teller
d9df20222c Bug 1216250 - Limit amount of DOM Storage data stored by Session Restore. r=ttaubert
DOM Storage is a pretty inefficient and memory-hungry storage mechanism. Session Store attempts to record DOM Storage for each tab, which leads to (possibly very large) objects being serialized once to be sent from frame/content to parent and once to be sent from the main thread to the I/O thread. This is a suspect behind a number of crashes (see bug 1106264 for a discussion on the topic).

This patch limits the amount of DOM Storage that Session Restore attempts to store. We perform a quick estimate on the amount of memory needed to serialize DOM Storage and prevent storage larger than ~10M chars being sent from frame/content to the parent. Once this patch has landed, we will need to watch FX_SESSION_RESTORE_DOM_STORAGE_SIZE_ESTIMATE_CHARS to find out whether our threshold is meaningful.

--HG--
extra : transplant_source : %26%07%ADzjT%A9%E3%B9%B9%EC%9D%97n%23%B5%F2%DAZ%CD
2015-10-20 14:15:17 +02:00
Tom Tromey
e319a63952 Bug 937586 - make Size column in network monitor accurate; r=vporof 2015-11-04 14:24:52 -07:00
Sebastian Hengst
ecbe67ac71 Backed out changeset 7733bfad72ab (bug 1217129) for bc4, bc7 etc. failures. r=backout
browser_ext_browserAction_simple.js | Test timed out
followed by many more browser_ext_* errors
2015-11-04 21:12:02 +01:00
J. Ryan Stinnett
43ddea6efd Bug 1207976 - Remove /themes from DevTools URLs. r=ochameau 2015-11-04 12:04:20 -06:00
Blake Winton
0f85e4ac59 Bug 1217129 - Toggle WebExtensions panels on click instead of re-opening them. ui-r=maritz, r=billm
--HG--
extra : commitid : 4ZOLh4JtxLr
extra : rebase_source : 38fdb0fd12d6011471ef164c664e88667ef16deb
2015-10-22 10:07:02 -04:00
Gijs Kruitbosch
a1fa424de9 Bug 1088763 - fix yosemite inactive window style, r=mconley, ui-r=shorlander
--HG--
extra : commitid : DOomuagOxmi
extra : rebase_source : 349fadf7f06992400b2a54932e59b9a00317bf5a
extra : amend_source : f708e1c4aa80ad3bb3d1c7dc9fcffbaab7a06191
2015-10-28 16:09:37 +01:00
Gijs Kruitbosch
9832c33859 Bug 1219479 - fix hidpi styling of toolbar buttons in overflow menu, r=dao
--HG--
extra : commitid : BK8n0EkA8Rd
extra : rebase_source : 46b74138e1a0bea8cad4cb4660a3b308db7cb464
extra : amend_source : 69098360c5a490c8344f55ae6c4cd3dc59afb2f7
2015-11-02 15:25:09 +00:00
Carsten "Tomcat" Book
84680f0783 Merge mozilla-central to fx-team 2015-11-04 12:43:13 +01:00
Carsten "Tomcat" Book
3e11f2fe34 merge mozilla-inbound to mozilla-central a=merge 2015-11-04 11:59:46 +01:00
Pablo Almenar
77a625b250 Bug 691849 - Replace custom Sync notification bars with standard ones. r=markh 2015-11-04 10:21:47 +01:00
Harshit Bansal
bb6abcc604 Bug 1220080 - Remove aboutCertError_sectionExpanded.png, aboutCertError_sectionCollapsed.png and aboutCertError_sectionCollapsed-rtl.png. r=dao 2015-11-04 07:27:30 +01:00
David Critchley
fd0911db0b Bug 1215487 - Fix Mozilla logo in Chrome for Loop Standalone [r=Mardak] 2015-11-03 14:29:55 -08:00
Carsten "Tomcat" Book
edda9042a5 Merge mozilla-central to fx-team 2015-11-03 12:13:10 +01:00
Carsten "Tomcat" Book
8232c46c4f merge mozilla-inbound to mozilla-central a=merge 2015-11-03 12:00:30 +01:00
Ralph Giles
87aab4c5c3 Bug 1219530 - Add MOZ_RUST_MP4PARSE feature switch. r=glandium
Add a switch to enable the rust mp4parser code through confvars.sh
and set this for browser targets. Configure will only pass this
through as a CPP define if the rust toolchain is available.

The MOZ_RUST check is hoisted to an outer conditional to
make it cleaner to add other features.

Thanks to zhoubcfan@163.com for the typo fix in configure.in.
2015-11-02 16:40:00 -08:00
Wes Kocher
902cea2b9a Merge m-c to fx-team, a=merge
--HG--
extra : commitid : 9dyZ3yocWTJ
2015-11-02 15:59:07 -08:00
Wes Kocher
3696443a14 Merge inbound to m-c a=merge
--HG--
extra : commitid : Iy93sktRpdv
2015-11-02 15:12:16 -08:00
Matthew Noorenberghe
01ef877e80 Bug 1220884 - Friendlier string for the notification upgrade UI. r=kitcambridge
--HG--
extra : commitid : JK4ut7t32GU
2015-11-02 15:16:15 -08:00