Commit graph

16382 commits

Author SHA1 Message Date
Vanessa Yuen
0c3d15d890 Merge branch 'master' into publish-prebuilt 2017-07-26 15:07:33 -04:00
John Kleinschmidt
e80f9d7e49 Merge pull request #10116 from electron/ignore-npmrc
ignore .env and .npmrc
2017-07-26 11:05:17 -04:00
Zeke Sikelianos
ac248e79a4 Merge pull request #10113 from lsegal/patch-1
Mark certain Notification options as optional
2017-07-25 17:04:13 -07:00
Zeke Sikelianos
f0a12af707 ignore node-inspect's npmrc 2017-07-25 16:59:35 -07:00
Zeke Sikelianos
98d27d5abb gitignore .env and .npmrc 2017-07-25 16:58:12 -07:00
Zeke Sikelianos
3f53524b90 sort gitignore alphabetically 2017-07-25 16:57:35 -07:00
Zeke Sikelianos
1d9adbd0cf nothing 2017-07-25 16:54:30 -07:00
Zeke Sikelianos
2be31c1c0d Merge pull request #10062 from joe-re/translate-keyboard-shortcut-doc-to-japanese
translate keyboard shortcuts doc to japanese
2017-07-25 16:32:24 -07:00
Zeke Sikelianos
71602f106b Merge pull request #10085 from electron/fix-windows-store-guide-typo
fix typo in windows store guide
2017-07-25 16:30:18 -07:00
Zeke Sikelianos
3980f66f05 Merge pull request #10103 from fab1an/doc-fixes
consistency updates for the docs
2017-07-25 16:23:11 -07:00
Loren Segal
205954fa27 Mark certain Notification options as optional
This change makes the `subtitle` and `actions` options optional to the
Notification constructor, since they are only available on macOS.
2017-07-25 13:24:15 -04:00
Fabian Zeindl
5db02ffaa9 updates to the docs 2017-07-24 10:29:45 +02:00
Cheng Zhao
cb3c5ded0f Merge pull request #9975 from wayne-kim/patch-5
this code is not care a bubbling event
2017-07-24 16:07:44 +09:00
Cheng Zhao
bd87982b5c Merge pull request #10075 from alexstrat/fix/fix-content_scripts-match
Fix content scripts matches
2017-07-24 15:27:55 +09:00
Cheng Zhao
0719650315 Leak the Node environment when context is released 2017-07-24 14:56:56 +09:00
Cheng Zhao
25f168cecb Merge pull request #9951 from alexstrat/fix-chrome-storage
Fix chrome storage access scope
2017-07-24 14:01:15 +09:00
Siyuan Liu
ae7c1ae741 #10039 add BrowserView.fromId 2017-07-24 11:32:30 +08:00
Aleš Pergl
54e03d6edd Merge pull request #10053 from electron/debug_mode 2017-07-23 00:44:45 +02:00
Ales Pergl
8e34aad410 Fixed invalid empty vector subscript access 2017-07-22 14:45:50 +02:00
Ales Pergl
bdbf9e5d6a Suppress assert dialog boxes when running CI tests 2017-07-22 14:45:50 +02:00
Ales Pergl
cd9d0c1b0f Enabled true debug mode 2017-07-22 14:45:46 +02:00
Kevin Sawicki
fac32e52fc Merge pull request #10071 from electron/update-external-binaries
Update the external binaries version
2017-07-21 09:04:50 -07:00
Zeke Sikelianos
840dba385a fix type in windows store guide 2017-07-21 08:26:39 -07:00
Alexandre Lachèze
a2ba4e0a6a fix content scripts matches 2017-07-20 20:01:49 +02:00
Alexandre Lachèze
498f344e2e Correct mkdir 2017-07-20 19:50:55 +02:00
Josh Abernathy
ad14ccd195 Update the external binaries version 2017-07-20 10:04:21 -04:00
Cheng Zhao
edc2dae496 Make the status string shorter 2017-07-20 22:45:06 +09:00
Cheng Zhao
74df5f84fd Only update dbus menu when it has been changed
The dbus menu implementaion of KDE would send the about-to-show signal
whenever the menu has been changed, resulting in infinite loop on our
side.
2017-07-20 20:50:14 +09:00
joe-re
71ebb0d3e6 translate keyboard shortcuts doc to japanese 2017-07-20 02:56:23 +09:00
Zeke Sikelianos
3283238555 Merge pull request #10058 from electron/installation-woes-q-and-a
add installation advice to FAQ
2017-07-19 09:35:26 -07:00
Cheng Zhao
52c6c7e676 Merge pull request #9819 from ferreus/dev/vladimir_fix9231
🐛 Fix #9231: Don't load url when detached.
2017-07-19 11:15:30 +09:00
Zeke Sikelianos
eeeee2cde8 Merge pull request #9989 from electron/check-for-leaks
check for secrets before git push and npm publish
2017-07-18 15:30:03 -07:00
Zeke Sikelianos
f5ed6c36cc add installation advice to FAQ 2017-07-18 13:23:03 -07:00
Vanessa Yuen
40555371ba add tests for npm install 2017-07-18 13:38:57 -04:00
Kevin Sawicki
959231f766 Merge pull request #9834 from shubham2892/input-type-file-treating-packaged-app-as-directory
Fix treat packaged app as directory
2017-07-18 10:21:07 -07:00
Kevin Sawicki
7db3009234 Remove s 2017-07-18 10:19:00 -07:00
Kevin Sawicki
908c1fdfa0 Mark treatPackageAsDirectory as mac only 2017-07-18 10:18:23 -07:00
Shubham
b25a1d10a2 🍎 Add treatPackageasDirectory as an option 2017-07-18 10:13:25 -07:00
Kevin Sawicki
1d9f69e742 Merge pull request #10008 from qazbnm456/fix-pdf-viewer
Fix a query string parsing problem happend to PDF Viewer
2017-07-18 09:10:55 -07:00
Kevin Sawicki
2bac358064 Merge pull request #10015 from electron/input-dialog-filter-titles
Add filter descriptions for common accept types
2017-07-18 09:10:11 -07:00
Kevin Sawicki
5b9d31d3ff Bump v1.7.5 2017-07-17 12:45:30 -07:00
Kevin Sawicki
8ae7401f7c Merge pull request #10050 from electron/native-window-open-experimental
Mark nativeWindowOpen as experimental
2017-07-17 12:45:04 -07:00
Kevin Sawicki
a2554080ea Mark nativeWindowOpen as experimental 2017-07-17 12:40:59 -07:00
Kevin Sawicki
c567448cf6 Merge pull request #10049 from electron/debugging-typo
fix typo in macOS debugging doc
2017-07-17 12:39:14 -07:00
Kevin Sawicki
65fe703dc2 Merge pull request #9972 from electron/merge-web-preferences
Inherit webPreferences in windows opened via sandbox or nativeWindowOpen
2017-07-17 12:38:50 -07:00
Zeke Sikelianos
34c27468dd fix typo in macOS debugging doc 2017-07-17 12:12:44 -07:00
Kevin Sawicki
fc53ac3d38 Always register closed listeners 2017-07-17 11:55:16 -07:00
Kevin Sawicki
208be2a542 Set preload script on opened windows 2017-07-17 11:55:16 -07:00
Kevin Sawicki
fdb1fddc26 Only reset preferences when conversion succeeds 2017-07-17 11:55:16 -07:00
Kevin Sawicki
3925bfde8e Add spec for reloading opened window cross-origin 2017-07-17 11:55:15 -07:00