mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
5270 commits 1 branch 186 tags 5.6 GiB
Commit graph

5270 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vivek Patel
90bd32c680 Replaced 'browser' with 'main' 
"A JavaScript error occured in the browser process" is confusing. Replacing it with 'main', just like everywhere else.
 2015-07-29 15:04:34 +02:00
Tim Ruffles
f9d5915542 more accuracy around why to use ASAR 
'protect' implies a lot more security than ASAR provides (none). I asked around #2374 to get some understanding of what ASAR does do for you.
 2015-07-29 13:45:30 +01:00
Cheng Zhao
643ed27fd4 Check whether entry is null 
This fixes the crash in #7877.
 2015-07-29 18:26:20 +08: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
046a8e8a08 Merge pull request #2368 from dataich/master 
do not overwrite `node-integration` option
 2015-07-29 17:25:30 +08:00
Cheng Zhao
80f45f6226 Merge pull request #2370 from atom/osx-tray 
Use NSImageView to draw tray icon.
 2015-07-29 17:22:47 +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
b311969f0e Update brightray for #2327 2015-07-29 17:16:23 +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
Haojian Wu
77a8a3d33c Add allow-running-insecure-content, allow-display-insecure-content 
in BrowserWindow option.
 2015-07-29 16:15:03 +08:00
Cheng Zhao
d5893d8c9f Merge pull request #2369 from atom/better-modifiers 
Fix a few things of Tray
 2015-07-29 15:22:27 +08:00
Cheng Zhao
409c6155c2 Merge pull request #2363 from atom/mime-check 
Fix a missing the specified mime type check in <input> accept attribute.
 2015-07-29 14:52:20 +08:00
Cheng Zhao
b786772819 Update brightray for #2324 2015-07-29 14:50:56 +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
Cheng Zhao
8d22eeb3be Use DOM's way of telling modifiers 2015-07-29 14:25:12 +08:00
Cheng Zhao
625143426a Enable using custom events when emitting 2015-07-29 14:24:45 +08:00
Haojian Wu
f40155645c 📝 say more about setDownloadPath API. 2015-07-29 14:13:28 +08:00
Haojian Wu
877830e4a1 No need for default_download_path_ member. 2015-07-29 14:04:14 +08:00
Haojian Wu
45f5a10d5d Use NSImageView to draw tray icon. 
* Fixes Tempate image doesn't show correctly in dark mode.
* Fixes the tray icon is stretched showing in menubar.
* Fixes title color will not reversed in dark mode.
 2015-07-29 13:45:01 +08:00
Cheng Zhao
d42fd6fc7e win: Pass modifers in 'clicked' events 2015-07-29 13:10:51 +08:00
Cheng Zhao
74248253f5 win: Set GUID when getting icon's bounds 2015-07-29 12:55:44 +08:00
Cheng Zhao
15273c1f7a docs: Don't say things that are expected 2015-07-29 12:41:40 +08:00
Taichiro Yoshida
fc92ceb0b6 do not overwrite node-integration option 
If `node-integration` option pass to window.open, do not overwrite by current window's one
 2015-07-29 13:41:11 +09:00
Cheng Zhao
9afa94f4b8 win: Implement double-clicked event 2015-07-29 12:36:01 +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
c500c9b289 Merge pull request #2349 from atom/mq-run-your-app 
Reorganize the Run Your App section
 2015-07-29 11:46:02 +08:00
Cheng Zhao
9afb973498 Merge pull request #2347 from deepak1556/fetch_job_headers_patch 
protocol: fix request headers in urlRequestFetchJob
 2015-07-29 11:44:47 +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
Cheng Zhao
0ca9dfbc12 Merge pull request #2337 from nishanths/feature/bounds-tray-dblclick 
Send bounding Rect on tray double click events
 2015-07-29 11:27:04 +08:00
Cheng Zhao
b08af89473 Style fix for #2328 2015-07-29 11:22:12 +08:00
Cheng Zhao
b9cf0f2126 Merge pull request #2328 from atom/tray-settings-propagate 
Propagate User App Model ID to Tray Icon
 2015-07-29 11:08:35 +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
Cheng Zhao
f4d8e32c9f Merge pull request #2350 from matiasinsaurralde/master 
Basic Spanish docs
 2015-07-28 16:22:11 +08:00
Haojian Wu
617bff8ec8 Fix a missing the specified mime type check in <input> accept attribute. 2015-07-28 10:32:13 +08:00
Nishanth Shanmugham
a44f14d76e Fix code formatting issues 2015-07-27 03:33:15 -07: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
99a8f29de9 Move event type functions to a common event_util file 2015-07-27 00:41:20 -07:00
Nishanth Shanmugham
51111430b3 Add NativeImage docs for IsTemplateImage 2015-07-26 21:59:43 -07:00
Nishanth Shanmugham
9211109088 Add NativeImage.IsTemplateImage method 
* Rename internal function that determines template image filename patterns
* Add the new IsTemplateMethod
 2015-07-26 21:58:48 -07:00
Matias Insaurralde
ad7e4a77db custom dom texts 2015-07-26 22:59:19 -04:00
Matias Insaurralde
faf10183d8 first docs 2015-07-26 22:57:43 -04:00