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

29030 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev 499cf7a5f1
Remove unneeded null check 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-03-15 08:32:56 -04:00
tidy-devasdf d6e780d651 tidying 2021-03-15 06:00:21 -04:00
tidy-devasdf a29a231800 Tidying 2021-03-14 17:48:59 -04:00
tidy-devasdf 55db685457 Tidying.. better documentation for custom drag solution 2021-03-14 17:47:05 -04:00
tidy-devasdf a18d3c496b Adjusting feel 2021-03-14 17:36:51 -04:00
tidy-devasdf 66def624ec Refactor drop on branch 2021-03-12 12:27:48 -05:00
tidy-devasdf 042108dc85 Refactor drag start and end tracking 2021-03-12 12:27:28 -05:00
tidy-devasdf 04908a10b3 Removing Old Drag refences 2021-03-12 12:26:06 -05:00
tidy-devasdf c781d4c79b wip 2021-03-11 17:53:32 -05:00
tidy-devasdf 579d8b8ce2 Merge branch 'development' into cherry-picking-ghosts 2021-03-11 13:21:02 -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 ce14e1ccbe Merge branch 'development' into cherry-picking-ghosts 2021-03-09 15:08:15 -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