development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
28331 commits 303 branches 696 tags 363 MiB
Commit graph

22517 commits

Author SHA1 Message Date
Dennis Ameling 98b49adbb3 Bump Electron target in .npmrc 2020-12-22 12:04:49 +01:00
Dennis Ameling 7d696ebbe2 Fix linting 2020-12-22 12:04:49 +01:00
Dennis Ameling 9b3643a4d0 Update several dependencies 2020-12-22 12:04:48 +01:00
Dennis Ameling 14141a73ba First work for Electron 11 upgrade 2020-12-22 12:04:48 +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 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
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
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
Markus Olsson 9658cb881a 🎨 📖 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2020-12-18 11:27:55 +01:00
Markus Olsson 2f6de415d3
Merge pull request #11243 from desktop/something-about-einstein-and-doing-the-same-thing-over-and-over-again 
Don't attempt to check out the currently checked out branch
 2020-12-18 11:25:15 +01:00
Markus Olsson 367048f54c
Merge pull request #11242 from desktop/pr-checkout-woes 
Error when repeatedly checking out a forked PR
 2020-12-18 11:24:47 +01:00
Markus Olsson 86c52d12f3 Remove accidentally added icon file 2020-12-18 10:59:41 +01:00
KallePM 9e7576a029 Fix VSCodium identifiers 2020-12-17 22:32:29 +01:00
Markus Olsson 140721360b Add human friendly error message 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2020-12-17 16:43:13 +01:00
Billy Griffin 6dba934aa0
Enterprises have email?! 
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
 2020-12-17 06:58:02 -07:00
Markus Olsson 63267d0d83 Guard against fetching failing as well 2020-12-17 14:28:11 +01:00
Markus Olsson fb889ffa9f Adding a remote can fail 
See https://github.com/desktop/desktop/pull/11242#discussion_r545052379
 2020-12-17 14:27:35 +01:00
Billy Griffin 851b85527a Add AE to description for GHE sign in 2020-12-16 15:44:28 -07:00
Billy Griffin 024dc8d2e0 Lint again 2020-12-16 15:35:47 -07:00
Billy Griffin 4d5dc71381 Add AE to verbiage for clarity 2020-12-16 14:56:06 -07:00
Markus Olsson 08a1023cfb Just use openPath on all platforms 
The issue described in https://github.com/desktop/desktop/pull/2968#issuecomment-334629549 doesn't appear to exist any more and the openExternal solution fails when opening paths that ends with a backslash.

I'd bet the issue we were seeing  was  https://github.com/electron/electron/issues/10477 which has been long since resolved.
 2020-12-16 22:29:11 +01:00
Markus Olsson ff5c633cf8 Don't attempt to check out the currently checked out branch 2020-12-16 21:51:07 +01:00
Markus Olsson 13816a32b2 Asynchronously load repositories in PR Coordinator constructor 2020-12-16 20:41:11 +01:00
Markus Olsson e013cd12e1 Fix GitHubRepository owner hash 
owner is an object.
 2020-12-16 20:40:13 +01:00
Markus Olsson f626328b54 love me some strict operators 2020-12-16 15:42:32 +01:00
Markus Olsson c22a006287 🎨 cleanup 2020-12-16 15:39:38 +01:00
Markus Olsson 590eb73010 Remote wasn't what I thought it would be 
It's the remote for a local branch's tracking branch
 2020-12-16 15:19:07 +01:00
Markus Olsson 688512bd50 Ensure we always check out local branches for origin/upstream 2020-12-16 14:48:21 +01:00
Markus Olsson 29a3548d97 We actually want the repo owner, not the PR author 
Anyone can create a PR from repo A to repo B. Doesn't mean we should use their handle when we're creating the remote
 2020-12-16 14:47:53 +01:00
Markus Olsson 881e8c5fb4 🎨 liiint 
Co-Authored-By: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2020-12-16 11:01:14 +01:00
Billy Griffin 7e58c67158 Replace "Enterprise Server" with "Enterprise" 
Since GitHub is launching additional variants of GitHub Enterprise, we want to avoid confusion by changing references to Enterprise Server to just Enterprise.
 2020-12-14 12:08:53 -07:00
Markus Olsson cf603e84a6
Merge pull request #11218 from desktop/release-2.6.1 
Release v2.6.1
 2020-12-14 16:19:31 +01:00
Markus Olsson ea3bb5b069
Merge pull request #11175 from desktop/dev-bundle-id 
Use a custom bundle id for development
 2020-12-11 17:16:07 +01:00