development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-13 21:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
30238 commits 297 branches 696 tags 363 MiB
Commit graph

30238 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino bbd11fc74c Bump version and changelog to 2.9.1-beta5 2021-08-18 12:10:54 +02:00
Sergio Padrino 731993d200
Merge pull request #12798 from desktop/await-for-env-variables 
Await for `envForRemoteOperation`
 2021-08-18 12:09:05 +02:00
Sergio Padrino eea227b772 Await for envForRemoteOperation 2021-08-18 11:12:11 +02:00
tidy-dev b49fed0f6d
Merge pull request #12790 from desktop/releases/2.9.1-beta4 
Release 2.9.1 beta4
 2021-08-17 14:41:02 -04:00
tidy-dev 6c2926eae4 Release 2.9.1 beta4 2021-08-17 13:12:41 -04:00
Sergio Padrino ed0f3367a9
Merge pull request #12788 from desktop/releases/2.9.1-beta3 
Release 2.9.1-beta3
 2021-08-17 18:59:10 +02:00
Billy Griffin 9842a9dde7
Update changelog.json 2021-08-17 10:38:39 -06:00
tidy-dev 47fc4eab7f
Merge pull request #12789 from desktop/fix-ssh-askpas-windows 
Set DISPLAY env variable on Windows
 2021-08-17 12:32:06 -04:00
Sergio Padrino 34bd155ace Removed SSH improvements from release notes 😓 2021-08-17 18:10:41 +02:00
Sergio Padrino 84a352f834 Set DISPLAY env variable on Windows 2021-08-17 18:03:29 +02:00
Sergio Padrino eb083197c2 Bump version and changelog 2021-08-17 16:13:56 +02:00
Sergio Padrino e73b6f7859
Merge pull request #12765 from desktop/set-almost-immediate 
Workaround for Electron issue with setImmediate
 2021-08-17 16:00:30 +02:00
Sergio Padrino aa38db5239 Enable setAlmostImmediate only on macOS for now 2021-08-17 15:40:10 +02:00
Sergio Padrino b289e71fec
Merge pull request #12778 from desktop/improved-jetbrains-support 
Improved support for JetBrains IDEs
 2021-08-17 15:38:21 +02:00
Sergio Padrino a8e1a5992a Look for JetBrains IDEs in HKEY_CURRENT_USER too 2021-08-17 13:58:59 +02:00
Sergio Padrino 16190b7ad7 Look for 32 and 64 bit executables for JetBrains IDEs 2021-08-16 16:08:15 +02:00
Sergio Padrino 338c5c406e First attempt to generalize JetBrains IDE detection 2021-08-16 14:16:28 +02:00
Sergio Padrino 5f2fdd77f0 Fix copy&pasted comment 🤦 2021-08-16 09:09:44 +02:00
Sergio Padrino fc75570853 Merge branch 'development' into set-almost-immediate 2021-08-16 09:08:02 +02:00
Sergio Padrino a82497b9bc
Merge pull request #12762 from desktop/trampoline-env-refactor 
Refactor around trampoline environment variables
 2021-08-12 16:26:53 +02:00
Sergio Padrino 07b0210aa3
Merge pull request #12756 from desktop/ssh-add-host 
Improve SSH support with passphrase and host prompts
 2021-08-12 16:22:30 +02:00
Sergio Padrino 0b73283373
Merge pull request #12764 from desktop/dependabot/npm_and_yarn/app/jszip-3.7.1 
Bump jszip from 3.5.0 to 3.7.1 in /app
 2021-08-12 13:54:11 +02:00
Sergio Padrino 1175ca509f
Merge pull request #12754 from desktop/dependabot/npm_and_yarn/path-parse-1.0.7 
Bump path-parse from 1.0.5 to 1.0.7
 2021-08-12 13:36:59 +02:00
Sergio Padrino 4c9cddf637 Help TS to decide between Node and window setTImeout 🤦 2021-08-12 13:34:10 +02:00
Sergio Padrino e5bc189793 Create setAlmostImmediate, and enforce it via eslint rule 2021-08-12 13:34:10 +02:00
dependabot[bot] f0704914a4
Bump jszip from 3.5.0 to 3.7.1 in /app 
Bumps [jszip](https://github.com/Stuk/jszip) from 3.5.0 to 3.7.1.
- [Release notes](https://github.com/Stuk/jszip/releases)
- [Changelog](https://github.com/Stuk/jszip/blob/master/CHANGES.md)
- [Commits](https://github.com/Stuk/jszip/compare/v3.5.0...v3.7.1)

---
updated-dependencies:
- dependency-name: jszip
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-12 11:34:05 +00:00
Sergio Padrino 24d89a8007
Merge pull request #12572 from shiftkey/port-custom-tslint-to-eslint 
port custom TSLint rules to ESLint
 2021-08-12 13:31:45 +02:00
Sergio Padrino ad973b42dc
Merge pull request #12748 from T41US/development 
Add support for IntelliJ CE for Mac OS
 2021-08-12 10:48:53 +02:00
Sergio Padrino b15e8834ee Make SSH key passphrase token store title less cryptic 2021-08-12 09:49:07 +02:00
Sergio Padrino 383850a4b9 Fix SSH_ASKPASS on Windows 2021-08-12 09:14:50 +02:00
Sergio Padrino 1715adbd39 Change the way SSH and trampoline env variables are passed to git 2021-08-12 09:14:50 +02:00
Sergio Padrino f586e0779b Fix lint checks with some promises 2021-08-12 09:14:19 +02:00
Sergio Padrino 321651a461 Fix POSIX-like key paths on Windows 2021-08-12 09:14:19 +02:00
Sergio Padrino e4814af88f Handle errors getting hash from SSH key file 2021-08-12 09:14:19 +02:00
Sergio Padrino ce644e5748 Remove unnecessary feature flag 2021-08-12 09:14:19 +02:00
Sergio Padrino 380e93fd41 Hide SSH askpass improvements behind feature-flag 2021-08-12 09:14:19 +02:00
Sergio Padrino ee1ab84a4b Improve comment about GH fingerprint 2021-08-12 09:14:19 +02:00
Sergio Padrino 5aac3766a6 Auto-mark github.com SSH host as known 2021-08-12 09:14:19 +02:00
Sergio Padrino e0ddfc0bb8 Allow remembering SSH key passphrases 2021-08-12 09:14:19 +02:00
Sergio Padrino 49c6b96402 Prompt user for their SSH key's passphrase 2021-08-12 09:14:19 +02:00
Sergio Padrino 41751cbfa9 Allow using custom SSH wrapper to enable using ssh-askpass on macOS 
asdfadsf
 2021-08-12 09:14:19 +02:00
Sergio Padrino 5a328e0748 Parse host and fingerprint from SSH prompt 2021-08-12 09:14:19 +02:00
Sergio Padrino 8abd7b0708 Attempt to handle SSH prompt to add known host 2021-08-12 09:14:19 +02:00
Sergio Padrino b957e535cd Fix typo in InvalidatedToken props interface 2021-08-12 09:13:35 +02:00
Sergio Padrino acb2abf734 Create trampoline-ui-helper.ts 2021-08-12 09:13:35 +02:00
Sergio Padrino 7d0a9f4bc7 Support SSH askpass 2021-08-12 09:13:35 +02:00
tidy-dev 7665cf24c5
Merge pull request #12757 from desktop/use-multi-commit-op-cherry-pick 
5. Use multi commit op for cherry pick
 2021-08-11 10:22:02 -04:00
tidy-dev 28684b030c Clean up now unneeded null check 2021-08-11 09:58:40 -04:00
tidy-dev 85463f8f5f Move banner switch mess into function 2021-08-11 09:55:17 -04:00
tidy-dev 372877dbd8 Better naming 2021-08-11 07:52:40 -04:00