development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-17 23:21:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
30292 commits 301 branches 696 tags 363 MiB
Commit graph

24091 commits

Author SHA1 Message Date
tidy-dev 383143fdcb Release 2.9.3-beta1 2021-08-25 12:23:55 -04:00
tidy-dev 917d2c278f
Merge pull request #12785 from desktop/rebase-multi-comit-op 
Refactor rebase to be a multi-commit-operation
 2021-08-25 11:16:13 -04:00
tidy-dev 36ed73af38 Fix Rebase Succes Banner 2021-08-25 08:53:50 -04:00
Sergio Padrino 46b3ce0834
Merge pull request #12827 from say25/add-dart 
Add Syntax Highlighting For Dart
 2021-08-25 11:15:42 +02:00
tidy-dev b035a1e0c0 Merge branch 'development' into rebase-multi-comit-op 2021-08-24 11:48:22 -04:00
tidy-dev bba0298902 Release 2.9.2 2021-08-24 11:34:36 -04:00
tidy-dev 90793458c9 Fix (or vastly improve) performance issue from dynamic diff gutter line width application 2021-08-24 11:29:26 -04:00
tidy-dev 7595a19525 Fix (or vastly improve) performance issue from dynamic diff gutter line width application 2021-08-24 11:09:27 -04:00
Steven Yeh 94452dade4 Add Dart 2021-08-23 21:13:10 -05:00
Sergio Padrino 3a8cbd3768 Enable feature flags for 2.9.1 2021-08-23 17:57:36 +02:00
Sergio Padrino c87ce7ddcc Bump version and changelog to 2.9.1 2021-08-23 17:56:31 +02:00
tidy-dev d6e245e2f0 Remove any to have better typing 2021-08-23 07:38:33 -04:00
Sergio Padrino 0c222c79b7 Hook onUndo handler for cherry-picking 2021-08-23 13:13:03 +02:00
tidy-dev 6046c402a3 Need to know what kind they are 2021-08-19 12:20:31 -04:00
tidy-dev f607b4a40f Merge branch 'development' into rebase-multi-comit-op 2021-08-19 11:47:58 -04:00
tidy-dev dafc2053ae Cleanup per pr comments 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2021-08-19 11:47:41 -04:00
Sergio Padrino 00c02c48a8 Bump version and changelog to 2.9.1-beta7 2021-08-19 12:56:00 +02:00
Sergio Padrino 7b7fe34ebd Remove pending SSH Key passphrases when needed 2021-08-19 09:55:25 +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 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 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 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 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 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
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
tidy-dev 23c2249db5 Wait for multiCommitOperation to be set 2021-08-17 08:54:11 -04:00
tidy-dev d81e0a6a7b Move initialization to shared method so dialog dropdown works 2021-08-17 08:45:34 -04:00
Sergio Padrino a8e1a5992a Look for JetBrains IDEs in HKEY_CURRENT_USER too 2021-08-17 13:58:59 +02:00
tidy-dev 4f2bb2d0ee remove old rebase logic 2021-08-16 15:34:19 -04:00
tidy-dev 2839c3223c Swap to multi commit operation rebase 2021-08-16 15:34:10 -04: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 fc75570853 Merge branch 'development' into set-almost-immediate 2021-08-16 09:08:02 +02:00
tidy-dev 3c4794fc3b Create a rebase multi commit op 2021-08-14 14:14:06 -04:00
tidy-dev 502cf3a0f1 Create base rebase multi commit operation 2021-08-12 15:39:43 -04:00