Commit graph

8411 commits

Author SHA1 Message Date
Charlie Hess
03d25ce6c0 Revert "Add some shady methods to get V8 objects or arrays from NSDictionary or NSArray."
This reverts commit 2295f3a832.
2016-05-03 10:32:42 -07:00
Charlie Hess
f84a973d69 Revert "Use a DictionaryValue everywhere instead of a string map."
This reverts commit 90cc10944a.
2016-05-03 10:31:53 -07:00
Charlie Hess
90cc10944a Use a DictionaryValue everywhere instead of a string map. 2016-05-02 16:18:58 -07:00
Charlie Hess
2295f3a832 Add some shady methods to get V8 objects or arrays from NSDictionary or NSArray. 2016-05-02 14:45:59 -07:00
Charlie Hess
b53480e15c Merge remote-tracking branch 'origin/master' into hands-on-hand-off 2016-05-02 12:18:26 -07:00
Charlie Hess
dbe36748d4 Merge branch 'master' of https://github.com/atom/atom-shell 2016-05-02 12:18:10 -07:00
Kevin Sawicki
543211b53a Merge pull request #5372 from electron/update-appveyor
Update link to AppVeyor build badge
2016-05-02 09:26:14 -07:00
Kevin Sawicki
fecd9ee4a0 Update link to AppVeyor build badge 2016-05-02 09:07:14 -07:00
Cheng Zhao
7cbe6bc8bd Merge pull request #5366 from electron/bootstrap-libchromiumcontent
Add --build_libchromiumcontent command line switch
2016-05-02 19:07:22 +09:00
Cheng Zhao
bd70d9008f Update modules before calling build_libchromiumcontent 2016-05-02 07:45:48 +00:00
Cheng Zhao
cc24bea813 Fix pylint warnings 2016-05-02 16:38:58 +09:00
Cheng Zhao
459a65d296 docs: the --build_libchromiumcontent switch 2016-05-02 16:35:33 +09:00
Cheng Zhao
64abae0b3c docs: Cleanup unnecessary parts in build-instructions-linux.md 2016-05-02 16:26:18 +09:00
Cheng Zhao
26c0ad1c2f Add --build_libchromiumcontent option 2016-05-02 16:17:38 +09:00
Cheng Zhao
f1edd88e56 Merge pull request #5365 from TyanNN/master
Translated application distribution and application packaging to ru_RU
2016-05-02 10:08:20 +09:00
Cheng Zhao
c48598a5bc Merge pull request #5360 from miniak/patch-1
Fix systemPreferences docs
2016-05-02 09:43:35 +09:00
TyanNN
6cb8f278a2 Translated application distribution and application packaging to ru_RU 2016-05-01 21:18:49 +03:00
Milan Burda
91911d2d32 Fix systemPreferences docs 2016-05-01 18:03:58 +02:00
Cheng Zhao
586e5e2ba5 Merge pull request #5361 from preco21/korean-docs
docs: Update Korean docs as upstream
2016-05-01 14:34:00 +09:00
Cheng Zhao
b2e77b2e6b Merge pull request #5357 from TyanNN/master
Translated Quickstart to ru_RU
2016-05-01 11:46:15 +09:00
Charlie Hess
21ae288ee7 📝 about the plist changes. 2016-04-30 13:03:10 -07:00
Charlie Hess
05493502ea Value first, key second. 2016-04-30 11:17:29 -07:00
Plusb Preco
33aecb9978 📝 Update Korean docs as upstream
[ci skip]
2016-05-01 02:46:19 +09:00
Plusb Preco
a554f9e683 📝 Update Korean docs as upstream
[ci skip]
2016-05-01 02:10:23 +09:00
Plusb Preco
6fda14ce88 📝 Update Korean docs as upstream
[ci skip]
2016-05-01 01:53:21 +09:00
Plusb Preco
f426c9c951 📝 Improve grammar
[ci skip]
2016-05-01 01:12:54 +09:00
Plusb Preco
bde412dd69 📝 Fix typos
[ci skip]
2016-05-01 01:11:21 +09:00
Cheng Zhao
03ce8a195a Merge pull request #5359 from electron/windows-pdb
Upload PDBs to Windows symbol server
2016-05-01 00:10:34 +09:00
Cheng Zhao
47f7f7b02e Revert "Don't upload PDB files in CI"
This reverts commit 7ab8134613.
2016-04-30 21:43:33 +09:00
Cheng Zhao
d91cd424fe Revert "Run tests for branches on appveyor"
This reverts commit 33370b18b3.

This commit was wrongly pushed.
2016-04-30 21:21:11 +09:00
Cheng Zhao
5766f4703a Merge pull request #5358 from electron/windows-ci
Run tests on Windows CI machine
2016-04-30 21:18:23 +09:00
Cheng Zhao
f65f8918c9 Fix specs on Windows when running without desktop session 2016-04-30 21:03:22 +09:00
Cheng Zhao
33370b18b3 Run tests for branches on appveyor 2016-04-30 20:42:24 +09:00
TyanNN
dae63ec4f1 Translated Quickstart to ru_RU 2016-04-30 13:54:19 +03:00
Cheng Zhao
214eb0430c Fix a few failing tests on Windows 2016-04-30 18:21:18 +09:00
Cheng Zhao
2a55d93501 Remove the output file after testing 2016-04-30 17:52:53 +09:00
Cheng Zhao
b68a25835f Make sure output is written when test fails 2016-04-30 17:48:07 +09:00
Cheng Zhao
3dcf69eab3 Also run tests on 32bit Windows 2016-04-30 17:17:23 +09:00
Cheng Zhao
8aa88067ca Do not write to stdout in Electron when running on win32 CI machine
This makes Electron crash on CI machine somehow.
2016-04-30 17:08:51 +09:00
Cheng Zhao
6756f8c7af Make win32 CI machine run tests 2016-04-30 15:38:23 +09:00
Charlie Hess
cea1b49db0 Add some documentation in app.md. 2016-04-29 22:25:09 -07:00
Charlie Hess
195940292d This is preventDefault by convention. 2016-04-29 22:08:19 -07:00
Charlie Hess
88805ec7e2 Make the Linter happy. 2016-04-29 22:05:36 -07:00
Cheng Zhao
fe3c78ad84 Merge pull request #5353 from electron/update-old-bracket-notation-in-translations
update all references to old atom-log bracket notation
2016-04-30 12:13:07 +09:00
Cheng Zhao
47a2a3a13f Merge pull request #5349 from electron/link-to-electron-prebuilt
describe electron-prebuilt and link to it
2016-04-30 11:59:44 +09:00
Cheng Zhao
b693ced765 Merge pull request #5346 from electron/update-quick-start-code
update quick-start code to match quick-start repo
2016-04-30 11:56:50 +09:00
Zeke Sikelianos
9f99ba3b73 update all references to old atom-log bracket notation 2016-04-29 18:35:02 -07:00
Charlie Hess
3a9a1d35d7 Add the AppDelegate override for restoring from hand-off, and fire the app event. 2016-04-29 17:37:01 -07:00
Charlie Hess
c20acb0361 Implement a "continue-activity" event on app for resuming from hand-off. 2016-04-29 17:36:04 -07:00
Charlie Hess
6df4bb176d Implement app.setUserActivity(type, userInfo). 2016-04-29 17:35:07 -07:00