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

29024 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino 9c5fc37ff8 Bump version to 2.7.0-beta2 and update changelog 2021-03-15 13:32:05 +01:00
Sergio Padrino 4164fadfa8
Merge pull request #11778 from desktop/trampoline-server-fix 2021-03-11 09:52:19 -08:00
Sergio Padrino 4b30fb904a Bump desktop-trampoline to v0.9.4 2021-03-11 18:07:14 +01:00
Sergio Padrino 3f4da2c8b9 Track trampoline server/client errors separately 
We don't need to close the server when the error comes from the client.
 2021-03-11 18:06:51 +01:00
tidy-dev 5162e0c641
Merge pull request #11774 from desktop/releases/2.7.0-beta1 
Release 2.7.0-beta1
 2021-03-11 09:37:07 -05:00
tidy-dev 6ab505f04b Release 2.7.0-beta1 2021-03-11 08:04:08 -05:00
tidy-dev 6ed3359183
Merge pull request #11772 from desktop/cherry-pick-flip-feature-flag 
Enable Cherry Picking for Beta
 2021-03-11 07:57:08 -05:00
tidy-dev af2c3e97fb Enable in beta 2021-03-11 07:28:48 -05:00
tidy-dev b714880a46
Merge pull request #11769 from desktop/cherry-picking-refresh-repository-on-branch-checkout 
Refresh after successful checkout during cherry pick
 2021-03-11 06:13:02 -05:00
tidy-dev 7f7c33c83a
Merge pull request #11768 from desktop/cherry-picking-disable-while-in-progress 
Disable cherry picking if a cherry pick is in progress
 2021-03-11 06:12:46 -05:00
tidy-dev e2e190d7a9
Merge pull request #11770 from desktop/cherry-picking-drag-onto-checked-out-branch-does-nothing 
Prevent initiating cherry pick on checked out branch
 2021-03-11 06:12:26 -05:00
tidy-dev 373b255118 Prevent initiating cherry pick on checked out branch 2021-03-10 20:15:49 -05:00
tidy-dev 4fc3194e13 Refresh after successful checkout during cherry pick 2021-03-10 20:05:32 -05:00
tidy-dev 693c46daef Disable cherry picking if a cherry pick is in progress 2021-03-10 19:52:45 -05:00
Sergio Padrino 6b7c3267fc
Merge pull request #11763 from desktop/releases/2.6.7-beta1 
Release 2.6.7-beta1
 2021-03-10 09:16:35 -08:00
tidy-dev 7a0a99e403
Merge pull request #11764 from desktop/cherry-picking-refactor-drop-cancelled-logic 
Cherry picking refactor drop cancelled logic
 2021-03-10 11:20:51 -05:00
tidy-dev 34030e77fa Bubble up to app 2021-03-10 10:26:57 -05:00
tidy-dev 0c45a5667e Tidying 2021-03-10 09:12:12 -05:00
tidy-dev 8d334c287c Refactor cherry pick drag cancel 2021-03-10 09:10:11 -05:00
Sergio Padrino 2f43ed61ff Bump version to 2.6.7-beta1 2021-03-10 13:48:15 +01:00
tidy-dev 8a50fd37d3
Merge pull request #11747 from desktop/cherry-picking-stats 
Add cherry picking stats
 2021-03-10 07:48:05 -05:00
tidy-dev 8744801881 Await checkout 2021-03-10 06:36:30 -05:00
Sergio Padrino e81b5ddcd0
Merge pull request #11762 from desktop/releases/2.6.6 2021-03-10 03:28:47 -08:00
tidy-dev 016e9f39ca Add more stats 2021-03-10 06:13:16 -05:00
Sergio Padrino e534559871
Merge branch 'development' into releases/2.6.6 2021-03-10 03:08:24 -08:00
tidy-dev cdcf56b985 Merge branch 'development' into cherry-picking-stats 2021-03-10 06:01:19 -05:00
tidy-dev 776d8e109c
Merge pull request #11753 from desktop/cherry-picking-merge-commits-error 
Cherry picking merge commits error
 2021-03-10 05:50:15 -05:00
tidy-dev 7d1ac33a65 tidying 2021-03-10 05:28:18 -05:00
tidy-dev 80234c5430 Merge branch 'development' into cherry-picking-merge-commits-error 2021-03-10 05:21:44 -05:00
tidy-dev 74281ffb1b Copy work from cherry pick branch to handle new dugite error 2021-03-10 10:03:31 +01:00
Sergio Padrino 0b66bd1851 Bump version and changelog to v2.6.6 2021-03-10 09:52:28 +01:00
tidy-dev 6c2cf77451 Bump dugite 2021-03-10 09:47:44 +01:00
Sergio Padrino e983abab74 Fix glitch in the UI when entering a custom git email 2021-03-10 09:47:20 +01:00
Sergio Padrino 154bf2002b Use case-insensitive checks to verify possible misattributed commits 2021-03-10 09:47:16 +01:00
Sergio Padrino 405e2a2b83 Add new public property to determine if a TextBox is focused 2021-03-10 09:47:12 +01:00
tidy-dev 66bd304073
Merge pull request #11755 from desktop/bump-dugite 
Bump dugite from 1.98.0 to  1.100.0
 2021-03-10 03:10:07 -05:00
tidy-dev 8d1f559645 Copy work from cherry pick branch to handle new dugite error 2021-03-09 18:45:45 -05:00
tidy-dev fae6781c95 Bump dugite 2021-03-09 16:40:58 -05:00
tidy-dev c5f0d5dc31 Update to reflect change in copy 2021-03-09 16:35:44 -05:00
tidy-dev d632b5bfde Better copy 2021-03-09 14:57:04 -05:00
tidy-dev 09d895d7ad Update merge commit test 2021-03-09 12:59:55 -05:00
tidy-dev d1101156f7 Merge Commit Error Handling 2021-03-09 12:53:18 -05:00
tidy-dev 2471f8af13 Bump dugite for merge chosen error 2021-03-09 12:29:17 -05:00
tidy-dev 9cf2b09bb0
Merge pull request #11712 from desktop/cherry-picking-multiple-commits-via-context-menu 
Cherry picking multiple commits
 2021-03-09 07:48:18 -05:00
tidy-dev f100d68e14 Merge branch 'development' into cherry-picking-multiple-commits-via-context-menu 2021-03-09 07:13:39 -05:00
tidy-dev 31a6f2815a
Merge pull request #11734 from desktop/cherry-picking-handle-working-directiory-dirty 
Cherry picking handle working directory dirty
 2021-03-09 07:13:17 -05:00
Sergio Padrino e2bb0cb421
Merge pull request #11744 from desktop/dependabot/npm_and_yarn/elliptic-6.5.4 
Bump elliptic from 6.5.3 to 6.5.4
 2021-03-09 09:28:56 +01:00
dependabot[bot] 2aceac2a42
Bump elliptic from 6.5.3 to 6.5.4 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-09 01:01:14 +00:00
tidy-dev 7c27bb7536 Add cherry picking stats 2021-03-08 19:30:59 -05:00
tidy-dev 7a14bccdd4 Merge branch 'development' into cherry-picking-handle-working-directiory-dirty 2021-03-08 13:49:35 -05:00