Commit graph

12156 commits

Author SHA1 Message Date
Brendan Forster 3cbbdab51a updated lock file 2017-10-12 15:57:47 +11:00
Brendan Forster cbd1e0d4e0 Merge branch 'master' into bump-to-npm-5-finally 2017-10-12 15:50:24 +11:00
Brendan Forster 1b04319b03 Merge pull request #3007 from desktop/adding-tracing-for-common-tasks
adding some tracing when interacting with backing stores
2017-10-12 11:36:56 +11:00
Brendan Forster 0f642ff839 consistent use of quotes 2017-10-12 11:23:26 +11:00
Brendan Forster 9da51e8197 Merge pull request #3017 from desktop/electron-1-7-9
Upgrade to Electron 1.7.9
2017-10-12 09:40:44 +11:00
Brendan Forster 3d54ec959d regenerate lock file 2017-10-12 09:05:01 +11:00
Brendan Forster 6b459c8c78 Merge branch 'master' into bump-to-npm-5-finally 2017-10-12 09:03:40 +11:00
Brendan Forster fbcbd6c31f oops, bad merge 2017-10-12 08:56:38 +11:00
Brendan Forster 101f6e137d Merge branch 'master' into adding-tracing-for-common-tasks 2017-10-12 08:56:02 +11:00
joshaber b54972640d Bump the npmrc too 2017-10-11 14:55:47 -04:00
joshaber 2ec4cb4aea Upgrade to Electron 1.7.9 2017-10-11 14:54:52 -04:00
joshaber a6e1681b71 1.0.4-beta1 2017-10-11 14:23:44 -04:00
Don Okuda 592fe5e53e Merge pull request #3000 from desktop/diff-contrasts
Increase diff contrast and improve gutter behavior
2017-10-11 09:32:39 -07:00
Josh Abernathy 10b5d84572 Merge pull request #3010 from desktop/flush-cache-after-login-changes
cache missing users after signing into an account
2017-10-11 10:10:03 -04:00
Josh Abernathy c103b8b195 Merge pull request #3009 from desktop/more-HEAD-shenanigans
more HEAD shenanigans
2017-10-11 09:41:42 -04:00
Brendan Forster b301b61cc5 no we shouldn't hold up the build for this, appveyor 2017-10-11 18:43:29 +11:00
Brendan Forster ff57c8fb6d tidy up 2017-10-11 18:42:27 +11:00
Brendan Forster cf0994dab1 no we shouldn't hold up the build for this, appveyor 2017-10-11 18:36:40 +11:00
Brendan Forster 083c129f3a unify similar code for a bit more readability 2017-10-11 18:35:56 +11:00
Markus Olsson 4a012b3ac9 Merge pull request #2903 from desktop/forks-make-everything-complicated
Every repository gets adopted
2017-10-11 08:32:35 +02:00
Markus Olsson c098513913 Merge pull request #2966 from desktop/disable-publish-branch-when-unborn
clarify the intent of the disabled field
2017-10-11 08:30:27 +02:00
Markus Olsson c93665e2a6 Merge pull request #2968 from desktop/open-the-real-log-directory
just open the log directory
2017-10-11 08:28:57 +02:00
Brendan Forster d8f92198b4 extract method 2017-10-11 14:04:39 +11:00
Brendan Forster 9a20e7e33a cache missing users after signing into an account 2017-10-11 13:58:33 +11:00
Brendan Forster f2afa79560 handle log commands where HEAD may be provided 2017-10-11 12:59:47 +11:00
Brendan Forster 68dfe33fba catch two corner cases where HEAD inteferes with displaying history 2017-10-11 12:59:47 +11:00
Brendan Forster a45b3a6498 no we shouldn't hold up the build for this, appveyor 2017-10-11 11:34:08 +11:00
Brendan Forster 5a2883217e remote is a module, use the repository name here 2017-10-11 11:31:54 +11:00
Brendan Forster 10ec0a069a and check for a token when doing any network calls 2017-10-11 11:19:44 +11:00
Brendan Forster b1daa4bff5 refine tracing our account lookup 2017-10-11 11:15:06 +11:00
Brendan Forster 6b705afb56 trace when an account found while cloning 2017-10-11 11:05:36 +11:00
Brendan Forster 3933d9b764 and log whether generic credentials are found 2017-10-11 10:55:12 +11:00
Brendan Forster b59f0b531b 💄 tidy up imports 2017-10-11 10:53:07 +11:00
Brendan Forster 716b8992d6 and track when we add generic credentials 2017-10-11 10:52:32 +11:00
Brendan Forster f98f9fc3d6 trace when account added or removed 2017-10-11 10:49:31 +11:00
Brendan Forster b27335e470 adding some tracing when interacting with backing stores 2017-10-11 10:45:06 +11:00
Brendan Forster adeffa55ba Merge branch 'master' into bump-to-npm-5-finally 2017-10-11 10:26:30 +11:00
Brendan Forster 1fc638853c bump to yarn@1.2.0 2017-10-11 10:22:56 +11:00
Brendan Forster 19b42934f0 tweak them words 2017-10-11 10:19:04 +11:00
Brendan Forster 9be3496a66 Merge branch 'master' into disable-publish-branch-when-unborn 2017-10-11 10:16:54 +11:00
Josh Abernathy 5a638b712a Merge pull request #2993 from desktop/add-package-support-for-linux
first pass at packaging for Linux distros
2017-10-10 15:11:38 -04:00
Markus Olsson defdb81eac Don't subscribe to mouse events for context lines 2017-10-10 18:18:17 +02:00
Josh Abernathy 7f882f1f4b Merge pull request #2996 from desktop/testing-repository-with-HEAD-file
add regression test for repository with HEAD file
2017-10-10 09:44:50 -04:00
Brendan Forster d630ab9aad add regression test for diff-index 2017-10-10 17:03:10 +11:00
Brendan Forster bcd6b11292 add test fixture 2017-10-10 17:02:32 +11:00
Brendan Forster ba7d36856d cleanup package step 2017-10-10 15:09:52 +11:00
Brendan Forster 1124a31b40 ensure rebuilding native dependencies on CI platforms 2017-10-10 14:40:31 +11:00
Brendan Forster 702597aa57 run the publish command, don't try to publish to npm 2017-10-10 14:37:59 +11:00
Brendan Forster 74331f62e5 Merge branch 'master' into bump-to-npm-5-finally 2017-10-10 11:22:09 +11:00
Brendan Forster 00b5b05cb3 update docs 2017-10-10 11:21:43 +11:00