mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6977 commits 1 branch 183 tags 5.3 GiB
Commit graph

961 commits

Author SHA1 Message Date
Cheng Zhao
bb8bb3dbea Merge pull request #3147 from deepak1556/cipher_suite_disable_patch 
browser: flag to disable specified cipher suites
 2015-10-20 10:29:49 +08:00
Robo
9f8479e9d8 browser: flag to diable specified cipher suites 2015-10-20 02:51:56 +05:30
Haojian Wu
fb4efec55d Add options check. 
This patch avoids main process never response back to renderer if the options is
invalid.
 2015-10-19 11:06:56 +08:00
Haojian Wu
214f8477b3 Fix some typos. 2015-10-17 19:28:14 +08:00
max_devjs
72078f7b02 [truly humble correction of a misspelling] 
Substituting webp with web in frameless-window.md .
 2015-10-16 19:56:45 -03:00
Roman Klauke
32523ae352 replace Mac with OS X 
Commit 691d8dd replaced "Mac" with "OS X". This commit replaces some
other occurrences.
 2015-10-16 22:03:47 +02:00
Cheng Zhao
18fd126c64 docs: Mac App Store Submission Guide 2015-10-16 17:16:12 +08:00
Cheng Zhao
7bdbe45c91 subpixel-font-scaling option is removed 2015-10-16 15:01:28 +08:00
Haojian Wu
facd0fbc08 Implement webContents.savePage API. 2015-10-16 09:23:08 +08:00
Cheng Zhao
d9cf9a7cbc docs: Fix wrong level for API titles 2015-10-08 11:14:04 +08:00
Steve Kinney
2978beaeb7 💄 Add preposition to globalShortcut.unregisterAll() 2015-10-07 09:03:46 -07:00
Steve Kinney
6f61832a34 💄 Add semicolon to global-shortcut code example 
This keeps this line consistent with the rest of the documentation.
 2015-10-07 09:03:11 -07:00
Haojian Wu
dcb457e76e Refine API design: desktopCapturer.getSources. 2015-10-07 11:10:35 +08:00
Cheng Zhao
804cf5e8ba Merge pull request #2994 from etiktin/update_native_modules_doc 
Update native modules doc
 2015-10-06 16:55:25 +08:00
Cheng Zhao
fc0153f0bc Merge pull request #2993 from etiktin/update_screen_doc 
Update screen.md
 2015-10-06 16:55:16 +08:00
Eran Tiktin
c3cd438d34 Replace io.js references with node.js references 2015-10-05 21:12:29 +03:00
Eran Tiktin
ea3e84e7ff Update screen.md 
Removed a trailing comma.
 2015-10-05 16:56:36 +03:00
Eran Tiktin
239b97cde1 Update process.md 
Fixed the `loaded` example according to
[this](https://github.com/atom/electron/issues/2984#issuecomment-145465907)
comment.
 2015-10-05 16:51:49 +03:00
Haojian Wu
36c0ad7fda Refine more about desktop capturer API. 
* Simplify the coffeescript code.
* Add more options in desktopCapturer.startUpdating.
 2015-10-05 12:47:01 +08:00
Cheng Zhao
ad8e727ba2 docs: "loaded" event of "process" 2015-10-05 11:41:36 +08:00
Cheng Zhao
46c69cc3e5 docs: Removed unneeded changes from PR 2015-10-05 11:41:06 +08:00
hansrwindhoff
69140af083 example code didn't run 2015-10-04 20:14:52 -06:00
Haojian Wu
1e69ef79de Refine: make desktop-capturer as a renderer module. 2015-10-04 22:04:41 +08:00
Cheng Zhao
3d4318e15e docs: Remove cache and userCache dir 
Closes #1404.
 2015-10-04 21:20:05 +08:00
Cheng Zhao
55acdcb1ad docs: --enable-logging 2015-10-03 15:43:26 +08:00
Cheng Zhao
24518d13d5 Merge pull request #2965 from jhen0409/patch-1 
Fix typo for docs/api/menu-item.md
 2015-10-03 01:15:33 +08:00
Jhen
0ecf077590 Fix typo for docs/api/menu-item.md 2015-10-02 21:53:55 +08:00
Cheng Zhao
af971a46bd docs: Move devtools methods to WebContents 2015-10-01 16:30:31 +08:00
Cheng Zhao
0fb68e8130 Make Menu.popup accept no parameter 2015-09-30 23:41:23 +08:00
Alexander Rusakov
d5f81357b6 remove required width and height BrowserWindowOptions 2015-09-30 17:13:20 +03:00
Cheng Zhao
305d98abc5 Merge pull request #2926 from brenca/master 
Add more detailed documentation about the format of frameBuffer (FrameSubscription API)
 2015-09-29 09:25:51 +08:00
Heilig Benedek
8734395358 Detalied documentation about frameBuffer's format. 2015-09-28 22:33:43 +02:00
Cheng Zhao
a987715222 Merge pull request #2914 from deepak1556/network_emulation_api_patch 
session: api to emulate network conditions
 2015-09-28 17:02:23 +08:00
Robo
db0732b35b add examples 2015-09-28 12:52:50 +05:30
Cheng Zhao
11af4b63ac Merge pull request #2918 from brenca/master 
Option to specify button on a MouseEvent and text on a KeyboardEvent when using sendInputEvent
 2015-09-28 12:47:22 +08:00
Heilig Benedek
21cd4c1431 Added documentation about the changes 2015-09-28 02:52:16 +02:00
Robo
fc7f4ae24b session: api to emulate network conditions 2015-09-27 18:55:26 +05:30
Plusb Preco
7923e19553 Merge remote-tracking branch 'atom/master' 2015-09-27 22:20:51 +09:00
Plusb Preco
397fbeae28 Update example variable name prefix (atom to electron) 
* Update variable name prefix as `atom` to `electron`
 2015-09-27 22:20:35 +09:00
Haojian Wu
4a64d1d946 📝 fix a typo 
interrputed => interrupted
 2015-09-25 13:13:11 +08:00
Haojian Wu
01f0643142 Fix inconsistent docs: downloadItem.getURL() => downloadItem.getUrl() 2015-09-25 09:34:04 +08:00
Cheng Zhao
ecefd3540b Merge pull request #2840 from atom/download-item 
Add more download supports in Electron
 2015-09-24 21:04:25 +08:00
Haojian Wu
1879392c7b Reimplement downloadItem.getFilename API. 
Previously, the suggested file name(Always 'empty') returned by
'download_item->GetSuggestedFilename' is not the same with the default one saved
in local disk.

The patch reimplement this API allowing it to return the default file name, which
is more expected from user.
 2015-09-24 16:39:02 +08:00
Haojian Wu
0861d5d44b Redefine 'will-download' design. 2015-09-24 16:04:44 +08:00
Cheng Zhao
142702866d Merge pull request #2861 from deepak1556/ssl_version_config_patch 
browser: switch to set minimum version for TLS fallback
 2015-09-23 17:30:26 +08:00
Cheng Zhao
d8062ab9e1 docs: win.setMenu is not available on OS X 2015-09-23 11:45:51 +08:00
Robo
748b1387d2 browser: switch to set minimum version for TLS fallback 2015-09-23 09:10:36 +05:30
Cheng Zhao
6c8a9cb072 Merge pull request #2870 from atom/window-open-options 
Pass options in "new-window" event
 2015-09-23 00:06:50 +08:00
Cheng Zhao
7165aa5467 Merge pull request #2846 from alexsalas/patch-1 
err undefined
 2015-09-22 23:42:51 +08:00
Cheng Zhao
8bfa3cba63 docs: The options parameter of new-window event 2015-09-22 23:41:08 +08:00
Cheng Zhao
e499bb14de docs: Mention window.open inherits options 2015-09-22 22:46:44 +08:00
Cheng Zhao
9cbdde2eba docs: allowpopups attribute 2015-09-22 20:13:49 +08:00
Cheng Zhao
008af00044 Merge pull request #2852 from deepak1556/web_frame_scheme_api_patch 
webframe: api to register scheme as privileged
 2015-09-22 09:59:24 +08:00
Robo
325feca864 webframe: api to register scheme as privileged 2015-09-21 22:59:59 +05:30
Gohy Leandre
477103191f Add http_response_code, method, referrer, response_headers to did-get-redirect-request event. 2015-09-21 09:51:58 +02:00
Haojian Wu
57bf0cb615 Refractor in completed event in DownloadItem. 
* Rename `completed` to `done`, making it align with Chromium's style.
* Add 'state' in `done` event's result. It can check the download item final
status: cancelled, completed, interrupted.
 2015-09-21 14:00:38 +08:00
Haojian Wu
997ac91fe0 Add donwloadItem.getContentDisposition() API. 2015-09-21 09:38:38 +08:00
Haojian Wu
dd38131704 📝 Add DownloadItem doc. 2015-09-21 09:34:42 +08:00
Alexander Salas
40b861bc9c err undefined 2015-09-20 17:58:41 -04:30
Cheng Zhao
32bff05208 docs: <webview>.sendInputEvent 2015-09-18 18:32:21 +08:00
Cheng Zhao
1e918480b4 docs: webContents.beginFrameSubscription 2015-09-18 17:53:19 +08:00
Cheng Zhao
573892c112 docs: webContents.sendInputEvent 2015-09-18 17:44:11 +08:00
Cheng Zhao
ee0d48dc5a Merge branch 'master' of https://github.com/MaxWhere/electron into MaxWhere-master 2015-09-18 12:01:33 +08:00
Cheng Zhao
96d35ec29e Merge pull request #2802 from nekuz0r/device-emulation 
Add device emulation
 2015-09-18 10:43:17 +08:00
Gohy Leandre
6b875110ed Add device emulation API 2015-09-17 13:50:36 +02:00
Ionică Bizău
01ed2c4222 Fixed the mapNumbers require call 
Since mapNumber.js is a file, we should prefix it with "./", otherwise an error is thrown.
 2015-09-17 12:24:12 +03:00
Ryohei Ikegami
7b75b29265 Add docs for app.getLocale() 2015-09-16 17:17:49 +09:00
Cheng Zhao
69cc3ab5ef docs: Make description of fullscreen more precise 
Closes #2793.
 2015-09-16 09:20:16 +08:00
Heilig Benedek
ceef06b344 Renamed setOffscreenRender to begin/endFrameSubscription because the name was a bit misleading, and replaced the ArrayBuffer creation with a node::Buffer::New call. 2015-09-16 02:59:16 +02:00
Cheng Zhao
c9ee6b4caf docs: BrowserWindow.isDevToolsFocused 2015-09-15 11:43:45 +08:00
Cheng Zhao
fe2219a635 Merge pull request #2777 from atom/dock-clicked 
Implement 'activate' event for app.
 2015-09-15 11:17:41 +08:00
Haojian Wu
40d93ce55a Deprecate 'activate-with-no-open-windows' event. 2015-09-14 18:36:05 -07:00
Haojian Wu
377e7ee3a7 Implement 'activiate' event instead of 'activate-with-open-windows'. 2015-09-14 18:34:27 -07:00
Cheng Zhao
6bae0bada0 Merge pull request #2776 from jaanus/osx-window-titlebar 
Implements #2734 “New API to configure BrowserWindow title bar on Mac”
 2015-09-14 23:07:06 +08:00
jaanus
5d8f1dd404 Implements #2734 “New API to configure BrowserWindow title bar on Mac” 
New API supported on Yosemite 10.10 and newer.
 2015-09-14 16:50:00 +02:00
Haojian Wu
c006c4efa4 Mention 'activate-with-no-open-windows' on OS X only. 2015-09-14 20:34:45 +08:00
Haojian Wu
3ad5d17612 [OS X] Implement 'activate-with-open-windows' event for app. 2015-09-14 20:32:50 +08:00
Cheng Zhao
8534ff4526 docs: browser-window-created event 2015-09-14 17:02:36 +08:00
Tomáš Hanáček
af5262630a docs: Fix role hideothers, unhide typo 2015-09-11 14:26:48 +02:00
Jessica Lord
39bd10d1ef Merge pull request #2757 from atom/jl-web-contents-links 
Update Documentation Links to web-contents
 2015-09-10 14:48:33 -07:00
Jessica Lord
aae2d82c28 Update links to web-contents.md 2015-09-10 12:19:37 -07:00
Jessica Lord
6cfe43a644 Merge branch 'patch-1' of https://github.com/destan/electron into destan-patch-1 2015-09-10 12:13:21 -07:00
Jessica Lord
2ac2392a6b 🔥 extra line 2015-09-10 12:11:40 -07:00
Jessica Lord
7c287d565d Resolve conflicts 2015-09-10 12:09:37 -07:00
Jessica Lord
b861a174ca Merge pull request #2750 from atom/jl-doc-bits 
A Few More Documentation Things
 2015-09-10 10:41:42 -07:00
Heilig Benedek
b2af370249 Changed StringArray options to regular js objects with boolean values for better readability from the js side 2015-09-10 02:10:47 +02:00
Jessica Lord
c29a2e4992 Standardize DevTools 2015-09-09 14:11:06 -07:00
Jessica Lord
279fd0a461 Standardize **Note:** 2015-09-09 14:09:14 -07:00
Jessica Lord
1a35d6bda6 🔥 extra lines 2015-09-09 14:00:37 -07:00
Jessica Lord
5593717d78 Create Instance Properties section 2015-09-09 13:57:35 -07:00
Jessica Lord
6abc4fb255 🔥 odd, stray + 2015-09-09 13:48:04 -07:00
Gohy Leandre
590be75fa9 add ValidatedUrl to did-fail-load event 2015-09-09 15:56:16 +02:00
Destan Sarpkaya
e48f5ea1aa update broken link 2015-09-09 14:06:33 +03:00
Cheng Zhao
512f89910d docs: No more extra-plugin-dirs 2015-09-06 11:07:38 +08:00
Cheng Zhao
2454dccde0 docs: preload, node-integration, zoom-factor have been moved 2015-09-06 10:54:34 +08:00
Jessica Lord
b797804fd9 Use "in" over "on" 2015-09-04 13:44:40 -07:00
Robo
8f59c0b642 create partitionId with encodedURIcomponent 2015-09-03 20:49:29 +05:30
Robo
da5bac42f3 use embedders' browser context when partition is not specified 2015-09-03 20:49:29 +05:30
Robo
150b540e72 add spec and docs 2015-09-03 20:49:29 +05:30
Cheng Zhao
45491ca7ab Fix API changes 2015-09-03 17:50:23 +09:00
Jessica Lord
c2dcccf7c7 Merge pull request #2657 from atom/jl-std-docs-9 
Standardize Docs: web-frame, web-view-tag, window-open
 2015-09-02 18:44:32 -07:00
Timothy Cyrus
2f41641139 Update browser-window.md 
Fix App Command Web Link
 2015-09-02 15:44:51 -04:00
Jessica Lord
2e5a539f57 Merge master 2015-09-02 09:57:29 -07:00
Jessica Lord
159b6ca611 Merge pull request #2655 from atom/jl-std-docs-7 
Standardize Docs: protocol, remote, screen
 2015-09-02 09:46:39 -07:00
Cheng Zhao
bfa33de792 Merge pull request #2682 from atom/menu-item-role 
Add "role" attribute for MenuItem
 2015-09-02 10:30:41 +08:00
Jessica Lord
ae3ff4e1e3 Merge pull request #2656 from atom/jl-std-docs-8 
Standardize Docs: shell, synopsis, tray
 2015-09-01 19:10:10 -07:00
Jessica Lord
0fa0aedd86 Text edits 2015-09-01 19:08:31 -07:00
Jessica Lord
e6265ec405 Merge pull request #2654 from atom/jl-std-docs-6 
Standardize Docs: native-image, power-monitor, power-save-blocker, process
 2015-09-01 18:44:52 -07:00
Cheng Zhao
6bce5b560b docs: The "role" attribute of MenuItem 2015-09-02 09:44:01 +08:00
Heilig Benedek
dbcd0a4235 Key event sending update. 2015-09-02 02:33:40 +02:00
Jessica Lord
47d103af72 Text edits 2015-09-01 16:21:29 -07:00
Jessica Lord
91c75d73dd Text edits 2015-09-01 15:42:10 -07:00
Jessica Lord
2ead38b03f Text edits on remote 2015-09-01 15:30:08 -07:00
Jessica Lord
dd2ed559cf Merge pull request #2638 from atom/jl-std-docs-5 
Standardize Docs: menu, menu-item
 2015-09-01 14:26:11 -07:00
Jessica Lord
95133af0ee y required if x exists 2015-09-01 14:08:42 -07:00
Cheng Zhao
0cb20c48f6 docs: Small changes to will-download event 2015-09-01 20:16:28 +08:00
Cheng Zhao
4e7f56846f Merge pull request #2650 from deepak1556/webcontents_download_event_patch 
app: add will-download event to defaultSession
 2015-09-01 20:10:43 +08:00
Robo
4062ca5f68 implement wrapSession 2015-09-01 16:50:42 +05:30
Jessica Lord
a03df3ac5a "the" 2015-08-31 20:17:14 -07:00
Jessica Lord
05d0f17447 Updates from inline comments 2015-08-31 20:05:57 -07:00
Jessica Lord
ddee9f3e75 Merge pull request #2604 from atom/jl-std-docs-4 
Standardize: global-shortcuts, ipc (main), ipc (render)
 2015-08-31 11:01:57 -07:00
Cheng Zhao
b205bd381e Merge pull request #2642 from deepak1556/app_api_patch 
process: api to set file descriptor soft limit
 2015-08-31 18:40:14 +08:00
Robo
af52eda0eb process: api to set file descriptor soft limit 2015-08-31 13:00:04 +05:30
Robo
aed487ef40 app: add will-download event to defaultSession 2015-08-31 12:57:56 +05:30
Plusb Preco
6459531bef Merge remote-tracking branch 'atom/master' 2015-08-31 14:58:17 +09:00
Cheng Zhao
49b15bd4f3 Merge pull request #2652 from SamyPesse/patch-1 
Notes about server-side implementation of auto-updater
 2015-08-31 13:50:29 +08:00
Plusb Preco
c67268a74f Improve grammar, update as upstream 2015-08-31 14:48:47 +09:00
Jessica Lord
cb62afca23 Minor text edits 2015-08-30 21:10:02 -07:00
Jessica Lord
254cdc0e6c Text edits 2015-08-30 20:52:46 -07:00
Jessica Lord
2c6210cf9c Update code example 2015-08-30 20:52:37 -07:00
Cheng Zhao
874367e2c5 Merge pull request #2643 from etiktin/patch-6 
Update web-frame.md phrasing
 2015-08-31 09:57:42 +08:00
Samy Pessé
9ee063ca14 Add section about server implementations 2015-08-31 00:07:36 +02:00
Eran Tiktin
cfc5ecb05d Update web-frame.md phrasing 2015-08-29 20:05:15 +03:00
appetizermonster
39e3506add Fix typo 2015-08-29 18:04:30 +09:00
Jessica Lord
955ae78e33 Standardize window-open 2015-08-28 23:21:09 -07:00
Jessica Lord
8d40714f78 Standardize web-view-tag 2015-08-28 23:20:59 -07:00
Jessica Lord
2c3ed90ff3 Standardize web-frame 2015-08-28 23:20:49 -07:00
Jessica Lord
b1fc18f405 Standardize tray 2015-08-28 22:46:39 -07:00
Jessica Lord
e8a04981bb Standardize synopsis 2015-08-28 22:46:31 -07:00
Jessica Lord
a2cc936a3b Standardize shell 2015-08-28 22:28:30 -07:00
Jessica Lord
e6e09a8a7c Standardize screen 2015-08-28 22:24:54 -07:00
Jessica Lord
50736296a7 Standardize remote 2015-08-28 22:17:35 -07:00
Jessica Lord
b759999272 Standardize protocol 2015-08-28 22:03:39 -07:00
Jessica Lord
a5969fd076 Standardize process 2015-08-28 21:47:31 -07:00
Jessica Lord
91150839be Standardize power-save-blocker 2015-08-28 21:44:13 -07:00
Jessica Lord
83aa9df1ee Standardize power-monitor 2015-08-28 21:37:07 -07:00
Jessica Lord
a38d34d368 Standardize native-image 2015-08-28 21:33:45 -07:00
Jessica Lord
e8461b6f90 Capital Ms 2015-08-28 16:35:22 -07:00
Jessica Lord
33a19f9071 Edits and standardization 2015-08-28 16:19:28 -07:00
gellert
58081ca9e9 setOffscreenRender and api docs added 2015-08-29 00:45:00 +02:00
Jessica Lord
8ee91bce44 message → arg 2015-08-28 14:57:14 -07:00
Jessica Lord
dbc1855b42 Small edits 2015-08-28 14:21:37 -07:00
Jessica Lord
609961a1de Merge pull request #2585 from atom/jl-std-docs-2 
Standardize: clipboard, content-tracing, crash-reporter
 2015-08-28 13:51:16 -07:00
Jessica Lord
6277a65bb7 Merge pull request #2535 from atom/jl-br-win 
Updating Browser Window Documentation
 2015-08-28 11:31:08 -07:00
Jessica Lord
26f7f2ab21 Merge pull request #2602 from atom/jl-std-docs-3 
Standardize Docs: dialog, file-object, frameless-window
 2015-08-28 11:30:18 -07:00
Jessica Lord
aa03fddb62 contentTracing → tracing → content-tracing 2015-08-28 10:57:20 -07:00
Jessica Lord
bbf2cbb6f6 Small edits 2015-08-28 10:50:30 -07:00
Jessica Lord
221eff7fec ⬇️ list level 2015-08-28 10:50:02 -07:00
Jessica Lord
c2073a3c45 Consolidate note on experimental APIs 2015-08-28 10:34:48 -07:00
Jessica Lord
d02ced87b8 message → arg, 80-col 2015-08-27 10:13:25 -07:00
Tim Ruffles
4bc9bf7654 improve advice on callbacks passed from renderer to main 
Remote is a great feature, it's a shame to put people off unnecessarily. I think the original warnings given are too extreme

The potential bugs that stem from not cleaning up event handlers (or any reference) are present in any Javascript code. We don't avoid using event-handlers in the DOM because we might forget to clean them up!

I've added an example of the behaviour of return values from synchronously called callbacks from renderer, and have changed the advice from 'you shouldn't do this' to 'be careful when you do this'.
 2015-08-27 17:10:02 +01:00
Jessica Lord
f74d7d71e6 Edits per inline comments 2015-08-27 08:11:51 -07:00
Cheng Zhao
8a09cf5369 Add webFrame.setZoomLevelLimits API 2015-08-27 22:08:25 +08:00
Jessica Lord
a1f17069ec First run t ipc-r 2015-08-26 17:56:10 -07:00
Jessica Lord
71f46c0287 arg → message 2015-08-26 17:52:45 -07:00
Jessica Lord
a34a16653e Standardize global-shortcut 2015-08-26 17:32:47 -07:00
Jessica Lord
f96c76584f First run at ipc-m-p edits 2015-08-26 17:27:17 -07:00
Jessica Lord
586b407103 Small edits and line wrap 2015-08-26 16:41:25 -07:00
Jessica Lord
715a88026e Small edits 2015-08-26 16:28:44 -07:00
Jessica Lord
3001ef7980 General text edits to content-tracing 2015-08-26 14:56:00 -07:00
Jessica Lord
0a4144e67a Merge branch 'master' into jl-std-docs-2 2015-08-26 14:26:36 -07:00
Jessica Lord
71fa87e4ed Note about platform specific apis 2015-08-26 14:14:59 -07:00
Jessica Lord
4e781eb042 Add platform labels 2015-08-26 14:05:47 -07:00
Jessica Lord
5f1897713c Edits, grammar, punctuation and merge conflicts 2015-08-26 13:57:42 -07:00
Jessica Lord
38b519ceb5 Add (optional) notation 2015-08-26 10:45:57 -07:00
Jessica Lord
71f74f4042 Add platform label where applicable 2015-08-26 10:45:57 -07:00
Jessica Lord
c282d4c0ff Line wrap 80-col 2015-08-26 10:45:57 -07:00
Jessica Lord
00de81771c Text edits per commit comments 2015-08-26 10:45:16 -07:00
Jessica Lord
840095b444 Break out methods, standardize 2015-08-26 10:45:15 -07:00
Jessica Lord
ac84f56e36 Merge pull request #2533 from atom/jl-snd-docs 
Standardize Docs: app, auto-updater, styleguide
 2015-08-25 14:37:48 -07:00
Jessica Lord
aeb37941bb Replace platform notes with one general note 2015-08-25 10:12:21 -07:00
Jessica Lord
f4783772c5 Merge branch 'master' into jl-std-docs-2 2015-08-25 06:10:04 -07:00
Jessica Lord
76416d5e47 Standardize frameless-window 2015-08-25 05:56:38 -07:00
Plusb Preco
1065374db4 Merge remote-tracking branch 'atom/master' 2015-08-25 21:56:37 +09:00
Jessica Lord
864c8df639 Standardize file-object 2015-08-25 05:48:24 -07:00
Jessica Lord
81ed608b9c Standardize dialog 2015-08-25 05:46:06 -07:00
Jessica Lord
d2288815f8 List punctuation in crash-reporter 2015-08-25 05:18:02 -07:00
Jessica Lord
2c7ccffe1a Line wrap at 80-col 2015-08-25 05:16:20 -07:00
Jessica Lord
a67767dbea Standardize crash-reporter 2015-08-25 05:01:57 -07:00
Jessica Lord
703ced32db Standardize content-tracing 2015-08-25 04:49:48 -07:00
Plusb Preco
5dc5f52f32 Fix typos and improve grammer, translate more files 
Translate content-tracing-ko.md file.
Fix typos, improve grammer in tutorials and update as upstream.
 2015-08-25 14:43:37 +09:00
Cheng Zhao
a14739bde9 Merge pull request #2553 from etiktin/patch-3 
Update dialog.md with info about filter extensions
 2015-08-25 12:49:13 +08:00
Plusb Preco
5a37f96434 Remove comments about remote buffer 
Remove comments about remote buffer in browser-window.md, because remote
buffer now supports in remote module.
 2015-08-25 10:14:52 +09:00
Jessica Lord
7f72207e66 Add platform label where applicable 2015-08-24 15:33:07 -07:00
Jessica Lord
90392e9231 Standardize clipboard 2015-08-24 14:35:43 -07:00
Jessica Lord
d87c8a8291 Add optional notation 2015-08-24 14:56:19 +02:00
Jessica Lord
9b84dc4e1a Line wrap 80 2015-08-24 14:38:29 +02:00
Jessica Lord
6c984fac7c Add file to KO translation docs 2015-08-22 14:23:57 +02:00
Jessica Lord
3f52a91312 Create directory for KO translations 2015-08-22 14:21:01 +02:00
Eran Tiktin
c686fc4d6b Made sure that lines are not longer than 80 characters 2015-08-22 05:09:37 +03:00
Eran Tiktin
db2f0a68e8 Update dialog.md with info about filter extensions 
There was some confusion about the correct way to add an `All Files` filter (see #2525), so I added it to the example.
Also added a short note about the extension syntax.

This is related to PR #2547.
 2015-08-21 21:18:37 +03:00
Cheng Zhao
d7cf460918 docs: callback => completion in some places 2015-08-21 20:16:56 +08:00
Cheng Zhao
9212a1db8e Merge branch 'master' into chrome44 2015-08-21 19:29:34 +08:00
Cheng Zhao
ec18c2f354 Merge pull request #2453 from etiktin/nativeimage_ico_support_windows 
Add support for using .ico icon files on Windows
 2015-08-21 11:45:12 +08:00
Cheng Zhao
01921ee6fa Merge branch 'master' of https://github.com/preco21/electron into preco21-master 
Conflicts:
	docs/api/browser-window-ko.md
 2015-08-21 11:30:47 +08:00
Plusb Preco
ad24c11f32 Merge remote-tracking branch 'atom/master' 2015-08-21 11:41:07 +09:00
Plusb Preco
351dc4ed6b Translate more files, fix outdated remote.md section 
Translate content-tracing(50%), remote docs.
Fix `Remote buffer` section as outdated.
 2015-08-21 11:33:02 +09:00
Cheng Zhao
8cc602ff94 Merge pull request #2515 from atom/fix-no-print-background 
Fix a typing error in option checking: printBackgrounds => printBackground
 2015-08-21 09:02:08 +08:00
Cheng Zhao
cf6415bf84 Merge pull request #2520 from etiktin/patch-2 
Update browser-window.md
 2015-08-21 08:57:14 +08:00
Eran Tiktin
2bc087b5d5 Merge branch 'master' into nativeimage_ico_support_windows 2015-08-20 17:11:52 +03:00
Plusb Preco
172cc22d90 Fix some typos, update as upstream 2015-08-20 07:50:07 +09:00
Jessica Lord
454413f69a Standardize auto-updater.md 2015-08-19 18:55:11 +02:00
Jessica Lord
714745cdd7 Add 'returns' and change h2 descriptions 2015-08-19 18:51:36 +02:00
Jessica Lord
624b6b9762 Standardize app.md 2015-08-19 18:28:48 +02:00
Haojian Wu
4e6dc49646 📝 Fix a typing error: printBackgrounds => printBackground 2015-08-19 09:44:33 +08:00
Eran Tiktin
129d92b30a Update browser-window.md 
Update the `beforeunload` example to use `e.returnValue = false` instead of `return false`, since `e.returnValue` always works while the `return` works only in certain conditions. See #2481 for details.
 2015-08-18 19:34:14 +03:00
Petr Felzmann
7842a90c5e Fix absolute url to github 2015-08-17 15:03:04 +02:00
Petr Felzmann
acffc713e0 Fix formatting of print and printToPDF methods 2015-08-17 10:52:10 +02:00
Cheng Zhao
7d97bb6fe0 docs: Rewrite docs for new protocol API 2015-08-14 13:44:18 +08:00
Cheng Zhao
33eadad139 popContextMenu => popUpContextMenu 2015-08-10 13:00:15 +08:00
Plusb Preco
40c7e6e179 Update as upstream, translate 2 files, fix some typos 2015-08-10 03:33:32 +09:00
Eran Tiktin
c495088390 Updated native-image.md 
Add a mention of the support for .ico files on Windows
 2015-08-08 19:08:09 +03:00
Alex Ryan
fb60f7946f Fixed typo 2015-08-06 22:15:59 -07:00
Cheng Zhao
958658513c Refactor code in taskbarHost 2015-08-06 12:44:07 +08:00
Cheng Zhao
f740684f41 Merge pull request #2400 from atom/thumbar_button 
Implement API for supporting thumbnail toolbars
 2015-08-06 09:55:26 +08:00
Robo
0a7a4c0d0a webview: adding load-commit event 2015-08-05 19:22:30 +05:30
Haojian Wu
78eac4116c Polish thumbar code. 
* Fix a memory leak in thumbar initialization.
* Check the number of thumbar buttons, should be <= 7.
* Correct to check thumbar button click event.
 2015-08-05 19:38:12 +08:00
Haojian Wu
97ab780305 📝 BrowserWindow.setThumbarButton API. 2015-08-05 13:55:04 +08:00
Robo
3b05b135a5 tracing: fix api and docs 2015-08-05 02:29:55 +05:30
Cheng Zhao
7c75329b18 Merge pull request #2375 from deepak1556/web_frame_api_patch 
webFrame: api to make scheme bypass CSP
 2015-08-03 14:46:40 +08:00
Cheng Zhao
e135bcb5b7 docs: userGesture is optional 2015-08-03 14:43:01 +08:00
Robo
9fb03d584c add spec and fix docs 2015-07-31 12:30:17 +05:30
Robo
92ea533aee webFrame: api to make scheme bypass CSP 2015-07-30 22:36:02 +05:30
Robo
239d535cac render: executejavascript with option to simulate usergesture 2015-07-30 15:38:46 +05:30
Cheng Zhao
bbce2c7e2f Merge pull request #2372 from atom/allow-insecure-content 
Add allowing-insecure-content option
 2015-07-30 09:38:27 +08:00
Plusb Preco
0f648f4468 Update as upstream 2015-07-30 10:27:56 +09:00
Plusb Preco
05def654c3 Translate web-view-tag-tag-ko.md, improve grammer 2015-07-30 09:56:27 +09:00
Haojian Wu
f154da38e6 Make 'allow-displaying-insecure-content' and 
'allow-running-insecure-content' higher priority than `web-security`.
 2015-07-29 18:08:44 +08:00
Cheng Zhao
898a838ad7 Merge pull request #2340 from atom/set_download_path_api 
Implement setDownloadPath API.
 2015-07-29 17:19:02 +08:00
Cheng Zhao
d719244d1e Merge pull request #2327 from deepak1556/devtools_api_patch 
webContents: api to add/remove path from devtools workspace
 2015-07-29 17:16:02 +08:00
Haojian Wu
1d0568dd5b 📝 allow-running-insecure-content and 
`allow-displaying-insecure-content`.
 2015-07-29 16:17:14 +08:00
Cheng Zhao
b2f03fc2d8 Add metaKey 2015-07-29 14:44:08 +08:00
Cheng Zhao
3e1a5b229c docs: modifiers removed 2015-07-29 14:27:32 +08:00
Haojian Wu
f40155645c 📝 say more about setDownloadPath API. 2015-07-29 14:13:28 +08:00
Cheng Zhao
15273c1f7a docs: Don't say things that are expected 2015-07-29 12:41:40 +08:00
Cheng Zhao
edde653d60 Merge branch 'feature/modifiers-click-tray' of https://github.com/nishanths/electron into nishanths-feature/modifiers-click-tray 2015-07-29 12:19:17 +08:00
Robo
66553eea1a webContents: api to add/remove path from devtools workspace 2015-07-29 09:29:38 +05:30
Cheng Zhao
2c97cd64cf Minor style fix for #2352 2015-07-29 11:48:40 +08:00
Cheng Zhao
ff6b9d0907 Merge pull request #2352 from nishanths/feature/native-image-is-template 
Add NativeImage.isTemplateImage method
 2015-07-29 11:47:00 +08:00
Cheng Zhao
1bc49487ad Merge pull request #2314 from UsabilityEtc/update-api-docs 
Update api docs
 2015-07-29 11:35:14 +08:00