Commit graph

100 commits

Author SHA1 Message Date
Brendan Forster cf01a1dbfa make integration test timeout consistent for local and CI 2016-09-29 12:53:34 +10:00
joshaber 6ee9b647ce Publish 2016-09-28 12:17:33 -04:00
joshaber f6ea961f5d Merge branch 'master' into use-codemirror-for-diff-editor 2016-09-23 10:06:39 -04:00
joshaber 0d01b3c8b4 ++typescript 2016-09-22 12:58:08 -04:00
joshaber 585ec9958a TYPES 2016-09-19 15:55:52 -04:00
Markus Olsson b157e0be82 Omg, windows can't deal with the single quotes. Switch to doubles then 2016-09-16 11:32:47 +02:00
Markus Olsson ade27923de Surround globs in quotes 2016-09-16 11:07:57 +02:00
joshaber 715bdc6a47 Update the react type definition 2016-09-07 10:38:05 -04:00
joshaber 5ecfbaca55 Revert "Revert "Merge pull request #322 from desktop/typescript-rc""
This reverts commit da3432cd14.
2016-08-31 15:04:09 -04:00
joshaber da3432cd14 Revert "Merge pull request #322 from desktop/typescript-rc"
This reverts commit f05ab739de, reversing
changes made to 0f8d047a20.
2016-08-31 15:03:29 -04:00
joshaber 29f4da23d2 Here come dat TypeScript RC 2016-08-31 10:50:39 -04:00
joshaber 11e5e15d7c Merge branch 'master' into bump-electron 2016-08-25 09:41:37 -04:00
Kevin Sawicki 14e503731e Upgrade to same mocha version electron-mocha is using 2016-08-24 13:48:51 -07:00
Kevin Sawicki c7b0ef48be Upgrade to electron-mocha@3.0.5 2016-08-24 13:10:07 -07:00
Kevin Sawicki 01ce3e6eba electron-prebuilt -> electron 2016-08-24 08:44:47 -07:00
Josh Abernathy 78236d01f4 Merge pull request #299 from desktop/bump-ts-node-for-grate-justice
bump ts-node for great justice (and faster test execution)
2016-08-23 20:29:51 -04:00
Brendan Forster e92c0930e9 bump ts-node to get improved file resolution and much fastness 2016-08-24 08:02:52 +10:00
joshaber a7617e63b4 Bump electron 2016-08-23 10:48:16 -04:00
joshaber 8c852e38b2 Pin to 0.14.28 exactly.
Fixes #297
2016-08-23 09:57:10 -04:00
joshaber 02071b6d80 Try pinning 2016-08-08 13:58:35 -04:00
joshaber 3c196d0659 Merge branch 'master' into T-Y-P-E-S 2016-08-04 09:18:44 -04:00
Kevin Sawicki 92395f6279 Add initial integration test using spectron 2016-08-03 16:22:14 -07:00
joshaber 475bf5c496 Apply 🔥 to typings 2016-08-03 14:00:48 -04:00
joshaber b1dd35ad69 Add TYPES 2016-08-03 14:00:26 -04:00
Hubot 8a5d6686e1 Auto-merged master into bump-electron on deployment. 2016-07-28 12:49:07 -05:00
joshaber 1a50d95bfd Update to Electron 1.3.1. 2016-07-28 12:16:08 -04:00
joshaber 1ad575fa2f Get some more rules 2016-07-28 10:12:33 -04:00
joshaber 0ba3567bfc Update tslint 2016-07-28 10:12:28 -04:00
joshaber 88df012d10 Just run the start script for start. 2016-07-27 09:41:39 -04:00
joshaber d5d0facf81 Initialize the submodules too. 2016-07-27 09:41:22 -04:00
joshaber 137a1ec0e3 Try ELECTRON_NO_ATTACH_CONSOLE to see output on appveyor 2016-07-26 12:06:10 -04:00
joshaber 32d4856f1e Split our package.json into two different packages. 2016-07-21 14:31:30 -04:00
joshaber 43866fade1 Remove ohnogit 2016-07-15 18:35:07 -07:00
joshaber d68f21cfcb A N D E R S 2016-07-11 14:53:36 -04:00
Markus Olsson 5bea97f0e9 Here, have another npm package 2016-07-06 10:28:58 +02:00
joshaber fe60e15924 Don't dereference symlinks during packaging.
Fixes #100
2016-07-03 22:17:47 -04:00
joshaber ffd7f1a318 Merge branch 'master' into repositories 2016-07-01 09:30:05 -04:00
joshaber c017d6b879 Web pack the main process 2016-06-30 17:28:26 -04:00
joshaber d0ba349801 Have a base for our data. 2016-06-29 14:42:00 -04:00
joshaber a8f54cf45c Fine 2016-06-28 13:24:27 -04:00
joshaber 3fb2cba0d1 How about this 2016-06-28 13:10:45 -04:00
joshaber 7e2703ff88 Add ohnogit 2016-06-22 15:05:55 -04:00
Josh Abernathy 2cd3c321bf Merge pull request #50 from desktop/sass
Sassy styles
2016-06-22 12:07:32 -04:00
joshaber a69e32371e Bump version
To test updates
2016-06-21 17:21:11 -04:00
Markus Olsson 93f9a5e10f Extract css into separate files rather than bundling for prod builds 2016-06-17 20:48:49 +02:00
Markus Olsson a9d5bd97cb Don't include stylesheet when running under test environment
Why yes, this is a hack
2016-06-17 20:11:39 +02:00
Markus Olsson 2db5d332ce Use html webpack plugin to inject script at build time
This will automatically use the webpack server
2016-06-17 00:13:51 +02:00
Markus Olsson cf9f737c20 All dem loaders tho 2016-06-16 19:21:57 +02:00
Josh Abernathy 6896c521ac Merge pull request #43 from desktop/octicons
Octicons
2016-06-15 11:28:49 -07:00
Markus Olsson dc85dd9942 iHeardYouLikedTheCamelCase 2016-06-15 19:38:56 +02:00