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

29126 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino 25951923ae Clean up changelog 2021-03-30 12:30:39 +02:00
Sergio Padrino 333ea7bc5e Bump version and update changelog 2021-03-30 10:21:41 +02:00
Sergio Padrino 8c273e359a Enable cherry-picking for production 2021-03-30 10:21:09 +02:00
Billy Griffin d42221a3ab
More detail about cherry-picking 2021-03-29 16:28:09 -06:00
tidy-dev 70a69b2e59 Release 2.7.0 2021-03-29 13:00:55 -04:00
tidy-dev 4f86831def
Update changelog.json 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-03-29 11:51:18 -04:00
tidy-dev 4bc5fad9a5
Update changelog.json 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-03-29 11:45:15 -04:00
tidy-dev f8b438adc2 Release 2.7.0-beta6 2021-03-29 11:35:33 -04:00
tidy-dev 5127b3b673 Merge pull request #11877 from desktop/cherry-picking-merge-commits-improvement 
Cherry-picking use main-line 1 for merge commits
 2021-03-29 11:25:42 -04:00
tidy-dev 19978f7dca Merge pull request #11875 from desktop/cherry-picking-drag-improvements 
Prevent quick click bad drag state during cherry-picking
 2021-03-29 11:24:47 -04:00
tidy-dev 7bc6186ca4 Merge pull request #11870 from desktop/releases/2.7.0-beta5 2021-03-29 11:24:04 -04:00
tidy-dev bf3dfa7516 Release 2.7.0-beta5 
Co-Authored-By: Sergio Padrino <sergio.padrino@gmail.com>
 2021-03-26 09:41:17 -04:00
tidy-dev 7ef8e9310d Fix merge error 
Co-Authored-By: Sergio Padrino <sergio.padrino@gmail.com>
 2021-03-26 09:31:47 -04:00
Sergio Padrino 1936a354a2 Merge pull request #11826 from say25/themeSource-not-sticky 2021-03-26 09:28:41 -04:00
tidy-dev ce24495607 Merge pull request #11866 from desktop/cherry-picking-non-existant-file-conflict 
Cherry picking non existant file conflict
 2021-03-26 09:28:20 -04:00
say25 e455ab2ba2 Code Review Feedback, Comment Function 2021-03-26 09:27:36 -04:00
tidy-dev 5cfa4b8fa6 Merge pull request #11854 from desktop/bump-to-dugite-1.102.0 
Bump dugite to 1.102.0
 2021-03-26 09:26:27 -04:00
tidy-dev 62cf6e4249 Merge pull request #11849 from desktop/cherry-picking-drag-invokes-scroll-bar 
Add invoke scroll during drag event via mouse position
 2021-03-26 09:25:39 -04:00
say25 2156cefa3b Set remote.nativeTheme.themeSource when pulling value 2021-03-26 09:24:31 -04:00
tidy-dev ae6d241e76 Merge pull request #11834 from desktop/cherry-picking-allow-users-navigate-tabs-during-drag 
Cherry Picking - Allow switching tab in branch menu during drag
 2021-03-26 09:22:27 -04:00
tidy-devasdf e9fcb4d01b Merge branch 'development' into cherry-picking-allow-users-navigate-tabs-during-drag 2021-03-26 09:21:37 -04:00
tidy-devasdf 244ee406bc Release 2.7.0-beta4 2021-03-19 14:56:56 -04:00
tidy-dev 5273a95d5f
Merge pull request #11835 from desktop/cherry-pick-with-a-dash 
cherry pick -> cherry-pick
 2021-03-19 14:45:24 -04:00
tidy-devasdf 752bdc5366 Merge branch 'development' into cherry-pick-with-a-dash 2021-03-19 14:15:56 -04:00
tidy-dev 6c1a4bd4c2
Merge pull request #11827 from desktop/cherry-picking-overlay-drag-prompt 
Cherry picking overlay drag prompt
 2021-03-19 14:04:03 -04:00
Billy Griffin 5686b06397 cherry pick -> cherry-pick 2021-03-19 11:52:06 -06:00
tidy-devasdf 94ca48d7af PR comments resolved 2021-03-19 13:42:23 -04: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
tidy-devasdf 519af84d08 Because z-index don't play nice between mac and windows.. also text align regression 2021-03-18 21:52:02 -04:00
tidy-devasdf cd250547ee Tidying 2021-03-18 21:35:22 -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
tidy-devasdf 996e311990 Utilize drag overlay during cherry picking 2021-03-18 21:19:31 -04:00
tidy-devasdf e107e6c12e Add drag-overlay component 2021-03-18 21:19:00 -04:00
tidy-devasdf 156902a948 Add enter drag drop zone emitters 2021-03-18 21:17:55 -04:00
tidy-devasdf 1b7ceb896a Refactor dragAndDropManager to a singleton 2021-03-18 21:17:33 -04: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