Commit graph

473 commits

Author SHA1 Message Date
Cheng Zhao
9d54092f41 Merge pull request #1512 from hokein/add-win-key
Add `Super` key support in global-shortcut API.
2015-05-07 10:35:56 +08:00
Haojian Wu
0f67b1866a Add Super key support in global-shortcut API. 2015-05-05 22:49:32 +08:00
Paul Betts
904505bb21 Suggest electron-rebuild for building native modules 2015-05-04 22:39:55 -07:00
Cheng Zhao
06834b723b Merge pull request #1568 from atom/tray-getposition
Pass bounds instead of position in "clicked" event of "tray"
2015-05-04 13:13:33 +08:00
Cheng Zhao
921e7e0f91 Merge pull request #1565 from chicoxyzzy/patch-1
docs: fix typo
2015-05-04 12:18:04 +08:00
Cheng Zhao
f2fdc556a4 Merge pull request #1548 from MaxGraey/fix-docs
update using-native-node-modules doc
2015-05-04 12:11:47 +08:00
Cheng Zhao
f64dbbea3e docs: Pass bounds in clicked event of tray 2015-05-04 11:34:11 +08:00
Max Graey
6842ac98c3 revert changes of dist url 2015-05-04 10:13:43 +07:00
Cheng Zhao
294dbac869 Merge pull request #1543 from deepak1556/tray_icon_patch
tray: send tray icon position as payload onclick OSX and windows
2015-05-04 11:11:13 +08:00
Sergey R
abe63ebd84 docs: fix typo 2015-05-04 02:21:07 +03:00
Max Graey
d2ab8322b7 update using-native-node-modules doc 2015-05-02 01:28:17 +07:00
deepak1556
6d7d068e49 tray: send tray icon position as payload onclick OSX 2015-05-01 19:30:01 +05:30
deepak1556
ae6a1b409f window: adding setBounds and getBounds api 2015-05-01 16:20:53 +05:30
Cheng Zhao
9300859983 Merge pull request #1535 from deepak1556/contents_patch
webContents: adding serviceworker helper utilities
2015-05-01 14:56:35 +08:00
deepak1556
d76bd4a103 webContents: adding serviceworker helper utilities 2015-05-01 12:02:57 +05:30
Cheng Zhao
ca7e2c4d96 Merge pull request #1538 from leemac/patch-1
Typo and missing comma in Desktop Integration doc page
2015-05-01 12:48:55 +08:00
Lee McKinnon
5fa7ae7d72 Fixing typo in desktop-environment-integration.md
Missing comma in the 'setUserTasks' as well as a typo in the description under "User tasks (Windows)"
2015-04-30 15:40:30 -04:00
deepak1556
8c5f171a93 webContents: providing dom-ready event 2015-04-30 09:58:29 +05:30
Cheng Zhao
75b24c7d76 docs: disable-auto-hide-cursor option 2015-04-29 10:28:42 +08:00
Ben Drucker
0e7970fec5 Fix grammar in NW.js comparison 2015-04-27 15:55:25 -04:00
Cheng Zhao
858198a2bd Merge pull request #1461 from deepak1556/webview_devtools_patch
webview: add inspectElement method
2015-04-25 16:14:13 +08:00
deepak1556
18b3dfa350 removed will-navigate and did-navigate events 2015-04-25 09:50:28 +05:30
deepak1556
05be71e9bc fix getFavcion api in webview to return dataUrl 2015-04-25 09:50:28 +05:30
deepak1556
36819e2638 added did-navigate event, getFavicon api and workaround webview spec 2015-04-25 09:50:28 +05:30
deepak1556
9b585458c1 webview: will-navigate and page-favicon-set navigation events 2015-04-25 09:50:28 +05:30
Bhargav Patel
5c5fd377f7 Minor grammatical fixes
Fixed some run-on sentances and changed structor of some.
2015-04-23 20:12:04 -04:00
lazarus
00ef99826d fix minor text error 2015-04-23 16:32:41 -07:00
deepak1556
cdb1711fe1 webview: add inspectElement method 2015-04-23 15:18:13 +05:30
Kevin Sawicki
5c94f7ccd4 Merge pull request #1464 from bnvk/patch-1
updated bash path to ./Electron.app/Contents/MacOS/Electron
2015-04-22 14:08:09 -07:00
Florian Hämmerle
ec4d596189 Update quick-start.md 2015-04-22 22:14:50 +02:00
Brennan Novak
bc04e951cf updated bash path to ./Electron.app/Contents/MacOS/Electron
it had the trailing /Atom which no longer exists
2015-04-22 16:22:08 +02:00
Cheng Zhao
fc3026dcfe Merge branch 'master' of https://github.com/NKMR6194/electron into NKMR6194-master 2015-04-20 19:40:04 +08:00
Cheng Zhao
237b7bedaa Merge pull request #1428 from SimplyAhmazing/master
Documentation Fix: edits quick-start doc file section "The renderer process" segment
2015-04-20 15:51:01 +08:00
Cheng Zhao
8f611687f1 Merge pull request #1421 from tommoor/patch-2
Updated documentation for power-monitor
2015-04-20 15:24:24 +08:00
SAKATA Sinji
45f022b9db docs: Atom Shell => Electron in quick-start.md 2015-04-20 00:46:00 +09:00
Cheng Zhao
cd0aa4a956 Merge pull request #1389 from atom/rename-to-electron
Rename to electron
2015-04-17 15:22:07 +08:00
Cheng Zhao
b0b6747456 docs: Update the rebranding guide 2015-04-17 11:59:40 +08:00
Cheng Zhao
1f1cb12d46 docs: Build for 64bit target on Windows 2015-04-16 14:50:46 +08:00
Cheng Zhao
d2682233fd docs: Atom Shell => Electron 2015-04-16 11:31:12 +08:00
Ahmed Abdalla
3a850b94f5 removes use of passive voice 2015-04-15 14:01:09 -04:00
Ahmed Abdalla
a179e48e3b fixes spelling typo 2015-04-15 13:58:30 -04:00
Tom Moor
2de9123cfd Update power-monitor.md 2015-04-15 08:17:10 -07:00
Tom Moor
378e56e254 Updated documentation for power-monitor
Added two undocumented events, added note that must be used after ready event.
2015-04-14 21:03:58 -07:00
Ahmed Abdalla
0d3aaaf0af edits quick-start "The renderer Process" segment 2015-04-14 23:04:19 -04:00
Cheng Zhao
64f9f7e906 Merge pull request #1386 from deepak1556/web_contents_patch
webContents: event to detect status of requested resource
2015-04-13 11:59:37 +08:00
Cheng Zhao
91c9f590dd Remove the NativeImage::MakeTemplateImage method
Is duplicate with SetTemplateImage.
2015-04-13 11:53:24 +08:00
Cheng Zhao
f11988a354 Merge pull request #1383 from deepak1556/nativeimage_patch
nativeImage: adding setTemplateImage method
2015-04-13 11:47:58 +08:00
Cheng Zhao
6137c2317d Improves #1373
* Don't pollute Menu API.
* Add examples in docs.
* Moves the docs from menu-item.md to menu.md.
2015-04-13 11:22:33 +08:00
Cheng Zhao
7a97488023 Merge pull request #1373 from FoldingText/position-menu-items
Add position attribute for menu items
2015-04-13 09:46:13 +08:00
Cheng Zhao
43fe82e1e5 Merge branch 'master' into rename-to-electron 2015-04-12 21:49:08 +08:00