Commit graph

28699 commits

Author SHA1 Message Date
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
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
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
Sergio Padrino
750c424684 Respect default branch setting when creating a new repository 2021-02-04 13:25:08 +01:00
Sergio Padrino
07b3166399 Use the new for-each-ref parser in getBranchesDifferingFromUpstream 2021-02-04 12:12:08 +01:00
Sergio Padrino
9b6d43c872 Fix typo and improve readability 2021-02-04 12:06:02 +01:00
Sergio Padrino
4405254f82 Merge branch 'development' into wip-log-parser 2021-02-04 11:26:10 +01:00
Sergio Padrino
3147ef5306 Bump dugite to v1.97.0 2021-02-04 10:21:56 +01:00
Sergio Padrino
cff4d3abca
Merge pull request #11521 from desktop/vs-code-as-suggested-browser 2021-02-03 06:10:40 -08:00
tidy-dev
6a00067c93
Update app/src/ui/tutorial/tutorial-panel.tsx
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
2021-02-03 08:46:53 -05:00
tidy-dev
089f1c42a3
Update app/src/ui/editor/editor-error.tsx
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
2021-02-03 08:46:25 -05:00
tidy-dev
3d510484cc Better naming and constant location 2021-02-03 07:01:34 -05:00