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
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
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
