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

28708 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino c15d083fa6 Bump version to 2.6.4-beta1 and update changelog 2021-02-12 17:18:08 +01:00
Sergio Padrino ba6e89f5d1
Merge pull request #11546 from desktop/releases/2.6.3 
Release v2.6.3
 2021-02-12 08:16:58 -08:00
Sergio Padrino edd109ff3d
Merge pull request #11570 from desktop/fix-windows-onboarding 2021-02-12 05:37:48 -08:00
Sergio Padrino 168a3c9372 Fix problem with button and textbox height in Windows onboarding 2021-02-12 11:40:18 +01:00
Sergio Padrino a2c7c0e6db Bump node-abi to version 2.19.3 
This fixes some issues with the Electron upgrade to v11. on Windows, at least.
 2021-02-12 11:20:51 +01:00
Sergio Padrino a9e3439be5
Merge pull request #11564 from desktop/dependabot/npm_and_yarn/node-notifier-8.0.1 
Bump node-notifier from 8.0.0 to 8.0.1
 2021-02-12 01:26:41 -08:00
Sergio Padrino 1c77aa4386
Merge pull request #11566 from desktop/git-preferences-improvements 2021-02-11 23:59:38 -08:00
Sergio Padrino 8dfb2ba8e3 Add some additional comments #610 2021-02-11 17:47:40 +01:00
Sergio Padrino dc97bcb973 Document GitConfigUserForm component #610 2021-02-11 17:46:31 +01:00
Sergio Padrino 3a4be6a608 Fix email dropdown in onboarding screen #610 2021-02-11 17:21:15 +01:00
Sergio Padrino 9cb83ff08f Don't show the "wrong email" warning when there are no email addresses #610 2021-02-11 16:30:14 +01:00
Sergio Padrino 7c93e69f69 Show only the text box when there are no signed in accounts #610 2021-02-11 16:29:54 +01:00
Sergio Padrino 56ffad7c32 In Preferences -> Git, allow using emails from the signed in accounts #610 2021-02-11 16:07:49 +01:00
Sergio Padrino a90611bd4a
Merge pull request #11561 from desktop/onboarding-email-improvements 2021-02-11 07:00:36 -08:00
Sergio Padrino 7652980d0b Reuse more code and text 😍 
Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2021-02-11 13:51:17 +01:00
Sergio Padrino 34b0773f83 Improve wording when signing in a GHE account #610 2021-02-11 13:45:12 +01:00
Sergio Padrino e4d9cd7fa1 Improve onboarding to suggest emails from the user account #610 2021-02-11 13:45:12 +01:00
Sergio Padrino e40553e2fd
Merge pull request #11563 from desktop/bump-electron-winstaller 
Bump electron-winstaller to 4.0.2
 2021-02-11 04:37:42 -08:00
dependabot[bot] 1227076152
Bump node-notifier from 8.0.0 to 8.0.1 
Bumps [node-notifier](https://github.com/mikaelbr/node-notifier) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases)
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md)
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v8.0.0...v8.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-02-11 12:17:25 +00:00
Sergio Padrino be18829a59 Bump electron-winstaller to 4.0.2, to allow us upgrade to Electron 11 🚀 2021-02-11 13:15:53 +01:00
Sergio Padrino 7bab0bf436
Merge pull request #11142 from dennisameling/electron-11 2021-02-11 04:15:15 -08:00
Sergio Padrino 1159dcfe96
Merge pull request #11559 from desktop/refactor_rev_list_more_generic 2021-02-11 12:41:28 +01:00
tidy-dev 1cca16824d Improve clarity of documentation 2021-02-10 10:04:32 -05:00
tidy-dev bdd3f7b01a Refactor getCommitsInRange to more generically accept a range parameter 2021-02-10 08:39:15 -05:00
tidy-dev 6ba93bade4
Merge pull request #11549 from desktop/cherry-pick-git-no-confict-resolution 
Cherry pick git no confict resolution
 2021-02-09 09:41:41 -05:00
tidy-dev 43736be21d typo 2021-02-09 09:21:33 -05:00
tidy-dev 1f25cef906 Add to commit to cherry pick has an empty message 2021-02-09 09:19:22 -05:00
tidy-dev 033e320631 Add revRangeInclusive 2021-02-09 09:01:36 -05:00
tidy-dev 7e627e8cf6
Update app/test/helpers/repository-builder-cherry-pick-test.ts 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-02-09 08:50:01 -05:00
tidy-dev 64ec6c0a60 tidying 2021-02-09 07:28:53 -05:00
tidy-dev db589b777a failure unit tests 2021-02-09 07:15:50 -05:00
Sergio Padrino a991d101c8
Merge pull request #11541 from desktop/windows-logo 2021-02-09 10:01:34 +01:00
tidy-dev 8658e0d7eb Unit test working tree 2021-02-08 15:00:30 -05:00
tidy-dev e0629454d5 typo 2021-02-08 13:37:05 -05:00
tidy-dev f551983a05 Simple Cherry Pick - no errors, no conflicts 2021-02-08 13:36:36 -05:00
Sergio Padrino 51b58c36a0
Apply suggestions from code review 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-02-08 18:02:26 +01:00
Sergio Padrino d7a8e0a024 Bump version to 2.6.3 and update changelog 2021-02-08 17:43:50 +01:00
Amanda Pinsker 2aea8953ae Update windows-logo-64x64@2x.png 2021-02-05 10:58:04 -08:00
Amanda Pinsker 920b97d160 Update windows icon 2021-02-04 12:08:56 -08:00
Billy Griffin 28fbf80cf4
Merge pull request #11535 from desktop/releases/2.6.3-beta3 
Release 2.6.3-beta3
 2021-02-04 11:14:15 -07:00
Sergio Padrino 892044003b Bump version to 2.6.3-beta3 and update changelog 2021-02-04 18:05:36 +01:00
Sergio Padrino 1218f670e3 Bump dugite to v1.97.0 2021-02-04 18:02:15 +01:00
tidy-dev 5371285443 Woops.. left console log in there 2021-02-04 17:57:39 +01:00
tidy-dev a5d54dd84f About modal - provide a different logo for Mac vs Windows 2021-02-04 17:57:39 +01:00
Amanda Pinsker cc9452e7ed Update logo-64x64@2x.png 2021-02-04 17:57:39 +01:00
Sergio Padrino 3020b24be7
Merge pull request #11534 from desktop/bump-dugite-macos 2021-02-04 17:53:00 +01:00
Sergio Padrino 02243aac48
Merge pull request #11487 from desktop/we-have-init-defaultbranch-now 2021-02-04 17:28:25 +01:00
Sergio Padrino e83a5eb44d
Merge pull request #11486 from desktop/wip-log-parser 2021-02-04 15:56:37 +01:00
Sergio Padrino dcaab59319 Fix the way commit parents are parsed 2021-02-04 15:37:54 +01:00
Sergio Padrino cbf2e60009 Fetch repo's default branch from API and use it when cloning 2021-02-04 13:58:12 +01:00