development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 08:02:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
28375 commits 302 branches 696 tags 363 MiB
Commit graph

28375 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino 8482e5cc48 Keep isCommitting=true until repository and changes have been refreshed. Fixes #7251 2021-01-08 10:46:21 +01:00
Markus Olsson d008892180
Merge pull request #11279 from kawarimidoll/patch-1 
Fix installation instructions in README.md
 2021-01-07 17:33:51 +01:00
Markus Olsson 9a69bb6870
Merge pull request #11278 from desktop/its-a-focus-trap 
Contain focus in dropdowns using FocusTrap
 2021-01-07 17:32:06 +01:00
Sergio Padrino 58368d81aa
Merge pull request #11274 from desktop/releases/2.6.2-beta2 2021-01-04 11:46:23 +01:00
カワリミ人形 348c561458
Update README.md 
Calling brew cask install is disabled
 2020-12-23 21:54:08 +09:00
Sergio Padrino 92eded4604 Contain focus in dropdowns using FocusTrap 2020-12-23 12:11:44 +01:00
Sergio Padrino beb45b7e28
Improve release notes. Thanks @niik !! 
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
 2020-12-23 11:58:09 +01:00
Markus Olsson 3cef97f340
Merge pull request #11263 from yurikoles/sublime-text-dev 
Add detection of Sublime Text 4 and 2 as editor on macOS.
 2020-12-23 10:43:26 +01:00
Sergio Padrino 3b5c7fe5d0 Fix release note about VSCodium support 2020-12-22 17:40:55 +01:00
Sergio Padrino 01825a270b Bump version to 2.6.2-beta2 and update changelog 2020-12-22 17:32:06 +01:00
Sergio Padrino a81615a399
Merge pull request #11266 from desktop/prune-actually-unused-remotes 2020-12-22 17:22:52 +01:00
Sergio Padrino c05fe81ec1 Format git-store.ts properly 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2020-12-22 16:58:17 +01:00
Sergio Padrino c58cb81551 Tweaks from review feedback ✨ Thanks @niik !! 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2020-12-22 16:51:54 +01:00
Sergio Padrino bcfd2b7279
Merge pull request #11160 from desktop/the-abstractest-of-abstractions 2020-12-22 15:28:46 +01:00
Markus Olsson ecae3c41d8 Less tricks, moar clarity 2020-12-22 14:11:27 +01:00
Markus Olsson a051e65de8 Merge branch 'development' into prune-actually-unused-remotes 2020-12-22 12:26:02 +01:00
Markus Olsson 6e4ab3511f Less tricks, more clarity 2020-12-22 12:22:08 +01:00
Markus Olsson 83483a1872 🎨 don't subscribe if we've got what we need 2020-12-22 12:14:55 +01:00
Markus Olsson 29867c5cc2 Call the callback if we've got a value cached 2020-12-22 12:13:26 +01:00
Markus Olsson f3698cba68 📖 2020-12-22 12:11:46 +01:00
Yurii Kolesnykov e499d35dd0
Add detection of Sublime Text 4 and 2 as editor on macOS. 
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
 2020-12-22 13:11:36 +02:00
Markus Olsson 75cb07b0dc 📖 2020-12-22 12:07:41 +01:00
Markus Olsson c82639dd1f Merge fail 2020-12-22 12:02:43 +01:00
Markus Olsson ceffeee9d1 Merge remote-tracking branch 'origin/development' into the-abstractest-of-abstractions 2020-12-22 12:02:03 +01:00
Markus Olsson 89aa4df560
Merge pull request #11162 from AndreiMaga/development 
Fix starting as maximized
 2020-12-22 11:58:02 +01:00
Markus Olsson 2578bd39dc
Merge pull request #11267 from desktop/once-more-unto-the-breach 
Fix "Couldn't find branch" error when checking out a PR from a fork
 2020-12-22 11:57:29 +01:00
Markus Olsson 829c2ccb09
Skip explicit type annotation and provide hint to this PR 2020-12-22 11:22:55 +01:00
Markus Olsson d100a69f3c
Merge pull request #11264 from yurikoles/update-nvmrc 
Update .nvmrc
 2020-12-22 11:19:33 +01:00
Markus Olsson 784e5fa670
Update app/src/lib/stores/helpers/ahead-behind-updater.ts 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2020-12-22 11:14:28 +01:00
Markus Olsson 267e881fd5 🎨 book 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2020-12-22 11:07:36 +01:00
Markus Olsson f66cfe1795
Merge pull request #11268 from desktop/powershell-initial-path 
Change how initial path is set when launching PowerShell (Core) terminals
 2020-12-22 11:02:55 +01:00
Sergio Padrino ce40a2a26d
Merge pull request #11244 from desktop/open-sesame 
Just use openPath on all platforms
 2020-12-22 10:29:36 +01:00
Sergio Padrino 1444a78057 Change how initial path is set when launching PowerShell (Core) terminals 
- For PowerShell just rely on cwd.
- For PowerShell Core cwd is not enough, but we can use the `-WorkingDirectory` argument.

Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2020-12-21 18:42:59 +01:00
Andrei Maga baa4fe2d12
Update app/src/main-process/app-window.ts 
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
 2020-12-21 19:42:03 +02:00
Markus Olsson d70dda4208
Merge pull request #11252 from KallePM/development 
Fix VSCodium identifiers for Windows
 2020-12-21 17:56:16 +01:00
Markus Olsson 526576fe68 Don't calculate ahead/behind for fork remote branches 2020-12-21 16:09:21 +01:00
Markus Olsson 95a7973857 🎨 typo 2020-12-21 16:09:07 +01:00
Markus Olsson db7287347a fix tests 2020-12-21 15:50:02 +01:00
Markus Olsson cd80b6de6a Replicate filter logic from BranchesList when determining if the list is empty or not 2020-12-21 15:49:55 +01:00
Markus Olsson b4a904eb27 Rename compareState allBranches to branches 
It's misleading since it doesn't really contain all branches (it excludes the current branch and all forked remote branches)
 2020-12-21 15:49:29 +01:00
Sergio Padrino 510087a4d9 Extract the code to detect prunable remotes into a function and write some unit tests! 2020-12-21 15:44:06 +01:00
Markus Olsson dd1298fc75 🔥 unused imports 2020-12-21 15:43:37 +01:00
Markus Olsson 72dc1c9ba3 Be explicit about the fact that recent branches are local only 2020-12-21 15:27:14 +01:00
Markus Olsson 101fe9a5c3 Hide forked remote branches from branch lists 2020-12-21 15:26:54 +01:00
Markus Olsson 46b8d55911 Don't filter forked remote branches in getBranches 
That's too low-level, we just want them gone from the branch lists in the UI
 2020-12-21 15:26:22 +01:00
Yurii Kolesnykov 40e5fd2413
Update .nvmrc 
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
 2020-12-21 14:50:34 +02:00
Markus Olsson 49a876e225
Merge pull request #11254 from desktop/release/2.6.2-beta1 
Release v2.6.2-beta1
 2020-12-18 15:07:08 +01:00
Sergio Padrino 1bb8731d85 Only prune forked remotes without local branches 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2020-12-18 13:21:43 +01:00
Sergio Padrino 5b2145a07d Bump version to 2.6.2-beta1 and initial changelog 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2020-12-18 11:58:31 +01:00
Markus Olsson 8518282f31
Merge pull request #11241 from desktop/pr-coordinators-needs-repositories-too 
Fix pull request list not updating
 2020-12-18 11:43:51 +01:00