Commit graph

8468 commits

Author SHA1 Message Date
Charlie Hess
69c4c7e3be Clarify how did-fail-load handles redirects. 2016-05-05 15:52:00 -07:00
Cheng Zhao
969a30fc3b Merge branch 'update-code-samples' of https://github.com/stevekinney/electron into stevekinney-update-code-samples 2016-05-05 20:55:25 +09:00
Cheng Zhao
636570306a Merge pull request #5401 from electron/ns-js-object
Fully support the userInfo object in app.setUserActivity and continue-activity event
2016-05-05 17:59:43 +09:00
Cheng Zhao
2c31d7c1e8 Revert "Generalize this mate converter for reuse."
This reverts commit 92606579d3.
2016-05-05 17:26:31 +09:00
Cheng Zhao
c9c4ba39ab docs: We support arbitrary NSDictionary now 2016-05-05 17:07:46 +09:00
Cheng Zhao
2f9fee0c8a Move the job of creating userActivity to AtomApplication 2016-05-05 16:38:47 +09:00
Cheng Zhao
60bd60e1ed Fully support converting NSDictionary to JS userInfo object 2016-05-05 16:26:44 +09:00
Cheng Zhao
8e1d2479ac spec: Should not run app.setUserActivity test on non-OS X 2016-05-05 12:27:25 +09:00
Cheng Zhao
7268f434b2 Fix code styling problems 2016-05-05 12:26:23 +09:00
Cheng Zhao
3f2a25d07c Merge pull request #5352 from CharlieHess/hands-on-hand-off
OS X Handoff Feature
2016-05-05 12:06:56 +09:00
Cheng Zhao
4b42fe1b24 Merge pull request #5393 from appetizermonster/patch-2
Fix small mistakes in Korean Doc
2016-05-05 11:15:35 +09:00
Cheng Zhao
0901a70166 Merge pull request #5379 from danhp/context-menu
Expose the 'context-menu' event.
2016-05-05 11:12:58 +09:00
Charlie Hess
b2fb95f857 Use scoped_nsobject to ensure our intermediate objects get cleaned up. 2016-05-04 11:28:49 -07:00
Steve Kinney
55babea2bb 📝 Update tutorials to ES6 [ci skip] 2016-05-04 12:11:51 -06:00
Steve Kinney
3271492c86 📝 Update FAQ to ES6 [ci skip] 2016-05-04 12:02:24 -06:00
Steve Kinney
afe0296e0f 📝 Rewrite docs on destructuring assignment [ci skip] 2016-05-04 11:59:40 -06:00
Steve Kinney
5a9f28e034 📝 Update API documentation to ES6 [ci skip] 2016-05-04 11:59:02 -06:00
Steve Kinney
178496afe5 📝 Update documentation style guide to ES6 [ci skip] 2016-05-04 10:55:05 -06:00
Heejin Lee
2b079588bb Fix small mistakes in CONTRIBUTING-ko.md 2016-05-05 00:02:53 +09:00
Daniel Pham
a6f2d401fa Follow object naming conventions for params in the 'context-menu' event 2016-05-04 10:41:10 -04:00
Cheng Zhao
6fba72a40c Merge pull request #5383 from preco21/korean-docs-2
docs: Update Korean docs as upstream
2016-05-04 23:20:44 +09:00
Cheng Zhao
fe73688975 Merge pull request #5387 from preco21/patch-1
docs: Match code syntax
2016-05-04 23:20:23 +09:00
Cheng Zhao
ef561fb919 Merge pull request #5378 from CGamesPlay/master
Use select to query the uv kqueue
2016-05-04 23:08:12 +09:00
Plusb Preco
9483cd351a 📝 Update Korean docs as upstream
[ci skip]
2016-05-04 18:45:52 +09:00
Cheng Zhao
540076e9d5 Fix code styling issue 2016-05-04 17:12:10 +09:00
Cheng Zhao
8957ba5222 Merge pull request #5371 from adambuckland/fix_auto_update_error
Fix autoUpdater error on OS X
2016-05-04 16:58:25 +09:00
Cheng Zhao
4c1a0d29b0 Merge pull request #5367 from sindresorhus/patch-1
improve the `webContents.openDevTools` docs
2016-05-04 16:52:48 +09:00
Charlie Hess
7b207aa1b6 Don't run this spec on platforms where the method is unavailable. 2016-05-03 23:33:40 -07:00
Plusb Preco
9fcafc6f9e 📝 Update Korean docs as upstream
[ci skip]
2016-05-04 15:00:59 +09:00
Plusb Preco
8be2239a45 📝 Match code syntax
[ci skip]
2016-05-04 14:34:11 +09:00
Plusb Preco
d63d570327 📝 Fix typo
[ci skip]
2016-05-04 09:46:14 +09:00
Charlie Hess
12764a66ed Add an accessor for the current activity type and write the simplest possible test. 2016-05-03 15:51:31 -07:00
Charlie Hess
42768bcc2b Save the activity on the application instance to ensure we hold a reference. Activities that enable search need to persist. 2016-05-03 14:57:16 -07:00
Daniel Pham
81eb3e3428 📝 Document 'context-menu' event 2016-05-03 17:52:24 -04:00
Daniel Pham
0fffbea79d Add 'context-menu' event to 'WebContents' 2016-05-03 17:50:54 -04:00
Plusb Preco
ebd8d30f25 📝 Small fixes
[ci skip]
2016-05-04 02:55:10 +09:00
Charlie Hess
a5a2e20449 📝 on using only strings. 2016-05-03 10:34:59 -07:00
Charlie Hess
03d25ce6c0 Revert "Add some shady methods to get V8 objects or arrays from NSDictionary or NSArray."
This reverts commit 2295f3a832.
2016-05-03 10:32:42 -07:00
Charlie Hess
f84a973d69 Revert "Use a DictionaryValue everywhere instead of a string map."
This reverts commit 90cc10944a.
2016-05-03 10:31:53 -07:00
Paul Betts
2606f8020a Merge pull request #5382 from danhp/patch-1
Fix Windows debug doc pointing to OS X
2016-05-03 09:28:45 -07:00
Daniel Pham
e9c9e22a9e 📝 Fix Windows debug doc pointing to OS X
[ci skip]
2016-05-03 11:51:57 -04:00
Cheng Zhao
513b07b3b3 Merge pull request #5377 from electron/custom_compiler
Add more options for building on Linux
2016-05-03 22:23:31 +09:00
Ryan Patterson
b15c07e1a8 Use select to query the uv kqueue
This resolves #38. I've verified that events still get processed like they
should on El Capitan 10.11.3 (15D21).
2016-05-02 23:54:21 -07:00
Plusb Preco
0e7de568a2 📝 Small fixes
[ci skip]
2016-05-03 15:34:47 +09:00
Plusb Preco
f984536523 📝 Improve grammar
[ci skip]
2016-05-03 12:07:06 +09:00
Cheng Zhao
67a768fc77 Do not download clang on Windows 2016-05-03 09:38:15 +09:00
Cheng Zhao
49eed1ebb9 Ignore CC and CXX if user didn't change build configuration 2016-05-03 09:31:39 +09:00
Cheng Zhao
0567f09d6d docs: The building environment variables 2016-05-03 08:29:23 +09:00
Charlie Hess
90cc10944a Use a DictionaryValue everywhere instead of a string map. 2016-05-02 16:18:58 -07:00
Charlie Hess
2295f3a832 Add some shady methods to get V8 objects or arrays from NSDictionary or NSArray. 2016-05-02 14:45:59 -07:00