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

4736 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cheng Zhao
666a2233a7 Merge pull request #2389 from atom/resize-mask-flag 
Fix a bug calling setResizable multiple times will take no effect on OS X.
 2015-08-03 14:52:40 +08:00
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
Cheng Zhao
d455232eb1 Merge pull request #2383 from deepak1556/render_script_execution_patch 
render: executejavascript with option to create usergesture context
 2015-08-03 14:37:29 +08:00
Ryohei Ikegami
c8a794ac34 Use constructor name to check if Promise 2015-08-01 12:20:16 +09:00
Jonathan
c0ce8723d4 Fix typo 2015-07-31 20:16:26 +02:00
Jonathan
9dab6e02ca Fix typo 2015-07-31 20:14:50 +02:00
Robo
9fb03d584c add spec and fix docs 2015-07-31 12:30:17 +05:30
Ryohei Ikegami
428ad20807 Change spec to test Promise in both side 2015-07-31 14:52:48 +09:00
Ryohei Ikegami
92af275f98 Support remote Promise in browser 2015-07-31 14:52:48 +09:00
Ryohei Ikegami
c7d1f4f6b2 Add spec for remote Promise 2015-07-31 14:52:48 +09:00
Ryohei Ikegami
ddf2cfd48d Support remote Promise in renderer 2015-07-31 14:52:37 +09:00
Haojian Wu
c69002b0dd Fix: browser window will be resiable when calling window.setResizable(false) twice. 2015-07-31 09:57:08 +08:00
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
2eaaad610d Merge pull request #2382 from jiaz/patch-3 
Add missing dependency for ubuntu build
 2015-07-30 16:53:57 +08:00
Jiaji Zhou
e0a117414b Add missing dependency for ubuntu build 
I tried to follow the document to build electron on a fresh clean built Ubuntu 15.04.
I encountered the following error message when trying to run ./script/bootstrap.py -v

Package nss was not found in the pkg-config search path. 
Perhaps you should add the directory containing `nss.pc' 
to the PKG_CONFIG_PATH environment variable 
No package 'nss' found 

After installing libnss3-dev, the build can pass.
 2015-07-30 01:21:17 -07:00
Cheng Zhao
2ab079dc7d Bump v0.30.2 2015-07-30 14:17:43 +08:00
Cheng Zhao
03e03a5daa Merge pull request #2381 from atom/my-status-item 
mac: Make the tray icon behave more like the official one
 2015-07-30 14:17:26 +08:00
Cheng Zhao
be24d3e78c mac: Make the tray icon behave more like the official one 2015-07-30 13:58:53 +08:00
Cheng Zhao
0e779e20c3 Fix compilation error caused by #2340 2015-07-30 10:38:04 +08:00
Cheng Zhao
2d5c0ac9ee Coffeescript declares variable before assigning it 2015-07-30 10:31:49 +08:00
Cheng Zhao
8d09f13bad Fix running callback when global.global is deleted 
Close #2366.
 2015-07-30 10:28:24 +08:00
Cheng Zhao
b68356b9b9 Merge pull request #2377 from CtrlVP/master 
Replaced 'browser' with 'main'
 2015-07-30 09:39:53 +08:00
Cheng Zhao
764a6e1d76 Merge pull request #2376 from timruffles/patch-2 
more accuracy around why to use ASAR
 2015-07-30 09:39:36 +08:00
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
Vivek Patel
2ded7497b6 Merge pull request #1 from CtrlVP/CtrlVP-patch-1 
Replaced 'browser' with 'main'
 2015-07-29 15:09:34 +02:00
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