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
30260 commits 297 branches 696 tags 363 MiB
Commit graph

30260 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino 00c02c48a8 Bump version and changelog to 2.9.1-beta7 2021-08-19 12:56:00 +02:00
Sergio Padrino b9a751a8a9
Merge pull request #12804 from desktop/more-ssh-passphrase-fixes 
Remove pending SSH Key passphrases when users don't want to remember them
 2021-08-19 12:41:21 +02:00
Sergio Padrino 7b7fe34ebd Remove pending SSH Key passphrases when needed 2021-08-19 09:55:25 +02:00
Sergio Padrino 7b2abd790e
Merge pull request #12802 from desktop/releases/2.9.1-beta6 
Release 2.9.1-beta6
 2021-08-18 19:09:56 +02:00
Sergio Padrino dd2ab4b1c7 Bump version and changelog to 2.9.1-beta6 2021-08-18 17:29:33 +02:00
Sergio Padrino 910bf0f2cf
Merge pull request #12783 from desktop/remove-old-askpass 
Remove old askpass trampoline
 2021-08-18 15:55:36 +02:00
Sergio Padrino 6b1ec2ebe3
Merge pull request #12799 from desktop/releases/2.9.1-beta5 
Release 2.9.1-beta5
 2021-08-18 15:37:42 +02:00
Sergio Padrino 9704466f42 Remove all traces of the old askpass trampoline script 🔥 🎉 2021-08-18 15:33:23 +02:00
Sergio Padrino 132c8dd7db
Merge pull request #12800 from desktop/ssh-passphrase-improvements 
SSH passphrase fixes and improvements
 2021-08-18 15:30:39 +02:00
Sergio Padrino ae9fcab04c
Merge pull request #12782 from desktop/ssh-askpass-macos 
Enable SSH improvements on macOS
 2021-08-18 15:30:21 +02:00
Sergio Padrino 734c6f3061 Small refactor to store SSH key passphrases after a git command succeeds 2021-08-18 14:11:35 +02:00
Sergio Padrino 22b9dc9e7d Don't store SSH key passphrases directly, just send them back to the trampoline handler 2021-08-18 14:11:35 +02:00
Sergio Padrino 8fa233b41d Store trampoline token in trampoline commands 2021-08-18 14:11:35 +02:00
Sergio Padrino d2072a89d4 Don't copy ssh-wrapper on non-dev builds 2021-08-18 14:11:13 +02:00
Sergio Padrino 5504330cfa Only use ssh-wrapper on macOS DEV builds 2021-08-18 14:11:13 +02:00
Sergio Padrino 3d539a98bd Cleanup 2021-08-18 14:11:13 +02:00
Sergio Padrino d42f256971 Enable ssh askpass feature on macOS for beta 2021-08-18 14:11:13 +02:00
Sergio Padrino a534e0a360 Use ssh-wrapper on macOS as ssh command 2021-08-18 14:11:13 +02:00
Sergio Padrino 42182c782d Copy ssh-wrapper in macOS builds 2021-08-18 14:11:13 +02:00
Sergio Padrino 6b653ec11f Bump desktop-trampoline to 0.9.8 to include ssh-wrapper 2021-08-18 14:11:13 +02:00
tidy-dev 9f410a1838
Merge pull request #12792 from desktop/Remove-random-apostrophe 
Update warn-force-push-dialog.tsx
 2021-08-18 07:38:49 -04:00
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 7d3bbcb5b5
Update warn-force-push-dialog.tsx 2021-08-17 19:15:33 -04: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