Commit Graph

120 Commits

Author SHA1 Message Date
Jessica Lord 8ac98b6f50 Merge pull request #63 from thompsonemerson/patch-2
fixes #61
2016-06-21 12:27:22 -04:00
Emerson Thompson 0be7f99224 fixes #61 2016-06-15 14:53:42 -03:00
Jessica Lord 1332e29fb1 Merge pull request #58 from sahildua2305/patch-1
⬆️ electron @ 1.2.0
2016-05-27 10:45:41 -07:00
Sahil Dua 0573ce7e95 ⬆️ electron 2016-05-27 07:19:42 +05:30
Kevin Sawicki 34e8dce241 ⬆️ electron@1.1.2 2016-05-24 08:35:26 -07:00
Jessica Lord 19722fb825 Bump version of Electron to v1.1.1 2016-05-20 11:35:23 -07:00
Jessica Lord 3550153dcb Merge pull request #52 from posva/es6-patch
Use string es6 interpolation
2016-05-13 14:06:57 +00:00
Eduardo San Martin Morote 46d7d193cf Use string es6 interpolation 2016-05-12 15:41:16 +02:00
Jessica Lord 0cfcd92d59 Merge pull request #50 from louistsaitszho/master
bump electron prebuilt to ^1.0.1
2016-05-12 12:46:26 +02:00
Louis Tsai ee39fff34d bump electron prebuilt to ^1.0.1 2016-05-12 00:22:15 +08:00
Jessica Lord 07c7759d45 Mention the Electron API Demos app 2016-05-11 08:48:52 +02:00
Jessica Lord 7bf866c3c5 Merge pull request #46 from electron/bump-electron-prebuilt
bump electron prebuilt to ^0.37.8
2016-04-29 13:55:25 -07:00
Jessica Lord 82d07e4639 Merge pull request #45 from electron/standardize
use standard style
2016-04-29 13:54:04 -07:00
Zeke Sikelianos 008b6d2540 bump electron prebuilt to ^0.37.8 2016-04-29 13:11:15 -07:00
Zeke Sikelianos 1c94f99097 use standard style 2016-04-29 13:08:11 -07:00
Zeke Sikelianos 732b807193 Merge pull request #44 from electron/updates
Make updates
2016-04-28 17:40:05 -07:00
Jessica Lord f7dae7a328 Copy edits per inline comments 2016-04-28 17:32:24 -07:00
Jessica Lord e1fba0fb55 Use newer Electron 2016-04-28 17:19:16 -07:00
Jessica Lord b5a73e2e08 Add comment 2016-04-28 17:18:32 -07:00
Jessica Lord df6263172b Fix path 2016-04-28 17:18:15 -07:00
Jessica Lord f3078065eb A few tweaks to readme 2016-04-20 15:18:14 -07:00
Jessica Lord ae4e0afaaf Add a comments 2016-04-20 15:14:27 -07:00
Jessica Lord 1e287bdb62 Add example and notes on using require in renderer process 2016-04-20 15:14:19 -07:00
Jessica Lord 77abe0dd3a Note availability of Node APIs 2016-04-20 15:13:58 -07:00
Jessica Lord e0192879df Do not need 'use strict' 2016-04-20 15:06:21 -07:00
Jessica Lord 4784b86b9c Merge pull request #36 from bokuweb/patch-1
update_package.json
2016-04-08 12:58:49 -07:00
Kevin Sawicki 2b2bebf38c Merge pull request #40 from electron/electron-org
Update urls for new GitHub org
2016-04-04 13:00:52 -07:00
Kevin Sawicki 6d2277b49c Update urls for new GitHub org 2016-04-04 13:00:14 -07:00
bokuweb 350e62e6fa update_package.json 2016-03-18 22:27:54 +09:00
Jessica Lord 48bdcd258f Merge pull request #32 from galeksandrp/patch-1
-> Chromium
2016-02-22 16:03:05 -08:00
Alexander Georgievskiy 3df7801198 -> Chromium 2016-02-23 02:37:57 +03:00
Jessica Lord 8ff9e5c25b Merge pull request #27 from clemens-tolboom/clemens-tolboom-patch-1
Remove $ in code example
2016-01-13 11:40:00 -08:00
Jessica Lord d74d4fc039 Merge pull request #26 from atom/app-restore
Restore window on activate event
2016-01-05 10:50:50 -08:00
Clemens Tolboom 8a60d001e4 Remove $ in code example
Let's make this copy/paste able.
2016-01-01 16:15:54 +01:00
Jessica Lord d709bb0885 Extract createWindow helper, re org 2015-12-16 11:19:56 -08:00
Jessica Lord 49228fc510 Clean up 2015-12-16 11:13:32 -08:00
Jessica Lord 3f26258efd Use stricter platform check 2015-12-16 11:11:29 -08:00
Jessica Lord 803db72fe6 Restore window on activate event 2015-12-16 11:10:38 -08:00
Jessica Lord 81158b3533 Merge pull request #24 from bokuweb/fix_ver
Fix dependencies version
2015-12-16 10:41:21 -08:00
Jessica Lord 96be8d30fb Merge pull request #25 from atom/remove-crash-reporter-starting
Remove call to crashReporter.start()
2015-12-16 10:29:45 -08:00
Kevin Sawicki d3e2c5027c Remove call to crashReporter.start() 2015-12-16 10:17:56 -08:00
Jessica Lord 7287c09f9c Merge pull request #19 from icoxfog417/issue18
fix #18
2015-12-15 17:30:17 -08:00
bokuweb 3254071d58 Fix dependencies version 2015-12-15 14:19:48 +09:00
icoxfog417 e5f2635f3b fix #18 2015-12-07 16:17:42 +09:00
laiso ceec7c3b05 Fix the deprecation warning
https://github.com/atom/electron/pull/3424
2015-12-03 15:42:53 -08:00
Kevin Sawicki 25e99f79b1 Merge pull request #9 from tcyrus/tcyrus-patch-1
Made Changes Based on Electron Quick Start Guide
2015-12-03 15:38:46 -08:00
Jessica Lord ac1e753941 Merge pull request #8 from phanect/master
Change license to CC0
2015-11-24 08:12:02 -08:00
Timothy Cyrus 575b1bcf73 Update index.html 2015-11-23 21:32:52 -05:00
Timothy Cyrus 81a25b578a Update main.js 2015-11-23 21:28:34 -05:00
Timothy Cyrus 89521a4166 Update main.js 2015-11-23 21:16:42 -05:00