Commit graph

10270 commits

Author SHA1 Message Date
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
haad
e6c8900a18 Fix linting 2016-07-22 20:20:24 +01:00
haad
c717cd9192 🐛 Add support for TypedArrays in IPC.
Fixes https://github.com/electron/electron/issues/2104.
2016-07-22 19:44:19 +01:00
Cheng Zhao
99ec841a8e Merge pull request #6342 from electron/chrome52
Upgrade to Chrome 52
2016-07-22 08:53:33 -06:00
Cheng Zhao
0c1d91a895 display.h needs to be used together with screen.h 2016-07-22 23:37:20 +09:00
TiagoDanin
c7c6dda122 Replace OSX to macOS and Update references 2016-07-21 16:07:03 -05:00
Cheng Zhao
cf6f4708bc Fix building on Windows 2016-07-21 11:20:43 -06:00
Kevin Sawicki
7bcd76aa93 Merge pull request #6562 from liusy182/hasImageContents
fix documentation error pointed out in issue #6541
2016-07-21 10:38:22 -06:00
liusy182
6e83f454d7 documentation error pointed out in issue #6541 2016-07-21 22:46:46 +08:00
Cheng Zhao
6850500a65 Fix building on Linux 2016-07-21 07:09:01 -06:00
Cheng Zhao
0fa4e58557 Bump node module version 2016-07-21 06:32:29 -06:00
Cheng Zhao
d22dc6c7d3 Update to Chrome 52.0.2743.82 2016-07-21 06:07:05 -06:00
Cheng Zhao
f6f7b41f0a Fix compilation error after merge 2016-07-21 06:03:38 -06:00
Cheng Zhao
b57665330c Merge branch 'master' into chrome52 2016-07-21 05:34:36 -06:00
Cheng Zhao
50b6b500fd Merge pull request #6557 from LittleboyHarry/patch-1
Translate the comments
2016-07-21 04:55:56 -06:00
Cheng Zhao
9cdc74e431 Merge pull request #6559 from electron/node-6-3
Update to Node.js 6.3.0
2016-07-21 03:28:37 -06:00
Cheng Zhao
fbfae70803 spec: Fix exception when refreshing test window 2016-07-21 17:08:43 +09:00
Cheng Zhao
39bd2bee8e Avoid using CHECK in files using node headesr
Node has its own CHECK macro which requires linking with node::Assert.
2016-07-21 16:56:48 +09:00
Cheng Zhao
cef86f5257 Use node::FreeEnvironment 2016-07-21 16:43:21 +09:00
Cheng Zhao
334f03fc42 Fix compilation errors on Windows 2016-07-21 16:36:50 +09:00
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
deepak1556
aa6d79a3d8 session: add proxyBypassRules option to setProxy api 2016-07-21 10:14:54 +05:30
Harry
9b12cf75ec Translate the comments 2016-07-21 10:37:55 +08: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
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
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