Commit graph

4826 commits

Author SHA1 Message Date
Haojian Wu
2cd6ad1a97 More code style fixing. 2015-07-16 18:42:20 +08:00
Cheng Zhao
78e55414d4 Merge pull request #2235 from mhkeller/doc-json-fix
valid example json, fix https://github.com/atom/electron/issues/2228
2015-07-16 02:53:59 -07:00
Haojian Wu
17628b3e40 📝 tray.popContextMenu API. 2015-07-16 11:53:13 +08:00
Haojian Wu
736fe0c1db Fix OS X build error. 2015-07-16 11:43:42 +08:00
Haojian Wu
ed4c69343f Add 'tray.popContextMenu()' Windows implementation. 2015-07-16 11:42:43 +08:00
Haojian Wu
4421fbf9f3 Implement 'tray.popContextMenu' API on OS X. 2015-07-16 10:50:53 +08:00
Haojian Wu
002eb1a326 Simplify code logic and fix object-c code style. 2015-07-16 10:49:55 +08:00
Jeffrey Morgan
4baaf03ac7 Improve grammar and comments
Improve the grammar and sentence structure of the text and improve the code comments.
2015-07-15 16:48:24 -07:00
Cheng Zhao
c2bfc60a59 Merge pull request #2216 from UsabilityEtc/patch-1
Improve grammar and code formatting
2015-07-15 16:44:20 -07:00
Cheng Zhao
f78dcfb8e0 Merge pull request #2214 from PButcher/patch-1
Update window-open.md
2015-07-15 16:43:50 -07:00
Cheng Zhao
91bfd1f77c Merge pull request #2206 from dalinaum/patch-1
Update README-ko.md
2015-07-15 13:14:05 -07:00
Cheng Zhao
9ee0d46734 Use CTRL+SHIFT+I for toggling devtools, fix #2205 2015-07-15 13:11:01 -07:00
mhkeller
ca2cb9c9ba valid example json, fix https://github.com/atom/electron/issues/2228 2015-07-15 10:34:33 -04:00
Antonio Stoilkov
00c484c68b fix typo in browser-window.md 2015-07-15 17:29:02 +03:00
Haojian Wu
38c33d69ae 📝 'right-clicked' doc. 2015-07-15 20:13:59 +08:00
Haojian Wu
5ad3fff6a0 Implement 'right-clicked' tray event on Windows. 2015-07-15 20:03:05 +08:00
Haojian Wu
cca4f4abd5 Implement 'right-clicked' tray event on OS X. 2015-07-15 19:32:00 +08:00
Haojian Wu
e54fda6b34 Introduce Electron custom statusItem view.
Reimplement tray functions on OS X by using custom statusItem view.
2015-07-15 18:26:39 +08:00
Plusb Preco
b524914008 Update as upstream 2015-07-15 08:30:02 +09:00
Plusb Preco
26163e5812 Prepare update forked repo 2015-07-15 08:09:07 +09:00
Plusb Preco
0dfcc7a9b3 Update changes as upstream 2015-07-15 08:09:05 +09:00
Plusb Preco
e510384375 Revert "Revert "Update APIs, check grammars""
This reverts commit 5e083473e7b4d3a6014d35e68618594765151afe.
2015-07-15 08:09:03 +09:00
Plusb Preco
eb81810a52 Revert "Update APIs, check grammars"
This reverts commit d1eb971263f72deae84541d12b3bdd6d5972365a.
2015-07-15 08:09:01 +09:00
Plusb Preco
3b2f3c3152 Update APIs, check grammars 2015-07-15 08:08:59 +09:00
Plusb Preco
de5bc32d0b Fix typos, update some files 2015-07-15 08:08:57 +09:00
Cheng Zhao
1e9eccf959 Forward the crashed event to BrowserWindow, fix #2201 2015-07-14 15:13:41 -07:00
Cheng Zhao
4b06c0645c Merge pull request #2220 from atom/provide-user-agent
Provide default user agent in BrowserContext
2015-07-14 13:17:36 -07:00
Cheng Zhao
c6f870d4e4 Fix cpplint warnings 2015-07-14 12:16:13 -07:00
Cheng Zhao
053594eae8 Set default user agent for WebContents 2015-07-14 12:13:25 -07:00
Cheng Zhao
1615c97ce8 Don't set two "Electron"s in user agent 2015-07-14 12:12:55 -07:00
Cheng Zhao
940db1d1dd Provide default user agent in BrowserContext 2015-07-14 11:40:15 -07:00
Cheng Zhao
56dfef8d0d spec: Test user agent in websocket 2015-07-14 11:39:41 -07:00
Cheng Zhao
3ffd774405 Merge pull request #2197 from deepak1556/user_agent_patch
webContents: set http useragent settings when overriding user agent
2015-07-14 09:59:09 -07:00
Cheng Zhao
076942ca7a Merge pull request #2215 from atom/delete-global
Don't expose "global" when node integration is off
2015-07-14 09:53:44 -07:00
Cheng Zhao
b6e8420bf2 spec: Check if window.global is set 2015-07-14 09:15:03 -07:00
Cheng Zhao
096439dce7 Don't expose "global" when node integration is off 2015-07-14 09:15:03 -07:00
Cheng Zhao
346fb745f2 No need to actually create a page for cookie test 2015-07-14 09:14:22 -07:00
Cheng Zhao
020ccd8018 spec: Cookie test should not rely on cookie's count
Other apps can also write cookie to `file://` protocol.
2015-07-14 08:59:06 -07:00
Jeffrey Morgan
ce24226128 Update global-shortcut.md
Improved the grammar and code formatting of global-shortcut.md.
2015-07-14 16:58:15 +01:00
Peter Butcher
b3c51e46e7 Update window-open.md
Just an irritating typo.
2015-07-14 16:37:52 +01:00
Cheng Zhao
886db7a3f2 Merge pull request #2195 from atom/jl-docs-typo
Fix docs typo
2015-07-14 08:35:33 -07:00
Cheng Zhao
6c5dde60a3 Merge pull request #2211 from atom/no-heap-stl
Avoiding creating static STL containers
2015-07-14 02:48:05 -07:00
Cheng Zhao
7f06072420 Avoiding creating static STL containers
It is OK under most cases, but if you happen to also use COM in your
application, you will have heap corruptions.
2015-07-14 17:33:16 +08:00
Cheng Zhao
5708b7fbec Fix the ill cookie test 2015-07-14 02:32:20 -07:00
Cheng Zhao
5863ed4c33 win: Also map MESSAGE_BOX_TYPE_QUESTION to TD_INFORMATION_ICON 2015-07-13 21:51:19 -07:00
Cheng Zhao
14388feb23 Merge pull request #2187 from jprichardson/patch-1
emit error object on process.on('uncaughtException') in renderer
2015-07-13 21:46:06 -07:00
Cheng Zhao
e5f852d7d5 docs: Adds the dependencies of arm target
Close #2181
2015-07-13 15:26:35 -07:00
Cheng Zhao
83e8ceceda Fix session specs 2015-07-13 15:23:02 -07:00
Cheng Zhao
3ef54147c9 Merge pull request #2179 from deepak1556/proxy_patch
doc: kProxyPacUrl support
2015-07-13 15:14:58 -07:00
Cheng Zhao
f8df377631 Update brightray, refs #1599 2015-07-13 15:14:28 -07:00