development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
28854 commits 303 branches 696 tags 363 MiB
Commit graph

28854 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev 68c054d8f5 tidying 2021-03-01 11:51:16 -05:00
tidy-dev 386759cd63 Merge branch 'development' into cherry-picking-drag-and-drop 2021-03-01 11:49:20 -05:00
tidy-dev ed1b972d22
Merge pull request #11641 from desktop/cherry-picking-conflicts-ui 
Cherry Picking Conflicts UI Part One - Dialog
 2021-03-01 09:57:54 -05:00
tidy-dev 9eba86dcec First steps can drag and drop a commit on to a branch 
Needs to store dragged commit in app state
Needs to highlight branch on drag over
 2021-03-01 08:04:20 -05:00
Sergio Padrino 76b9dd71de
Merge pull request #11640 from desktop/cherry-picking-in-progress-ui 2021-02-23 16:27:49 +01:00
tidy-dev 1ce162e679 ... refactor fail .. unit test catch awesome 2021-02-23 10:11:12 -05:00
tidy-dev 29c23c029c Load Status after abort to ensure working directory refreshed 2021-02-23 08:40:41 -05:00
tidy-dev 4b8f0afc45 Merge branch 'cherry-picking-in-progress-ui' into cherry-picking-conflicts-ui 2021-02-23 08:29:58 -05:00
tidy-dev 060335cd51 Some tidying and updating if user has resolved conflicts 2021-02-23 08:28:29 -05:00
tidy-dev 1f957b532f Tidying 2021-02-23 08:01:27 -05:00
Sergio Padrino 275e6dabc2
Merge pull request #11621 from desktop/focus-co-authors 
Focus co-author input after clicking on "Add co-authors"
 2021-02-23 09:24:03 +01:00
tidy-dev c8d8e5532e Add Manual Resolution Support to conflict dialog 2021-02-22 15:29:41 -05:00
tidy-dev 2f36e31a9e Merge branch 'cherry-picking-in-progress-ui' into cherry-picking-conflicts-ui 2021-02-22 14:01:47 -05:00
tidy-dev 6971b91da9 Update conflict state to cherry pick conflict state 2021-02-22 13:57:17 -05:00
tidy-dev e9c39c22af Refactor to a boolean isCherryPickHeadFound 2021-02-22 13:55:21 -05:00
tidy-dev 30eda681ed Add in cherry pick conflict state 2021-02-22 13:00:21 -05:00
tidy-dev 56cc44ca91 Abort Cherry Pick UI 2021-02-22 12:31:13 -05:00
tidy-dev 121b3312c5 Use ReadonlyArray for commits 2021-02-22 09:46:45 -05:00
tidy-dev 6a904fb86c Tidying up 2021-02-22 09:25:21 -05:00
tidy-dev 95500e24bb
Merge pull request #11624 from desktop/cherry-picking-branch-dialog 
Cherry picking branch dialog
 2021-02-22 06:48:01 -05:00
tidy-dev 70b03b95b1
Merge pull request #11625 from brendonbarreto/add-avif-image-support 
Add .avif image support
 2021-02-22 06:34:00 -05:00
tidy-dev 2984e00469 Initial wip of conflict resolution 2021-02-22 05:37:12 -05:00
tidy-dev 5215e27288 Add Conflict Flow Step 2021-02-21 11:16:19 -05:00
tidy-dev f58f6e51b3 Perform a non conflicting cherry pick 2021-02-21 10:03:06 -05:00
tidy-dev 0bb8e25a8d Add show progress step to cherry pick flow 2021-02-21 09:59:27 -05:00
tidy-dev 9a9f2b6a6c Refactor context menu bubble up to pass up commit and all the way to app 2021-02-21 09:56:50 -05:00
tidy-dev e28c20e379 Add CherryPick Progress Dialog 2021-02-21 09:54:12 -05:00
tidy-dev 9cb55ec3b7 Grammer 2021-02-19 14:30:30 -05:00
tidy-dev 33a2e9af82 Add a cherry pick success banner 2021-02-19 14:24:54 -05:00
Brendon Barreto 748256f9e9 fix code style 2021-02-19 13:20:53 -03:00
tidy-dev f9d731c9aa Improved failsafe and syntax for onCherryPick 2021-02-19 10:36:28 -05:00
tidy-dev 671f9bc6df Better naming for step enum 2021-02-19 10:22:44 -05:00
Brendon Barreto 2e6e21c658 Add .avif image support 2021-02-19 11:30:00 -03:00
tidy-dev 752510f671 typo 2021-02-19 08:26:07 -05:00
tidy-dev fe777f52ae Merge branch 'development' into cherry-picking-branch-dialog 2021-02-19 08:22:43 -05:00
tidy-dev 215b581af5 more tidying 2021-02-19 08:16:24 -05:00
tidy-dev 7cb8fe8863 Tidying 2021-02-19 08:11:44 -05:00
tidy-dev 997b3d9a98 Flip cherry pick feature for development 
This pr will launch branch selection.. but not actually cherry pick yet
 2021-02-18 10:24:23 -05:00
tidy-dev e19eb9aaa4 Invoke Cherry Pick Flow for Cherry Pick popup 2021-02-18 10:22:56 -05:00
tidy-dev 659a28424f Setup tracking the cherry pick flow state 2021-02-18 09:34:32 -05:00
tidy-dev 624018c158 Cherry Pick Flow Component with choose target branch 2021-02-18 09:32:41 -05:00
tidy-dev 7bd5a30c31 Functional Choose Target Branch Dialog 2021-02-18 09:30:06 -05:00
Sergio Padrino cfb8191038
Merge pull request #11616 from desktop/releases/2.6.4-beta2 2021-02-18 06:27:37 -08:00
Sergio Padrino 4021fc138d Focus co-author input after clicking on "Add co-authors" 2021-02-18 14:02:41 +01:00
Sergio Padrino 479c6a7609
Merge pull request #11615 from desktop/bump-desktop-trampoline 
Bump desktop-trampoline to v0.9.3
 2021-02-18 04:27:01 -08:00
Sergio Padrino 39c9fb30e0
Merge pull request #11619 from filiptronicek/patch-1 
Update README hyperlinks
 2021-02-18 04:10:19 -08:00
Filip Troníček 221eb70a50
Update README hyperlinks 
- change Electron link to electronjs.org
- change React link to reactjs.org
 2021-02-18 12:48:09 +01:00
Sergio Padrino 56147ba8a4 Bump version to 2.6.4-beta2 and update changelog 2021-02-18 10:25:58 +01:00
Sergio Padrino e5896a91ac Bump desktop-trampoline to v0.9.3 
Includes a fix for a buffer overflow error.
 2021-02-18 10:20:02 +01:00
Sergio Padrino faf9ba9a90
Merge pull request #11595 from desktop/per-repo-user-config 2021-02-18 00:06:46 -08:00