Commit graph

10083 commits

Author SHA1 Message Date
Cheng Zhao
5fc0201ca1 There is no node_extern.h anymore 2016-07-21 16:36:31 +09:00
Cheng Zhao
8488b84b53 Update .node-version 2016-07-21 01:17:07 -06:00
Cheng Zhao
567714f07c Add a few new node defines 2016-07-21 00:57:34 -06:00
Cheng Zhao
39e39ae913 Make use of some new Node config flags 2016-07-21 00:57:34 -06:00
Cheng Zhao
7d42797c1f Update node headers including 2016-07-21 00:57:34 -06:00
Cheng Zhao
8f5bd4afaf Update to Node 6.3.0 2016-07-21 00:57:34 -06:00
Cheng Zhao
498e9089b3 Bump v1.2.8 2016-07-20 23:57:08 -06:00
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
Cheng Zhao
81c790dfdb Merge pull request #6529 from darkdh/serial_number
serial number in hex string
2016-07-20 05:00:57 -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
9e6f623a5c Using base::HexEncode() 2016-07-19 11:06:56 +08:00
Anthony Tseng
42eb0c3eae serial number in hex string 2016-07-18 23:42:42 +08:00
Cheng Zhao
4081381700 Merge pull request #6527 from electron/mac-relaunch
Apply #6412 on macOS
2016-07-18 09:00:36 -06:00
Cheng Zhao
1a0199c2ad Merge pull request #6520 from MagiCarbon/master
error link
2016-07-18 08:49:13 -06:00
Cheng Zhao
2ed733fedc Redirect relaunch process's stdout to /dev/null 2016-07-18 08:46:01 -06: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
12cb678562 Merge pull request #6510 from electron/reset-thumbnail-docs
Mention how to reset thumbnail to entire window
2016-07-15 10:40:32 -07:00
Kevin Sawicki
e24885b160 Mention how to reset thumbnail to entire window 2016-07-15 10:38:11 -07:00
Kevin Sawicki
efcdad2751 Merge pull request #6509 from electron/brightray-devtools-focus-fix
Upgrade brightray for undocked devtools focus fix
2016-07-15 10:17:59 -07:00
Kevin Sawicki
e15d7a1fd3 Upgrade brightray for undocked devtools focus fix 2016-07-15 09:21:08 -07:00
Cheng Zhao
4d46189928 Fix cpplint warnings 2016-07-15 22:47:40 +09:00
Cheng Zhao
43b5e655a4 Merge pull request #6502 from liusy182/optional-callback-6491
Make the callback of session.clearStorageData optional
2016-07-15 22:45:49 +09: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
2791f71c03 webContents is now a public module 2016-07-15 10:59:19 +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
Kevin Sawicki
86218fe773 win: Add setThumbnailClip window API 2016-07-14 15:50:31 -07:00
Samuel Attard
450c181da3 Add autoUpdater getFeedURL specs 2016-07-15 10:13:41 +12:00
Samuel Attard
d42e6b3c1f Fix casing issue on the windows update JS file 2016-07-15 10:05:36 +12: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
a4001fbc55 Sort contents by id for consistent ordering 2016-07-14 09:41:10 -07:00