development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-18 07:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
29024 commits 301 branches 696 tags 363 MiB
Commit graph

29024 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Sergio Padrino d81139b4a4 De-emphasize suggestion to change local git config #610 2021-02-17 13:21:54 +01:00
Sergio Padrino 763bf4169e Remove unused field #610 2021-02-17 13:21:54 +01:00
Sergio Padrino 5cbf738ccb Use a different caret position for the popover 2021-02-17 13:21:54 +01:00
Sergio Padrino 96a1e7ffb0 Suggest users to fix author issues from the repo settings #610 2021-02-17 13:21:54 +01:00
Sergio Padrino a6ea8b1284 Use the GitConfigUserForm in the new repository git config screen #610 2021-02-17 13:21:54 +01:00
Sergio Padrino 31c3a11356 Improve logic to save git config per repo #610 2021-02-17 13:21:54 +01:00
Sergio Padrino 13d0a495c5 Improve logic to initialize local git config values #610 
Assume the local comitter data can be null
 2021-02-17 13:21:54 +01:00
Sergio Padrino c61323fa65 Add functions to remove config values #610 2021-02-17 13:21:54 +01:00
Sergio Padrino bbc318cda9 Make Fork Behavior the last tab of the repo settings #610 
Needed because Fork Behavior is optional, and breaks everything if we add a tab after it.
 2021-02-17 13:21:54 +01:00
Sergio Padrino 4125ea8bf1 Clean up: rename constant #610 2021-02-17 13:21:54 +01:00
Sergio Padrino 7d040979bc Allow retrieving only the local value of a git config key #610 2021-02-17 13:21:54 +01:00
Sergio Padrino 1de124ea86 When a new git config is loaded, avoid using the Other option if possible #610 2021-02-17 13:21:54 +01:00
Sergio Padrino 9429c43209 Allow disabling the git config user form #610 2021-02-17 13:21:54 +01:00
say25 c38717cc43 Use const for Linter Gods 2021-02-17 13:21:54 +01:00
say25 c3a62a8769 Store and use initialGitConfigLocation 2021-02-17 13:21:54 +01:00
say25 13742a6b64 Post Rebase Conflict Resolution 2021-02-17 13:21:54 +01:00
say25 e7e55e7356 Lint Const 2021-02-17 13:21:54 +01:00
say25pp 6516c35121 Implement GitConfig Setting section within Repository Settings 2021-02-17 13:21:54 +01:00
say25pp 1a414d0797 Extract logic in setGlobalConfigValue to create setConfigValueInPath for later reuse like getConfigValueInPath 2021-02-17 13:21:54 +01:00
say25pp a517a5d22a Create invalidGitAuthorNameMessage for reuse later 2021-02-17 13:21:54 +01:00
say25 ee1dc1f222 Remove Global from comment as sometimes command is specific to path 2021-02-17 13:21:54 +01:00
say25 6fa83c4b31 Move identifier-rules to common location 2021-02-17 13:21:54 +01:00
tidy-dev e0cbe9fc9f Cherry Picking Feature Flag 2021-02-17 07:06:52 -05:00