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

609 commits

Author SHA1 Message Date
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
Cheng Zhao
f485a9894c Merge pull request #2318 from craigshoemaker/patch-1 
📝 Windows/Linux compatibility changes
 2015-07-29 11:34:46 +08:00
Cheng Zhao
c140077d53 Merge pull request #2338 from atom/page_size_option 
Add 'pageSize' option in printToPDF API.
 2015-07-29 11:32:49 +08:00
Cheng Zhao
42ce91323c docs: Small style fix for #2337 2015-07-29 11:28:20 +08:00
Plusb Preco
11589a7bde Update as upstream 2015-07-29 02:21:32 +09:00
Jeffrey Morgan
b10560a5b0 Fix typo in auto-updater.md 2015-07-28 16:51:41 +01:00
Nishanth Shanmugham
74b4522195 Add keyboard modifiers payload to tray click events 
* Add keyboard and mouse button bitsum to Tray click events payload
* Move getBoundsFromRect: to common event_util file
* Update documentation
 2015-07-27 03:15:51 -07:00
Nishanth Shanmugham
51111430b3 Add NativeImage docs for IsTemplateImage 2015-07-26 21:59:43 -07:00
Haojian Wu
7f0cb0ce1b 📝 session.setDownloadPath API. 2015-07-26 16:52:02 +08:00
Nishanth Shanmugham
1a074bb148 Update tray double-click docs 
* Mention bounds payload
 2015-07-25 21:16:15 -07:00
Haojian Wu
74f2e9f102 📝 pageSize option. 2015-07-26 11:57:53 +08:00
Craig Shoemaker
d485cfbca3 Fixed typo 2015-07-24 06:53:55 -07:00
Cheng Zhao
b52c07f650 spec: Make dom-ready spec stronger 2015-07-24 15:48:13 +08:00
Jeffrey Morgan
4de4ef1ccc Remove change to "mapped onto" in accelerator.md 
Remove the change to “mapped onto” in `accelerator.md` after feedback
from @OlsonDev.
 2015-07-24 07:19:43 +01:00
Craig Shoemaker
959f5d61b7 Windows/Linux compatibility changes 
- Updated accelerator to cross platform values
- Added a warning to non-Mac users regarding the selector option
 2015-07-23 15:04:43 -07:00
Jeffrey Morgan
d9ee8519e9 Correct error in chrome-command-line-switches.md 
Replace “to” with “in” to correct the error identified in
`chrome-command-line-switches.md` by @OlsonDev.
 2015-07-23 20:45:08 +01:00
Plusb Preco
63258f9f53 Update as upstream, Fix typos 2015-07-24 02:39:55 +09:00
Jeffrey Morgan
8b4815fd95 Improve grammar and punctuation of crash-reporter.md 
Improve the grammar, sentence structure, punctuation and formatting of
`crash-reporter.md`.
 2015-07-23 18:02:45 +01:00
Jeffrey Morgan
32b84bd3f9 Improve grammar and punctuation of clipboard.md 
Improve the grammar, sentence structure, punctuation and formatting of
`clipboard.md`.
 2015-07-23 18:01:00 +01:00
Jeffrey Morgan
adab769700 Improve grammar and punctuation of chrome-command-line-switches.md 
Improve the grammar, sentence structure, punctuation and formatting of
`chrome-command-line-switches.md`
 2015-07-23 17:59:51 +01:00
Jeffrey Morgan
d138c2970c Improve grammar and punctuation of auto-updater.md 
Improve the grammar, sentence structure, punctuation and formatting of
`auto-updater.md`.
 2015-07-23 17:57:42 +01:00
Jeffrey Morgan
452619990e Improve grammar and punctuation of accelerator.md 
Improve the grammar, sentence structure, punctuation and formatting of
`accelerator.md`.
 2015-07-23 17:55:57 +01:00
Cheng Zhao
cc2a9f617d Add noLink option for showMessageBox 2015-07-23 17:25:37 +08:00
Cheng Zhao
72eb87a631 Make the extraSize of BrowserWindow.setAspectRatio optional 2015-07-23 10:14:02 +08:00
Cheng Zhao
ea1b89c699 Merge pull request #2250 from EyeSee360/master 
Maintain an aspect ratio for content within a window
 2015-07-23 09:45:42 +08:00
Eran Tiktin
d701e1aa40 Update dialog.md 
Added a comment about the fact that on Windows, the "question" message box uses the same icon as the "info" message box (Electron uses the task dialog API instead of the message box API). This is because Microsoft's API doesn't supply a default question icon (see `pszIcon` in https://msdn.microsoft.com/en-us/library/windows/desktop/bb760540(v=vs.85).aspx).
 2015-07-22 18:13:50 +03:00
Michael S. Barthelemy
6d25c81bd1 changes requested for pull request #2250 into electron master 2015-07-22 10:23:31 -04:00
Haojian Wu
462e6e0a82 Implement getUserAgent API. 2015-07-22 12:25:10 +08:00
Cheng Zhao
59269a70a0 docs: Mention libappindicator1 is required, close #1347 2015-07-21 11:27:43 +08:00
Cheng Zhao
dbab889fcc Merge pull request #2232 from atom/status_item_view 
Introduce custom status item view on OS X.
 2015-07-21 10:36:19 +08:00
Haojian Wu
d342c9a6df Implement 'drop-files' tray event on OS X. 2015-07-20 20:06:15 +08:00
Cheng Zhao
a1f0c24bf4 Merge pull request #2270 from UsabilityEtc/patch-1 
Improve grammar and sentence structure of app.md
 2015-07-20 18:40:09 +08:00
Robo
d3055a5ca0 session: api to set proxy 2015-07-20 15:21:47 +05:30
Jeffrey Morgan
5010c15ffc Improve grammar and sentence structure of app.md 
Improve the grammar and sentence structure of app.md. Replace references to Mac with OS X for consistency with other docs and use the OS X nomenclature of notification rather than message.
 2015-07-18 15:40:01 +01:00
Plusb Preco
0b7a1a1eef Fix typos, Improve grammer 2015-07-17 13:28:13 +09:00
Plusb Preco
72d332dfa0 Translate little files into korean 2015-07-17 09:18:16 +09:00
Cheng Zhao
8cf9df2d8d docs: Mention null session of RequestHttpJob 2015-07-16 15:17:45 -07:00
Cheng Zhao
3145c78b61 Merge pull request #2207 from deepak1556/fetch_job_patch 
protocol: create separate request context for fetch job
 2015-07-16 15:14:45 -07:00
Robo
57244e4718 use request context from session if provided 2015-07-16 20:18:33 +05:30
Cheng Zhao
db6d8de5dc docs: Say more about standard scheme 2015-07-16 06:32:09 -07:00
Cheng Zhao
652843f447 Merge pull request #2234 from astoilkov/patch-1 
fix typo in browser-window.md
 2015-07-16 04:34:23 -07: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
Cheng Zhao
c2bfc60a59 Merge pull request #2216 from UsabilityEtc/patch-1 
Improve grammar and code formatting
 2015-07-15 16:44:20 -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
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