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

8038 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cheng Zhao
71b67534a8 Fix coding styles 2016-04-07 15:45:20 +09:00
Paul Betts
3ee366257c Allow bootstrap to be invoked via python2 
This means that on most Linux distributions where python3 is the default, we
can invoke `python2 script/bootstrap.py` and have it all work
 2016-04-07 15:43:57 +09:00
Cheng Zhao
d171cfe8d0 Merge pull request #4924 from electron/bengotow/osx-tray-templates 
Fix broken template image support in Tray icon
 2016-04-07 15:40:35 +09:00
Cheng Zhao
548febfa4c Fix style issues 2016-04-07 15:23:16 +09:00
Ben Gotow
e0ee60f290 Fix memory leak 2016-04-07 15:21:07 +09:00
Ben Gotow
91457fe739 Support images larger than self.bounds 2016-04-07 15:21:07 +09:00
Ben Gotow
f9644463a9 Fix broken template image support in Tray icon 
Between Electron `0.30.x` and `0.37.x`, the tray icon stopped automatically inverting template images when highlighted. NSImageView normally uses the correct color for template images magicaly, but I think the addition of event handlers in the container view prevents the image view from determining highlight state.

This PR switches to drawing the image manually. The `drawRect` function decides whether to use `image` or `alternateImage`(pressed image) and then if that image is marked as a template, it fills it with the same color used for the text before drawing it.
 2016-04-07 15:21:07 +09:00
Cheng Zhao
80f66031cb Merge pull request #5068 from electron/fix-ci 
Update node: bring CI back to green
 2016-04-07 15:20:16 +09:00
Cheng Zhao
fb299c7fcb Update node: bring CI back to green 2016-04-07 14:58:14 +09:00
Cheng Zhao
55b8e9aa44 Bump v0.37.5 2016-04-07 10:34:25 +09:00
Cheng Zhao
b4885b9a37 atom => electron in upload script 2016-04-07 10:34:25 +09:00
Cheng Zhao
b48788af43 Merge pull request #5033 from electron/fix-buffer-crash 
Rebase on the correct Node commit
 2016-04-05 20:44:09 +09:00
Cheng Zhao
dd283ff8d7 spec: We should not use pre release of Node 2016-04-05 19:53:07 +09:00
Cheng Zhao
7796dbb7ce Update node: rebase on v5.10.0 tag instead of master branch 2016-04-05 19:34:13 +09:00
Cheng Zhao
c562b24df8 spec: Add test case for #5028 2016-04-05 17:08:27 +09:00
Kevin Sawicki
fa27120429 Merge pull request #4978 from electron/new-electron-org 
Updates links for new GitHub organization
 2016-04-04 12:34:50 -07:00
Kevin Sawicki
c2bcf8cbde Update links for new Electron org 2016-04-04 12:18:37 -07:00
Kevin Sawicki
b553981644 Update readme and contributing guide for new org 2016-04-04 12:07:22 -07:00
Kevin Sawicki
fc84c952f2 Update source code for new org 2016-04-04 12:07:22 -07:00
Kevin Sawicki
102f7e8e33 Update docs for new org 2016-04-04 12:05:53 -07:00
Kevin Sawicki
5ffa30a563 Update submodules for new org 2016-04-04 12:05:53 -07:00
Cheng Zhao
fdb138f79c Bump v0.37.4 2016-04-03 18:31:23 +09:00
Cheng Zhao
d62d8bbf0a Merge pull request #4998 from atom/node-5.10.0 
Upgrade Node to v5.10.0
 2016-04-03 16:53:11 +09:00
Cheng Zhao
39a20ea4fb Upgrade Node to v5.10.0 2016-04-03 15:05:47 +09:00
Cheng Zhao
442ccbe204 Merge pull request #4997 from atom/default-app-background-color 
Set backgroundColor for the default app
 2016-04-03 14:07:39 +09:00
Cheng Zhao
a9ea8b92f0 Merge pull request #4988 from atom/accelerator-docs 
use example accelerators that align with best practices
 2016-04-03 14:03:32 +09:00
Cheng Zhao
eb82f7cea9 Update docs for backgroundColor 2016-04-03 13:55:33 +09:00
Cheng Zhao
165009681b Set backgroundColor for the default app 2016-04-03 13:53:09 +09:00
Cheng Zhao
a6f19c4292 Merge pull request #4996 from atom/osx-no-white-flash 
Remove the white flash when loading page on OS X
 2016-04-03 13:44:43 +09:00
Cheng Zhao
491bf30a15 Window with frame should have white background by default 2016-04-03 12:04:58 +09:00
Cheng Zhao
f94661547c mac: backgroundColor should not change titlebar color 2016-04-03 11:59:21 +09:00
Cheng Zhao
4a724e91e0 Update libchromiumcontent: remove white background on OS X 2016-04-03 11:17:57 +09:00
Cheng Zhao
e5aa712bf3 Merge pull request #4995 from atom/fix-white-flash 
Set the background color of RenderViewHost to transparent
 2016-04-03 11:14:27 +09:00
Cheng Zhao
9828875ebc Set the background color of RenderViewHost to transparent 2016-04-03 10:42:49 +09:00
Cheng Zhao
8c3ff97ba4 Make the logic of ParseHexColor more easy to understand 
This also fixes the #FFFF style of color hex.
 2016-04-03 10:42:49 +09:00
Cheng Zhao
8bc95fe279 Merge pull request #4993 from atom/background-color 
Use BrowserWindow's backgroundColor as renderer view's background color
 2016-04-03 09:39:10 +09:00
Cheng Zhao
19a172f2f5 Remove the hacks because of transparent background 2016-04-02 21:21:30 +09:00
Cheng Zhao
1980d85f3e Fix converting SkColor to NSColor 
Close #4992.
 2016-04-02 21:18:15 +09:00
Cheng Zhao
cb470cb94b Use BrowserWindow's backgroundColor as renderer view's background color 2016-04-02 20:46:50 +09:00
Cheng Zhao
70ca49e36a Merge pull request #4989 from atom/document-option-vs-alt 
use alt, not option
 2016-04-02 19:19:09 +09:00
Cheng Zhao
7bfe80f835 Merge pull request #4897 from atom/node-integration-inheritance 
Disable node on child window when disabled on parent
 2016-04-02 19:14:58 +09:00
Kevin Sawicki
527ff66115 Pull app/session from remote 2016-04-01 16:59:13 -07:00
Kevin Sawicki
3695e38719 Remove duplicate require 2016-04-01 16:53:44 -07:00
Kevin Sawicki
7734f6af62 Remove semicolons 2016-04-01 16:52:55 -07:00
Kevin Sawicki
909ed54bef Remove stray log 2016-04-01 16:52:28 -07:00
Kevin Sawicki
230ed78dd6 Remove lint warnings 2016-04-01 16:51:17 -07:00
Kevin Sawicki
ef2a28ca86 Listen for browser-window-created event for asserts 2016-04-01 16:50:20 -07:00
Kevin Sawicki
55b12c184b Doc node integration inheritance 2016-04-01 16:48:21 -07:00
Kevin Sawicki
eafe9c245b Disable guest node integration when embedder has it disabled 2016-04-01 16:48:21 -07:00
Kevin Sawicki
fd12e1f506 Add failing spec for webview nodeIntegration inheritance 2016-04-01 16:47:17 -07:00