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

29078 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev 33e72e7396
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-03-16 12:12:35 -04:00
tidy-devasdf 114dfefef4 Release 2.7.0-beta3 2021-03-16 11:56:58 -04:00
tidy-dev 0ff6c3539f
Merge pull request #11800 from desktop/cherry-picking-ghosts-take-two 
Cherry picking ghosts take two
 2021-03-16 11:48:44 -04:00
tidy-devasdf 99557b8b13 Implement a drag and drop manager 2021-03-16 09:58:22 -04:00
tidy-devasdf 83fdad761d Improved drag and drop performance 2021-03-16 09:37:28 -04:00
tidy-devasdf 5c90a966e4 Code Review Comments 2021-03-16 07:16:35 -04:00
Sergio Padrino 282894d18a
Merge pull request #11690 from geophilusd/rstudiomac 
Add support for RStudio Editor on MacOS
 2021-03-16 11:48:11 +01:00
tidy-devasdf ac93bf3d96 Tidying.. prettier 2021-03-15 14:37:48 -04:00
tidy-devasdf e478e08567 tidying 2021-03-15 14:21:20 -04:00
tidy-devasdf 2bbc71b605 Document the draggable component 2021-03-15 14:10:58 -04:00
tidy-devasdf 3f0803aec3 Check for over drop target more efficient 2021-03-15 13:48:10 -04:00
tidy-devasdf cd23abd352 Set mouse over class based on drag element state 2021-03-15 13:24:06 -04:00
tidy-devasdf 42d125f9c5 Remove Drag element after drop 2021-03-15 13:14:01 -04:00
tidy-devasdf eabda84303 Merge branch 'development' into cherry-picking-ghosts-take-two 2021-03-15 13:01:18 -04:00
tidy-devasdf 8e106a48f0 Refactor setting the copy to branch name 2021-03-15 13:00:10 -04:00
Sergio Padrino dd7f6713e2
Merge pull request #11629 from say25/system-theme-default 2021-03-15 17:58:36 +01:00
tidy-devasdf af8213832c Refactor open branch dropdown 2021-03-15 12:52:26 -04:00
Sergio Padrino 7c9dc482cb
Merge pull request #11796 from desktop/releases/2.7.0-beta2 
Release 2.7.0-beta2
 2021-03-15 17:48:13 +01:00
Steven Yeh f54f7cb1a6 Fix onThemeNotificationUpdated 2021-03-15 11:37:00 -05:00
tidy-devasdf 3a9f12222e Move Drag/Drop logic into draggable 2021-03-15 12:28:27 -04:00
tidy-devasdf 80d79ec839 Initial draggable stub out 2021-03-15 11:46:20 -04:00
tidy-devasdf d97afb36e1 Renders drag element through app drag element renderer 2021-03-15 11:32:49 -04:00
tidy-dev 2f8d48cf12
Merge pull request #11790 from desktop/cherry-picking-ghosts 
Cherry picking ghosts
 2021-03-15 09:01:53 -04:00
tidy-dev 9af3ef7502
Merge pull request #11795 from desktop/cherry-picking-mutliple-commits-in-branch-dialog 
Cherry picking mutliple commits text in branch dialog and [New] callout for history tab
 2021-03-15 08:51:24 -04:00
tidy-dev 499cf7a5f1
Remove unneeded null check 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-03-15 08:32:56 -04:00
Sergio Padrino 9c5fc37ff8 Bump version to 2.7.0-beta2 and update changelog 2021-03-15 13:32:05 +01:00
tidy-devasdf 5318b0da0e Don't show new for empty repo (user can't see cherry picking popup) 2021-03-15 08:29:29 -04:00
tidy-devasdf 4ce20a1874 wip setting up drag element 2021-03-15 08:20:08 -04:00
tidy-devasdf 29be76ebb8 New indicator on history tab 2021-03-15 06:58:39 -04:00
tidy-devasdf 3eeb4f733a Multiple Commits Text in Choose Branch Dialog 2021-03-15 06:58:29 -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
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