Commit graph

3017 commits

Author SHA1 Message Date
Kevin Sawicki
6a3f2e90db Tweak webviewTag option description 2017-05-19 10:22:28 -07:00
Kevin Sawicki
74b7afbec7 Merge origin/master into enable-webview 2017-05-19 10:17:34 -07:00
Kevin Sawicki
73b49f0dfe Fix JSON issue in example block 2017-05-18 11:28:10 -07:00
Kevin Sawicki
a8d25d6855 Add printer info structure file 2017-05-18 10:50:08 -07:00
Kevin Sawicki
e0b39247a9 Tweak print docs 2017-05-18 10:17:08 -07:00
Kevin Sawicki
92f14f8d52 printerList() -> getPrinters() 2017-05-18 10:14:55 -07:00
Kevin Sawicki
84a9b6a42d Merge remote-tracking branch 'origin/master' into renaesop_master 2017-05-18 10:08:40 -07:00
Kevin Sawicki
1a210ed114 Remote stray © 2017-05-17 14:00:40 -07:00
Kevin Sawicki
6fccb75dfb Mention preloadURL is in webPreferences 2017-05-17 13:59:48 -07:00
Kevin Sawicki
27a4522d65 Add will-attach-webview advice to security.md 2017-05-17 13:56:19 -07:00
Kevin Sawicki
bde13353fb Rename option to webviewTag and default to nodeIntegration value 2017-05-17 13:12:23 -07:00
Kevin Sawicki
837ea884de Merge remote-tracking branch 'origin/master' into enable-webview 2017-05-17 12:45:29 -07:00
Kevin Sawicki
e3160126d6 Update debug CLI flags 2017-05-16 14:44:28 -07:00
Kevin Sawicki
03c2d6f435 Make chrome instructions a list item 2017-05-16 14:44:28 -07:00
Kevin Sawicki
690b2e91c4 Update docs for new --inspect support 2017-05-16 14:44:28 -07:00
Kevin Sawicki
1df72e42a5 Merge pull request #9404 from tom-james-watson/master
Clarify dialog blocking functionality
2017-05-16 12:39:23 -07:00
paulinaika
b20085fa7a 📝 fix typo docs-translations/id/tutorial/using-widevine-cdm-plugin.md and docs/tutorial/using-widevine-cdm-plugin.md from previous commit [ci skip] 2017-05-16 16:49:56 +10:00
paulinaika
8a2f24c95f 📝 translate to Indonesian using-widevine-cdm-plugin.md and windows-store-guide.md [ci skip] 2017-05-16 16:28:37 +10:00
Kevin Sawicki
4f99cb19bd 🔥 ; 2017-05-15 13:38:57 -07:00
Kevin Sawicki
d79ac8d9c1 Merge pull request #9222 from alexstrat/add-os-process-id
Add OS pid to web-contents
2017-05-15 13:28:47 -07:00
Daniel Pereira
f4d3c169b0 📝Update documentation desktopCapturer to javascript[ci skip] 2017-05-15 13:45:14 -05:00
Daniel Pereira
37bcc96e95 📝Update constraints for audio sharing[ci skip] 2017-05-15 13:42:47 -05:00
Daniel Pereira
e38e294be3 📝Update use of deprecated getUserMedia[ci skip] 2017-05-15 13:38:32 -05:00
Kevin Sawicki
c7e6cbcf9f Merge pull request #9435 from electron/disk-cache-size-flag
support --disk-cache-size flag
2017-05-15 11:09:38 -07:00
Birunthan Mohanathas
a1e826e405 Fix copy paste typos in BrowserView docs 2017-05-15 21:09:11 +03:00
Alexandre Lachèze
77bf4c8ebb 📝 document getOSProcessId() 2017-05-15 20:02:20 +02:00
Kevin Sawicki
b4fc50e3b2 Doc --disk-cache-size 2017-05-15 10:38:20 -07:00
Samuel Attard
d84ddd7fe4 Fix createFromDataURL return type
Fixes #9469
2017-05-16 01:24:06 +10:00
Birunthan Mohanathas
0153731888 Make docs for webview.findInPage and webContents.findInPage consistent 2017-05-14 13:43:42 +03:00
Birunthan Mohanathas
5cfa697309 Fix postData type definition in docs 2017-05-14 13:43:38 +03:00
Xaver Hellauer
ded1adf165 Clang-Format extension for Visual Studio Code 2017-05-12 18:40:46 +02:00
Kevin Sawicki
190c9c916e Merge pull request #9331 from 22222/issue2579
Add 'will-prevent-unload' event for #2579.
2017-05-11 09:04:40 -07:00
Kevin Sawicki
4e1943dfe6 Minor updates to example
* const-ing
* mainWindow -> win
* add dialog require
2017-05-11 09:01:51 -07:00
Kevin Sawicki
aea25be150 Merge pull request #9432 from electron/fix-docs-8
Fix return type of makeSingleInstance
2017-05-11 08:43:11 -07:00
Kevin Sawicki
ae71dfe3d1 Merge pull request #9423 from electron/brightray-import
Import brightray source and remove submodule
2017-05-11 08:35:41 -07:00
Samuel Attard
f57c1881da
Fix return type of makeSingleInstance 2017-05-11 22:09:37 +10:00
22222
4044548f3e Add 'will-prevent-unload' event. 2017-05-11 06:35:35 -05:00
Ryohei Ikegami
7ac93045b7 Merge branch 'master' into native-window-open 2017-05-11 13:51:43 +09:00
Kevin Sawicki
6ca7787f13 Merge pull request #9427 from electron/fix-docs-6
Fix webcontents capital
2017-05-10 16:30:04 -07:00
Samuel Attard
b4e356212c Fix webcontents capital 2017-05-11 09:28:24 +10:00
Kevin Sawicki
f46b383824 Add types 2017-05-10 14:29:57 -07:00
Kevin Sawicki
a44f0620b3 : -> - 2017-05-10 14:27:51 -07:00
Kevin Sawicki
edac443673 Correct property name to pid 2017-05-10 14:26:13 -07:00
Kevin Sawicki
94eff35286 Update docs for new brightray location 2017-05-10 13:42:21 -07:00
Hari Juturu
277c3155a6 use will-create-webview event 2017-05-09 10:12:44 -07:00
renaesop
cba5e96496 Merge remote-tracking branch 'ups/master' 2017-05-09 09:44:24 +08:00
Hari Krishna Reddy Juturu
3321f7d39c Changing command line option name 2017-05-08 17:27:31 -07:00
Hum4n01d
a694110d48 Fix order of OSs
It was previously inconsistent
2017-05-08 13:36:28 -07:00
Tom Watson
50057163c6 📝 clarify dialog buttons blocking side effect 2017-05-08 11:17:33 +02:00
Brian Zelip
68c19fc509 📝 minor docs copy edit - add two words
[ci skip]
2017-05-07 11:06:46 -04:00