Commit graph

2089 commits

Author SHA1 Message Date
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
66086880e2 Merge pull request #6575 from electron/asar-doc-fixes
fix wording in asar doc
2016-07-25 16:55:20 +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
3a9c57231e fix wording in asar doc 2016-07-22 14:52:43 -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
Anthony Tseng
42eb0c3eae serial number in hex string 2016-07-18 23:42:42 +08:00
liusi
d335d7d706 add "view-painted" event to WebContent. 2016-07-18 14:54:52 +08:00
Moriarty!~~
d10323b057 error link
> `[security introduction](../tutorial/security.md)`.
it should be `[security introduction](tutorial/security.md)`
2016-07-17 09:22:53 +08:00
Cheng Zhao
08491e1ceb Merge pull request #6511 from electron/more-docs-cleanup
Clean up API Docs
2016-07-16 09:57:04 +09:00
Kevin Sawicki
e24885b160 Mention how to reset thumbnail to entire window 2016-07-15 10:38:11 -07:00
liusi
154daa8d6a make Session::ClearStorageData's callback optional 2016-07-15 14:13:56 +08:00
Cheng Zhao
9eacd07eda Merge pull request #6489 from electron/webcontents-static-api
Document static methods on webContents
2016-07-15 11:02:00 +09:00
Cheng Zhao
52808d5342 Merge pull request #6499 from electron/drop-vista
Remove implicit references to Vista in docs
2016-07-15 10:20:14 +09:00
Cheng Zhao
d186a01815 Merge pull request #6497 from electron/windows-thumbnail
Add setThumbnailClip API on Windows
2016-07-15 10:18:39 +09:00
Cheng Zhao
5db758297f Merge pull request #6486 from MarshallOfSound/master
Add a getFeedURL API for the autoUpdater
2016-07-15 10:02:05 +09:00
Kevin Sawicki
297365b4f0 Add require example for webContents 2016-07-14 17:54:18 -07:00
Kevin Sawicki
4de4774325 Update headings/sections to follow docs styleguide 2016-07-14 17:46:58 -07:00
Cheng Zhao
7c56169633 Merge pull request #6495 from electron/link-to-boilerplates
link to boilerplates
2016-07-15 09:44:29 +09:00
Cheng Zhao
c3ed4b5527 Merge pull request #6493 from electron/elecron-devtools-installer
mention electron-devtools-installer as an alternative
2016-07-15 09:44:01 +09:00
Kevin Sawicki
1aa645522a Remove implicit references to Vista 2016-07-14 17:33:48 -07:00
Cheng Zhao
16e43a7f15 Merge pull request #6490 from wilsonpage/add-drop-text-support
Add support for dropped text in osx
2016-07-15 09:12:35 +09:00
Cheng Zhao
3ace677b41 Merge pull request #6474 from darkdh/cert_detail
Add more detail attributes for certificate-error
2016-07-15 08:45:36 +09:00
Zeke Sikelianos
7700c5e249 denote return type on process memory info methods methods 2016-07-14 16:10:19 -07:00
Zeke Sikelianos
595b827a13 Use common style to denote OS-specific arguments 2016-07-14 16:09:29 -07:00
Kevin Sawicki
f4a160d0fb Add properties as sub-list 2016-07-14 16:02:06 -07:00
Kevin Sawicki
ccee3e1fc2 Document setThumbnailClip 2016-07-14 15:54:57 -07:00
Zeke Sikelianos
ee677ea212 link to boilerplates 2016-07-14 14:57:06 -07:00
Zeke Sikelianos
52a2ed9205 fix typo 2016-07-14 14:16:02 -07:00
Zeke Sikelianos
f857be431a mention electron-devtools-installer as an automated alternative 2016-07-14 14:12:06 -07:00
Wilson Page
90f8a7e828 Add support for dropped text in osx 2016-07-14 18:25:58 +01:00
Kevin Sawicki
c680c0b85e Document static webContents methods 2016-07-14 09:00:29 -07:00
Samuel Attard
b367c65bcd Add docs for getFeedURL 2016-07-15 00:07:17 +12:00
Cheng Zhao
21a2feaf23 Merge pull request #6480 from electron/webcontents-focus
Execute role-based menu items on focused web contents
2016-07-14 12:47:07 +09:00
Cheng Zhao
183b599b9c Merge pull request #6470 from electron/session-options
Ad options for creating Session
2016-07-14 12:07:39 +09:00
Kevin Sawicki
e1459b7db7 Doc webContents.isFocused 2016-07-13 14:20:33 -07:00
Anthony Tseng
db39867ad9 Add more detail attributes for certificate-error 2016-07-13 22:14:47 +08:00
Zeke Sikelianos
9b1d1dc2c7 clarify rules for documenting classes 2016-07-12 22:00:28 -07:00
Zeke Sikelianos
4905d30dd6 fix heading levels on BrowserWindowProxy 2016-07-12 21:57:07 -07:00