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

28814 commits

This branch
This branch
All branches
Author SHA1 Message Date
Billy Griffin 1995d7d8d4 Update changelog.json 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-03-04 15:50:12 +01:00
Sergio Padrino 518410c92b Bump version to 2.6.5 and update changelog 2021-03-04 15:50:12 +01:00
Sergio Padrino 68ff92e41b Restrict the new trampoline to beta builds under a feature flag 2021-03-04 15:50:12 +01:00
Sergio Padrino 1864024f67 Enable the new TCP-based trampoline for production 2021-03-03 15:29:33 +01:00
Billy Griffin 8a3defb533
Update changelog.json 2021-03-02 13:33:53 -07:00
Billy Griffin 5bc407beea
Update changelog.json 2021-03-02 13:33:48 -07:00
tidy-dev 3bdfefac9e Version and Initial Change log 2021-03-02 13:56:14 -05: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
tidy-dev 6e48dbdebf
Merge pull request #11606 from desktop/cherry-pick-track-progress 
Cherry pick track progress
 2021-02-17 06:56:04 -05:00
Sergio Padrino 898d5f72ca
Merge pull request #11591 from desktop/wrong-email-warning 2021-02-17 03:54:31 -08:00
Sergio Padrino fe4acb5259
Merge pull request #11510 from desktop/trampoline-server-playground 2021-02-17 03:40:32 -08:00
tidy-dev 1050d6eb91 Regex start at beginning of line 2021-02-17 06:33:41 -05:00
tidy-dev 59eb501e3b Typo and documentation improvements 2021-02-17 06:33:27 -05:00
Sergio Padrino cec4e427f4 Bump trampoline version to v0.9.2 2021-02-17 11:42:37 +01:00
Sergio Padrino f353373e41 Merge branch 'development' into trampoline-server-playground 2021-02-17 11:36:51 +01:00
tidy-dev 44e3e6fb0b Clarify comment 2021-02-16 20:59:56 -05:00
tidy-dev ba171aa9c3 Typo 2021-02-16 20:58:18 -05:00
tidy-dev 2179f189f4 Cherry Pick Progress Tracking 2021-02-16 20:54:20 -05:00