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

29331 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev 2dfe2e95fe
Merge pull request #11952 from desktop/releases/2.7.2 
Release 2.7.2
 2021-04-07 07:08:18 -04:00
tidy-dev dfb09481ae Add trampoline release note 2021-04-07 06:48:01 -04:00
Sergio Padrino 0a84307187
Merge pull request #11935 from desktop/hunk-expansion-type-refactor 
Diff expansion, part V: refactor how we compute hunk expansion info
 2021-04-07 12:06:49 +02:00
Billy Griffin 5b94c877f4
Update changelog.json 2021-04-06 11:23:12 -06:00
Billy Griffin 07c10daaff
Update changelog.json 2021-04-06 11:23:07 -06:00
Billy Griffin deb4cb0563
Update changelog.json 2021-04-06 11:23:01 -06:00
tidy-dev d52c166727 Release 2.7.2 2021-04-06 12:57:22 -04:00
Sergio Padrino d449d4ff16
Merge pull request #11926 from say25/Decouple-Whitespace-Settings 
Split Whitespace Settings
 2021-04-06 18:53:58 +02:00
Steven Yeh 2602305a6d async clean pt2 2021-04-06 10:23:28 -05:00
Steven Yeh 6c0de3e979 async cleanup 2021-04-06 10:17:00 -05:00
Sergio Padrino 1799c9bd2d
Merge pull request #11923 from desktop/fix-branch-delete-non-remote-branch-message 
Delete Branch: Use ahead/behind to determine if branch exist on remote
 2021-04-06 13:48:54 +02:00
Sergio Padrino 4ff125e17c Merge branch 'development' into fix-branch-delete-non-remote-branch-message 2021-04-06 13:28:15 +02:00
Sergio Padrino ea52207a48 Refactor hunk expansion info computation 2021-04-06 13:24:45 +02:00
Sergio Padrino 00fce6de3a
Merge pull request #9691 from dennisameling/windows-arm-support 2021-04-06 13:22:14 +02:00
Sergio Padrino cdbbd8038f
Merge branch 'development' into windows-arm-support 2021-04-06 11:03:22 +02:00
tidy-dev 58067b8006
Merge pull request #11944 from desktop/Remove-diff-expansion-release-note 
Remove diff expansion release note
 2021-04-05 14:27:39 -04:00
tidy-dev edd53825c1
Update changelog.json 2021-04-05 14:08:09 -04:00
tidy-dev 6469a3aceb
Merge pull request #11942 from desktop/releases/2.7.2-beta2 
Release 2.7.2-beta2
 2021-04-05 14:02:02 -04:00
Billy Griffin ae124f4d3f
Update changelog.json 2021-04-05 11:23:50 -06:00
tidy-dev 9e77bb808c
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-04-05 13:20:24 -04:00
tidy-dev d760310ac1
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-04-05 13:20:01 -04:00
tidy-dev a3bd3e7884
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-04-05 13:19:35 -04:00
tidy-dev fbf80acae0
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-04-05 13:19:12 -04:00
tidy-dev 426cd82830
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-04-05 13:18:52 -04:00
Steven Yeh f9baa420c0 enableHideWhitespaceInDiffOption in Beta 2021-04-05 12:16:03 -05:00
Steven Yeh ba20b7b92b Code Clean Up 2021-04-05 12:15:52 -05:00
tidy-dev c656d1d224 Release 2.7.2-beta2 2021-04-05 12:58:30 -04:00
tidy-dev 6344407ac7
Merge pull request #11922 from desktop/cherry-picking-onto-prs 
Cherry-pick on to a pull request
 2021-04-05 12:37:43 -04:00
tidy-dev 5c31edbf72 Refactor finding pull-request branch out 2021-04-05 12:02:44 -04:00
tidy-dev 8844b91ad8 Merge branch 'development' into cherry-picking-onto-prs 2021-04-05 11:25:26 -04:00
tidy-dev 8203a6c287
Merge pull request #11921 from desktop/cherry-pick-fix-cannot-undo-remote-branch-cherry-pick 
Fix cannot undo remote branch cherry-pick
 2021-04-05 11:24:46 -04:00
tidy-dev 5a119730a3 Use gitStore.loadStatus - less expensive 2021-04-05 10:31:47 -04:00
tidy-dev a17ee8eeaa
Merge pull request #11912 from desktop/change-spell-check-language 
Ability to change spell check language to English
 2021-04-05 10:26:07 -04:00
tidy-dev a2301e82d0
Merge pull request #11933 from desktop/cherry-picking-end-drag-on-escape 
Add ending drag on pressing Escape
 2021-04-05 10:25:12 -04:00
tidy-dev 5d324ca4b3 Refactor checkout during cherry-pick to return the checked out branch 2021-04-05 09:07:20 -04:00
tidy-dev 3ba4985e4f Add ending drag on pressing Escape 2021-04-05 07:06:28 -04:00
tidy-dev ee96abf414 Refactor to get checkout branch name on success 2021-04-05 05:49:04 -04:00
Sergio Padrino e7e2d0d8cf
Merge pull request #11906 from desktop/expanded-diff-line-selection 
Diff expansion, part IV: fix selection on expanded diffs
 2021-04-05 11:27:21 +02:00
Steven Yeh 5fb8d13037 Split Whitespace Settings 2021-04-02 17:47:57 -05:00
tidy-dev 1e247bf3c2 Use ahead/behind to determine if branch exist on remote 2021-04-02 08:05:44 -04:00
tidy-dev 24a302f61f tidying - consistent error messaging 2021-04-02 07:00:38 -04:00
tidy-dev 1cd7baabe3 Tidying 2021-04-02 06:53:38 -04:00
tidy-dev bd0e2d2a46 Tidying 2021-04-02 06:52:03 -04:00
tidy-dev 0db9ce32bc Fix cannot undo remote branch cherry-pick 2021-04-01 18:22:20 -04:00
tidy-dev 9ef7b8ff12 Finish cherry-pick on pr wire up 2021-04-01 18:20:10 -04:00
tidy-dev afb8ecb263 Get targetBranch from PR 2021-04-01 17:30:40 -04:00
tidy-dev f39380cf2a Wire up drop on pull request to dispatcher 2021-04-01 16:24:12 -04:00
tidy-dev 040afea92e Track enter/leave pull request as droptarget 2021-04-01 15:10:21 -04:00
tidy-dev 59b8502ab8 Hover over pull request during drag styles 2021-04-01 14:58:33 -04:00
tidy-dev 000d31db7f
Merge pull request #11919 from desktop/releases/2.7.2-beta1 
Release 2.7.2-beta1
 2021-04-01 13:47:13 -04:00