development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-30 17:25:09 +00:00
Code Issues Projects Releases Packages Wiki Activity
28847 commits 305 branches 713 tags 371 MiB
Commit graph

28847 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev
95be0dc595 Add continueCherryPick to dispatcher 2021-02-23 10:21:34 -05:00
tidy-dev
7d1e09df9a Refactor processing cherry pick result into method 2021-02-23 10:21:08 -05:00
tidy-dev
d8e425420e Refactor switching to cherry pick progress into method 2021-02-23 10:20:04 -05:00
tidy-dev
9112fabf6a Add app-store call for continuing cherry pick 2021-02-23 10:19:13 -05:00
tidy-dev
f65b5aff52 Add manual resolutions to continueCherryPick 2021-02-23 10:18:42 -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
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
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
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
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
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
tidy-dev
f08aab0795
Merge pull request #11609 from desktop/cherry-picking-feature-flag-context-menu 
Cherry picking feature flag context menu
 2021-02-17 17:46:33 -05:00
Sergio Padrino
794d850f37 Improve wording of warning popover #610 
Co-Authored-By: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
Co-Authored-By: Amanda Pinsker <10404068+ampinsk@users.noreply.github.com>
Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2021-02-17 21:01:48 +01:00
tidy-dev
ff696fe33a Disable until cherry picking ui flow complete 2021-02-17 09:14:24 -05:00
tidy-dev
ddc3c5ba62 Scaffold cherry pick action up to app to launch future dialog 2021-02-17 09:13:04 -05:00
tidy-dev
28a3a558da Add Cherry Pick Commit Context Menu 2021-02-17 07:56:11 -05:00
Sergio Padrino
f34d62dc16 Fix logic to update user info from repository settings #610 2021-02-17 13:21:55 +01:00
Sergio Padrino
7b914f9dad Use our RadioButton component in the new local Git config screen #610 2021-02-17 13:21:54 +01:00