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

29094 commits

This branch
This branch
All branches
Author SHA1 Message Date
Billy Griffin 5686b06397 cherry pick -> cherry-pick 2021-03-19 11:52:06 -06:00
tidy-dev ae8206f86f
Merge pull request #11833 from desktop/cherry-picking-diff-on-latest 
Cherry picking - Set selected commit state to latest cherry picked commit
 2021-03-19 12:31:51 -04:00
tidy-devasdf aae66d2546 Set selected commit state to latest cherry picked commit 2021-03-19 10:39:58 -04:00
Sergio Padrino ee907b7432
Merge pull request #11820 from desktop/return-better-than-await 
Prefer return over await in git config functions
 2021-03-19 02:24:42 +01:00
Sergio Padrino 44700e0699
Merge pull request #11822 from desktop/cherry-picking-longer-success-banner 
15 secs for cherry pick success banner time
 2021-03-18 09:25:26 +01:00
tidy-devasdf fee3be1eea 15 secs for cherry pick success banner time 2021-03-17 13:55:42 -04:00
Sergio Padrino 99a474468c Prefer return over await 
Co-Authored-By: Steven Yeh <say25@cornell.edu>
 2021-03-17 17:07:55 +01:00
Sergio Padrino af07a1ca13
Merge pull request #11818 from desktop/fix-config-race-conditions 
Fix race condition writing/reading git config
 2021-03-17 11:16:44 +01:00
tidy-dev 7a4f5e7a1a
Merge pull request #11815 from say25/preserve-legacy-theme 
Preserve and Convert Legacy Theme
 2021-03-17 06:12:14 -04:00
Sergio Padrino 105032c233 Wait for some asynchronous config operations 2021-03-17 02:20:18 -07:00
Steven Yeh 8da46ef293 Preserve other comment 2021-03-16 14:31:03 -05:00
Steven Yeh 0a194064c2 Fix Language Typo 2021-03-16 14:29:58 -05:00
Steven Yeh a48102cd89 Preserve and Convert Legacy Theme 2021-03-16 14:26:01 -05:00
tidy-dev 6339d94b92
Merge pull request #11813 from desktop/releases/2.7.0-beta3 
Release 2.7.0-beta3
 2021-03-16 13:07:07 -04:00
Sergio Padrino f237ab7a20
Merge pull request #11811 from desktop/rstudio-for-windows 
Add support for RStudio for Windows
 2021-03-16 18:00:00 +01:00
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
Sergio Padrino 7874c48165 Add support for RStudio for Windows 2021-03-16 03:47:31 -07: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