Commit graph

19674 commits

Author SHA1 Message Date
Shelley Vohr
1c64ac8c41
fix: repair fs.statSyncNoException throwing exceptions (#13390) 2018-06-23 00:01:28 -07:00
Samuel Attard
a96fc9170c
Merge pull request #13379 from electron/native-mate-in-electron
Merge native_mate into electron/electron
2018-06-23 02:00:58 +10:00
John Kleinschmidt
1c4d20eb94
Merge pull request #13322 from electron/pepper_flash_feature
build: move pepper flash behind feature flag
2018-06-22 11:58:10 -04:00
John Kleinschmidt
a971cbf57d
Merge pull request #13377 from electron/chromium-style-win
chore: fix chromium-style errors in windows code
2018-06-22 11:46:29 -04:00
John Kleinschmidt
8b6d4b6f0e
Merge pull request #13376 from electron/gn-windows-deps
chore: [gn] fix DEPS to work on windows
2018-06-22 10:53:36 -04:00
Samuel Attard
d068ff3afb fix linting 2018-06-22 13:43:39 +10:00
Samuel Attard
daa64e21f6 rename back to expected values 2018-06-22 11:42:55 +10:00
Samuel Attard
ea4a497442 move native_mate script to the electron scripts dir 2018-06-22 11:38:36 +10:00
Samuel Attard
b6f063d954 update paths for native_mate 2018-06-22 11:36:03 +10:00
Samuel Attard
8b31886c77 remove native_mate submodule 2018-06-22 11:35:14 +10:00
Samuel Attard
d04cdbb367 Merge 'native_mate' into 'electron' 2018-06-22 11:32:08 +10:00
Samuel Attard
4cada5e845 prepare for merging to electron 2018-06-22 11:29:57 +10:00
Jeremy Apthorp
43c1a7778d chore: fix chromium-style errors in windows code 2018-06-21 16:50:58 -07:00
Jeremy Apthorp
0660fb3f25 chore: [gn] fix DEPS to work on windows 2018-06-21 16:43:41 -07:00
Jeremy Apthorp
57d365a9f4 Update build-instructions-windows.md 2018-06-21 12:10:33 -07:00
Jeremy Apthorp
aa4ca406c8 chore: update GN build for chrome 66 2018-06-21 11:30:43 -07:00
deepak1556
337cb7910e update libcc ref 2018-06-21 22:32:22 +05:30
Zeke Sikelianos
4a7dda7c45
Merge pull request #13366 from c960657/patch-1
docs: fix links to webview API doc
2018-06-21 09:10:31 -07:00
Jeremy Apthorp
f4d0cef619 chore: [gn] remove gclient hook for node config.gypi (#13354) 2018-06-22 00:44:19 +10:00
Alexey Kuzmin
10a174fc6a spec: refactor helper closeWindow() function (#13337) 2018-06-22 00:43:15 +10:00
Alexey Kuzmin
b9da1575f0 spec: enable a disabled test (#13346) 2018-06-22 00:42:55 +10:00
Christian Schmidt
cdd2bab7d5
Fix links to webview.md 2018-06-21 16:39:07 +02:00
Samuel Attard
e15ffd96eb
Merge pull request #30 from electron/chromium-66-upgrade
Chromium 66 Updates
2018-06-21 22:35:49 +10:00
deepak1556
5e2406081e build: move pepper flash behind feature flag 2018-06-21 17:02:12 +05:30
Jeremy Apthorp
8ccb5cc6eb chore: Annotate fallthrough switch paths with FALLTHROUGH
The compiler was throwing errors about unannotated fallthroughs when
building with GN.
2018-06-20 14:38:18 -07:00
Jeremy Apthorp
3f40e93ba7 chore: fix chromium-style errors in frame_subscriber
The chromium-style linter we run in the GN build was throwing errors
about these issues.
2018-06-20 14:14:11 -07:00
Jeremy Apthorp
99b4aac979 chore: Roll DEPS for chrome 66 in GN build 2018-06-20 14:13:43 -07:00
Milan Burda
122d00f415 Revert "Drop support of Mac OS 10.9" (#13348)
This reverts commit efa0ec0263481ae188f206625bec6f4a4e5d3ecf.
2018-06-20 13:40:18 -07:00
The Moses
6ecd8077e5 Fix broken link of electron-builder (#13341) 2018-06-20 09:42:46 -05:00
John Kleinschmidt
552399af2f
Merge pull request #13334 from electron/mas-fix-linking
Fix linking error for MAS build
2018-06-20 09:59:46 -04:00
John Kleinschmidt
55d1dde0f7
Merge pull request #13327 from electron/fix-tls
fix: tls check shouldnt rely on an external service
2018-06-20 08:59:45 -04:00
Samuel Attard
79fbd6bab1 Revert "fix: Drop support for OS X Mavericks (version 10.9)" (#13333) 2018-06-20 07:27:55 -05:00
Cheng Zhao
2b080ab575 fix: link with crashpad_client for MAS build 2018-06-20 20:50:56 +09:00
Felix Rieseberg
562eddf0e9 test: Upgrade spec dependencies (#13310)
* 📦 Update mocha, mocha-junit-reporter

* 📦 Update graceful-fs, multiparty, q, walkdir

* 📦 Update basic-auth

* 📦 Update ws

* 📦 Update dbus-native

* 📦 Upgrade yargs

* 🔒 Run `npm audit fix`

* 🔧 Fix websocket API change
2018-06-20 17:18:24 +10:00
Samuel Attard
436b124fc8 fix linting in the tls script' 2018-06-20 17:12:09 +10:00
Samuel Attard
0ca2496481 fix: tls check shouldnt rely on an external service 2018-06-20 17:05:43 +10:00
Husayn
1a8c986fb1 set mac protocol to none (#13302) 2018-06-20 13:16:37 +10:00
gnahzak
951aa83bdf Disable node options in node config (#13311) 2018-06-20 13:08:24 +10:00
Shelley Vohr
c20e0c30a2 src: base::Value::HasKey(key) => base::Value::FindKey(key) (#13312) 2018-06-20 13:07:10 +10:00
Zeke Sikelianos
0802f82356 doc: add CSP examples (#13167)
* doc: add CSP examples

* Deafult to zero-permissions CSP
2018-06-20 10:36:37 +10:00
John Kleinschmidt
fc12b5cab3
Merge pull request #13283 from jack-teng1/fix-asar-pack-cant-find-module
fix: can't load module error when app is packaged
2018-06-19 14:58:37 -04:00
John Kleinschmidt
04a7a34c42
Merge pull request #13301 from electron/revert-frame-sub-deprecation
fix: revert frame subscriber deprecation and re-enable tests
2018-06-19 14:26:14 -04:00
Heilig Benedek
f643ce4f66 revert: frame subscriber deprecation and re-enable tests 2018-06-19 19:49:44 +02:00
Jack Teng
3044607746 spec: fix asar spec due to change in node.js
node.js rename the internalModuleReadFile to internalModuleReadJSON
change spec to reflect this change
2018-06-19 10:42:21 -07:00
Jack Teng
10df019075 fix: can't load module error when app is packaged
due to change in node.js(https://github.com/nodejs/node/issues/17076)
internalModuleReadFile has been renamed to internalModuleReadJSON, and
in vendor/node/lib/internal/modules/cjs/loader.js it will call
internalModuleReadJSON and result in can't read the package.json file.
2018-06-19 10:42:21 -07:00
John Kleinschmidt
295c823a1b
Merge pull request #13298 from electron/update-libcc-ref
Update vendor/libchromiumcontent ref
2018-06-19 13:24:05 -04:00
John Kleinschmidt
d367b75680
Merge pull request #13296 from electron/miniak/drop-macos-10.9
fix: Drop support for OS X Mavericks (version 10.9)
2018-06-19 13:19:24 -04:00
Aleksei Kuzmin
e683af1eb6 Update vendor/libchromiumcontent ref 2018-06-19 18:12:41 +02:00
Milan Burda
794fe741e9 fix: Drop support for OS X Mavericks (version 10.9) 2018-06-19 17:49:27 +02:00
Jeremy Apthorp
c598272891 refactor: [gn] compile node with boringssl (#13285) 2018-06-19 10:39:43 -05:00