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

29262 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Billy Griffin b1d6981c93
Update changelog.json 2021-04-01 10:59:48 -06:00
tidy-dev 3f2a061e51 Release 2.7.2-beta1 2021-04-01 12:51:17 -04:00
tidy-dev ba54d4de76
Merge pull request #11917 from desktop/flag-hide-white-space-for-development 
Update hide whitespace feature flag to development
 2021-04-01 12:41:01 -04:00
tidy-dev 27607036c4 Update hide whitespace feature flag to development 2021-04-01 12:19:43 -04:00
tidy-dev b1808339cc
Merge pull request #11916 from desktop/cherry-pick-fix-drop-on-to-current-branch-bug 
Fix cherry-pick not ended on drop to current branch
 2021-04-01 12:05:21 -04:00
tidy-dev 60ea50282e
Merge pull request #11914 from desktop/cherry-pick-update-stats 
Cherry-pick update stats
 2021-04-01 11:51:58 -04:00
tidy-dev dfa1cb39dd Add some styles to make it clearer 2021-04-01 11:39:26 -04:00
tidy-dev c3515a1e97 Fix cherry-pick not ended on drop to current branch 2021-04-01 11:26:34 -04:00
tidy-dev 1db3aa8082 Revert "Fix cherry-pick not ended on drop to current branch" 
This reverts commit 9d6e366893.
 2021-04-01 11:25:49 -04:00
tidy-dev 9d6e366893 Fix cherry-pick not ended on drop to current branch 2021-04-01 11:25:28 -04:00
tidy-dev 72581c4c82 Add tracking cherry-pick branch creation 2021-04-01 10:33:54 -04:00
tidy-dev ef7ccbf7bc Fix cherry-pick via context menu stat tracking 2021-04-01 10:33:41 -04:00
tidy-dev 17c97afee8 Merge branch 'change-spell-check-language' of https://github.com/desktop/desktop into change-spell-check-language 2021-04-01 10:05:12 -04:00
tidy-dev e134f09134 Make sure use can get back to English if electron is not set to English but system is 2021-04-01 10:04:42 -04:00
tidy-dev b16aaaef5f better wording 2021-04-01 09:41:50 -04:00
tidy-dev 2eec759a88 Add a way to switch between English and system langauge 2021-04-01 09:23:21 -04:00
Sergio Padrino 121417ae88
Merge pull request #11907 from desktop/enable-trampoline-production 
Enable TCP trampoline for production
 2021-03-31 15:55:38 +02:00
tidy-dev 146797a8cc
Merge pull request #11903 from desktop/cherry-picking-new-branch 
Create branch during cherry-picking via the context menu
 2021-03-31 09:40:26 -04:00
Sergio Padrino 17422ce6a4 Enable TCP trampoline for production 2021-03-31 15:30:54 +02:00
tidy-dev c0587adfc0 Merge branch 'cherry-picking-new-branch' of https://github.com/desktop/desktop into cherry-picking-new-branch 2021-03-31 09:14:17 -04:00
tidy-dev 6feba15d10 Checkout should by default checkout branches (not checkout during cherry-pick 2021-03-31 09:13:59 -04:00
tidy-dev a8ff2b9d2c
Use nullish coalescing operator 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-03-31 09:10:29 -04:00
Sergio Padrino a5c5ddc8ed Fix selection on expanded diffs 2021-03-31 13:57:23 +02:00
tidy-dev a3350264fa
Merge pull request #11904 from desktop/roadmaps-gonna-roadmap 
Update roadmap post-release
 2021-03-31 07:28:07 -04:00
Sergio Padrino 4e155ad035
Merge pull request #11902 from desktop/text-diff-expansion-for-real 
Diff expansion, part III: expand diffs for real now :_)
 2021-03-31 13:22:31 +02:00
Sergio Padrino 1b6d55bfdb
Merge pull request #11900 from desktop/text-diff-gutter-markers 2021-03-31 13:01:51 +02:00