development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-11-05 20:49:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
29558 commits 304 branches 713 tags 371 MiB
Commit graph

29558 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino
fd1dfa8c77
Merge pull request #12139 from desktop/bump-electron-v11 
Bump Electron to v11.4.4
 2021-05-05 17:53:28 +02:00
Sergio Padrino
9ade26f3fd
Merge pull request #12136 from desktop/Thank-you-remembering-thanks-yous 2021-05-05 15:28:07 +02:00
Becca
afae54375e Refactor to an object 2021-05-05 08:25:43 -04:00
tidy-dev
a8a1bb73eb
Merge pull request #12133 from desktop/thank-you-dialog 
Thank you Part 1 - Thank you dialog
 2021-05-05 07:49:58 -04:00
tidy-dev
a4130ee9db
Merge pull request #12134 from desktop/thank-you-banner 
Thank you Part 2 - Thank you banner
 2021-05-05 07:29:08 -04:00
Becca
1c8192f8fa More explicit 2021-05-05 07:27:51 -04:00
tidy-dev
ccb18794ce
Merge pull request #12135 from desktop/thank-you-parse-release-notes 
Thank you Part 3 - Parse thank you release notes separately
 2021-05-05 07:03:32 -04:00
Becca
832a31fd6b Emojis in the banner! 🎉 2021-05-05 07:00:45 -04:00
Becca
dba3d5546a PR comments 2021-05-05 06:29:56 -04:00
Becca
a8e8924376 Extract redundant code for reuse 2021-05-05 06:23:54 -04:00
Sergio Padrino
0b534e1868
Merge pull request #12131 from desktop/releases/2.8.1 2021-05-05 12:20:04 +02:00
Sergio Padrino
7d6d6175a6
Merge pull request #12138 from desktop/fix-side-by-side-expansion-hover 
Fix hover highlighting for expansion handlers
 2021-05-05 12:16:53 +02:00
Sergio Padrino
d82c1431aa
Merge branch 'development' into releases/2.8.1 2021-05-05 11:34:15 +02:00
Sergio Padrino
616024e893 Bump Electron to v11.4.4 2021-05-05 09:52:58 +02:00
Sergio Padrino
717be06b9a Fix hover highlighting for expansion handlers 2021-05-05 09:27:07 +02:00
Sergio Padrino
8e847a573b Fix hover highlighting for expansion handlers 2021-05-05 09:24:32 +02:00
Becca
64562f30a3 Remembering Thanking the User 2021-05-04 18:34:17 -04:00
Becca
f2a9746fc8 Parse Thank You release notes 2021-05-04 18:23:47 -04:00
Becca
440237e990 Thank You card banner 2021-05-04 18:19:20 -04:00
Becca
b8858aad71 Add import statement 2021-05-04 18:10:06 -04:00
Becca
7feb13e67a Thank You Dialog 2021-05-04 18:04:25 -04:00
Billy Griffin
699c56aea5
Add PR number 2021-05-04 13:50:31 -06:00
Sergio Padrino
924508b765
Merge pull request #12129 from desktop/hide-whitespace-fixes 2021-05-04 19:29:40 +02:00
Sergio Padrino
a15d733307 Bump version and changelog to v2.8.1 2021-05-04 19:21:47 +02:00
Sergio Padrino
faa8e89809 Disable selection on side-by-side diffs when hiding whitespace changes 2021-05-04 19:20:20 +02:00
Sergio Padrino
b1d70c9ca0 Warn users about diff being read-only when hiding whitespace changes 2021-05-04 19:20:20 +02:00
Sergio Padrino
ed1a5aa0ae Enable remote for the crash window 2021-05-04 19:12:26 +02:00
Sergio Padrino
af9b39a25c Make getArchitecture receive app as parameter 2021-05-04 19:12:13 +02:00
Sergio Padrino
f54e3fbffa Disable selection on side-by-side diffs when hiding whitespace changes 2021-05-04 19:00:39 +02:00
Sergio Padrino
442498c892 Warn users about diff being read-only when hiding whitespace changes 2021-05-04 18:25:48 +02:00
tidy-dev
21777ad500
Merge pull request #12104 from desktop/fix-crash-dialog 
Enable `remote` for the crash window
 2021-05-03 06:35:20 -04:00
Sergio Padrino
3389cedd27 Enable remote for the crash window 2021-04-30 16:43:53 +02:00
Sergio Padrino
00a1f73349
Merge pull request #12098 from desktop/releases/2.8.1-beta2 2021-04-30 15:15:13 +02:00
tidy-dev
7471f1754b
Merge pull request #12097 from desktop/squash-unit-tests 
Squashing Unit Tests and some error handling and conflict tweaks
 2021-04-29 12:07:49 -04:00
Becca
d5a3f47a2e More concise unit test syntax 2021-04-29 11:45:42 -04:00
Sergio Padrino
53472c137b Bump version and changelog to 2.8.1-beta2 2021-04-29 16:30:43 +02:00
Sergio Padrino
6712286c77 Update README.md with link to Apple Silicon beta build 2021-04-29 16:26:23 +02:00
Sergio Padrino
6f85c26c79 Enable "cross-auto-update" in Apple Silicon devices 2021-04-29 16:25:17 +02:00
Becca
029713e71d Merge branch 'development' into squash-unit-tests 2021-04-29 10:23:50 -04:00
Becca
61328024d4 Tidying/conflict test modifying 2021-04-29 10:16:17 -04:00
tidy-dev
57874f8857
Merge pull request #12087 from desktop/basic-squash-git-logic 
Initial squash git logic
 2021-04-29 10:09:16 -04:00
Becca
4d0e23c712 Merge branch 'development' into squash-unit-tests 2021-04-29 10:04:59 -04:00
Becca
23a6e1a833 Add some error handling and refactor commit message parameter 2021-04-29 10:04:53 -04:00
Sergio Padrino
5c18fb9709
Merge pull request #12091 from desktop/more-arm64-binaries 
Bump more dependencies for macOS arm64
 2021-04-29 15:58:26 +02:00
Becca
7119f9013a Correct ordering on reorder test 2021-04-29 09:47:57 -04:00
Becca
454f053f82 Allow passing git editor on continue rebase for squash message 2021-04-29 09:47:57 -04:00
Becca
ff1103b420 Conflict detection and resolution 2021-04-29 09:47:57 -04:00
Becca
f33217f6b5 Squash/Reorder test 2021-04-29 09:47:57 -04:00
Becca
788e6ed4ea Multiple commits squashed test 2021-04-29 09:47:57 -04:00
Becca
e70aff621d Use finally 2021-04-29 09:46:18 -04:00