Commit graph

1537 commits

Author SHA1 Message Date
Cheng Zhao
363fabdcb4 Merge branch 'offscreen-rendering' of https://github.com/MaxWhere/electron into merge-offscreen 2016-08-03 10:09:48 +09:00
Milan Burda
87c9926fe8 Move Toggle Fullscreen to the bottom of the View menu 2016-08-02 18:08:41 +02:00
gellert
8eed91d87a Merge remote-tracking branch 'upstream/master' into speedup-gpu 2016-08-02 14:59:03 +02:00
Cheng Zhao
84bb82866d docs: the callbacks 2016-08-02 14:44:06 +09:00
Cheng Zhao
56b1abd64a Merge pull request #6685 from electron/document-contents-zoom
Implement and Document the zoom methods that are mapped to the webContents object
2016-08-02 14:41:09 +09:00
Cheng Zhao
7ac28b53e6 Merge pull request #6683 from gabriel/master
Add isVisible() to app.dock
2016-08-02 12:33:36 +09:00
Samuel Attard
b59f37de98 Document the async versions of getZoomFactor and getZoomLevel 2016-08-02 13:04:21 +10:00
Samuel Attard
a1f5ca1ad2 Document the zoom methods that are mapped to the webContents object 2016-08-02 12:28:13 +10:00
Gabriel Handford
7bde92deb9 Add isVisible() to app.dock 2016-08-01 15:22:37 -07:00
Milan Burda
e7322edb3a docs: Improve ICO size list 2016-08-01 13:13:40 +02:00
gellert
439ad94afe Merge remote-tracking branch 'upstream/master' into speedup-gpu 2016-08-01 12:00:34 +02:00
Heilig Benedek
0eacee0058 add documentation for changes 2016-08-01 02:18:19 +02:00
Heilig Benedek
2b05be64b4 add documentation for changes 2016-08-01 02:14:45 +02:00
gellert
35ee99265e adds tests for osr 2016-07-31 17:10:53 +02:00
gellert
f60d791fa8 adds docs for osr 2016-07-31 00:22:34 +02:00
Milan Burda
e428d5db4f docs: fix argument types 2016-07-29 11:56:32 +02:00
Yuya Ochiai
29d66eb0d0 📝 Add recommended sizes for Windows ICO icons
For #6396
Please refer to https://msdn.microsoft.com/en-us/library/windows/desktop/dn742485(v=vs.85).aspx
[ci skip]
2016-07-28 23:22:41 +09:00
Cheng Zhao
e73bd00854 Merge pull request #6629 from electron/download-item-get-save-path
Set download item save path to selected path from dialog
2016-07-28 15:23:43 +09:00
Kevin Sawicki
4e9b19074f Make downloadItem.getSavePath() public 2016-07-27 17:33:36 -07:00
Cheng Zhao
bf20bbc247 Merge pull request #6623 from electron/shortcut
Add shell.writeShortcutLink/readShortcutLink APIs
2016-07-28 08:48:52 +09:00
DaveJ
42640b6170 docs: Add click handler to tray window example 2016-07-27 23:56:00 +01:00
DaveJ
322fe36dea docs: Fix undefined variables 2016-07-27 23:23:26 +01:00
Dave Jeffery
4823b5582f docs: Explain how to use highlightMode with BrowserWindow
As discussed on https://github.com/electron/electron/pull/6620
2016-07-27 21:35:13 +01:00
Cheng Zhao
eadffc6db8 docs: icon and iconIndex have to be set together 2016-07-27 19:49:17 +09:00
Cheng Zhao
d6234e11df docs: shell.writeShortcutLink/readShortcutLink 2016-07-27 16:47:24 +09:00
Cheng Zhao
b8bafbc5a3 Merge pull request #6620 from electron/tray-highlight-toggle
Add option to always highlight the tray icon
2016-07-27 10:49:38 +09:00
Cheng Zhao
99b523176b Merge pull request #6619 from electron/web-contents-copy-image-at
Add webContents.copyImageAt(x, y)
2016-07-27 10:15:38 +09:00
Kevin Sawicki
0ff6b87f8c Update tray.setHighlightMode docs 2016-07-26 13:59:19 -07:00
Kevin Sawicki
31564f079f Document webContents.copyImageAt(x,y) 2016-07-26 12:08:05 -07:00
Zeke Sikelianos
c3f26df577 standardize electron-capturer doc snippets 2016-07-26 09:49:02 -07:00
Zeke Sikelianos
06a354a2eb standardize all javascript blocks in English docs 2016-07-26 09:48:19 -07:00
Vadim Macagon
6cc68638e7 Normalize string quotes in desktopCapturer docs
Missed one string in my previous PR :(
2016-07-26 11:57:39 +07:00
Cheng Zhao
2b0cd97bb8 Merge pull request #6593 from enlight/improved-desktop-capturer-docs
Improve readability, and add a link to the navigator.getUserMedia API
2016-07-26 13:35:54 +09:00
Vadim Macagon
89309244b5 Improve the desktopCapturer docs
Made minor improvements to readability, and added a link to the
`navigator.getUserMedia` docs on MDN for convenience.
2016-07-26 10:48:38 +07:00
Luke Page
c365aa85c2 Clarify the default arguments for popup
The null / -1 defaults weren't very helpful, so changed to follow other documentation and write the behaviour if that param is missing.
2016-07-25 13:57:38 +02:00
Cheng Zhao
729b84f2ca Merge pull request #6576 from electron/browser-window-proxy-docs
Fix BrowserWindowProxy documentation
2016-07-25 16:55:49 +09:00
Cheng Zhao
a30997867f Merge pull request #6573 from electron/native-image-doc
Fix documentation for NativeImage
2016-07-25 16:55:09 +09:00
Cheng Zhao
fd8cc63ca9 Merge pull request #6558 from deepak1556/session_proxy_patch
session: add proxyBypassRules option to setProxy api
2016-07-25 16:03:50 +09:00
Cheng Zhao
c497765dea Merge pull request #6524 from liusy182/painted-event-6426
add "view-painted" event to WebContent.
2016-07-25 16:02:50 +09:00
Zeke Sikelianos
a2ffab40f9 use an instance-variable-style name for BrowserWindowProxy 2016-07-22 15:00:10 -07:00
Zeke Sikelianos
9432cb9170 use standard-style javascript in nativeImage doc 2016-07-22 13:47:05 -07:00
Zeke Sikelianos
9ca0fbaeb7 fix capitalization and headings for NativeImage class 2016-07-22 13:42:27 -07:00
Cheng Zhao
99ec841a8e Merge pull request #6342 from electron/chrome52
Upgrade to Chrome 52
2016-07-22 08:53:33 -06:00
liusy182
6e83f454d7 documentation error pointed out in issue #6541 2016-07-21 22:46:46 +08:00
Cheng Zhao
b57665330c Merge branch 'master' into chrome52 2016-07-21 05:34:36 -06:00
deepak1556
aa6d79a3d8 session: add proxyBypassRules option to setProxy api 2016-07-21 10:14:54 +05:30
Cheng Zhao
a0c5749ac1 Merge pull request #6547 from electron/update-web-view-docs
docs: Update nodeintegration of web-view-tag.md
2016-07-20 05:18:47 -06:00
Cheng Zhao
99524bf490 Merge pull request #6540 from mattslay/patch-1
Update file-object.md
2016-07-20 05:13:43 -06:00
Cheng Zhao
e9e67179c3 docs: Update nodeintegration of web-view-tag.md
webview is now disabled when nodeIntegration is off.
2016-07-20 05:13:05 -06:00
Matt Slay
0e24d148fd Update file-object.md
Added a for loop to iterate over the array of files, which allows processing of multiple files being dropped over the "holder" div.
2016-07-19 23:51:58 -05:00