development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 08:02:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
29537 commits 302 branches 696 tags 363 MiB
Commit graph

29537 commits

This branch
This branch
All branches
Author SHA1 Message Date
Becca 54d801ace6 Don't specify version when thanking for all past contributions 2021-05-04 15:57:20 -04:00
Becca 3fe0554ce9 Logic to check and thank the user 2021-05-04 15:40:46 -04:00
Becca a797bb05a6 Remembering Thanking the User 2021-05-04 14:26:33 -04:00
Becca 95d50acc67 Parse Thank You release notes 2021-05-04 14:26:14 -04:00
Becca c37514d984 Thank You card banner 2021-05-04 14:25:39 -04:00
Becca 58e7c90ac4 Thank You Dialog 2021-05-04 14:24:14 -04:00
Sergio Padrino 924508b765
Merge pull request #12129 from desktop/hide-whitespace-fixes 2021-05-04 19:29:40 +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
Becca 8fb1db5be8 Refactor to use loop and append file for better performance 2021-04-29 07:27:09 -04:00
Sergio Padrino c97d39ab7b
Merge pull request #12089 from desktop/fix-error-reporting 
Fix crash reporting errors
 2021-04-29 12:14:17 +02:00
Sergio Padrino 4c599138aa Bump more dependencies for arm64 
Bump desktop-trampoline to a version with good prebuilt binaries for arm64
 2021-04-29 10:00:30 +02:00
Sergio Padrino 25d9621385 Make getArchitecture receive app as parameter 2021-04-28 23:44:51 +02:00
Becca b0995b44d9 tidying 2021-04-28 14:01:38 -04:00
Becca a28b7503d7 Squashing with interactive rebase one test 2021-04-28 13:52:22 -04:00
Becca 18e298ae6b Interactive rebase method 2021-04-28 13:52:07 -04:00
Becca d353b0cdbf Make limit optional on log 2021-04-28 13:51:07 -04:00
Sergio Padrino 62a8009281
Merge pull request #12086 from desktop/releases/2.8.1-beta1 
Release 2.8.1-beta1
 2021-04-28 17:24:31 +02:00
Sergio Padrino 04f18a0a8a Bump version and changelog to 2.8.1-beta1 2021-04-28 10:56:34 +02:00
Sergio Padrino ab92efb705
Merge pull request #12081 from desktop/releases/2.8.0 2021-04-28 10:48:13 +02:00
Sergio Padrino dafe97e6d2
Merge pull request #12083 from desktop/bump-arm64-deps 2021-04-27 18:18:11 +02:00
Billy Griffin 853674e1c3
Correct version number 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-04-27 10:06:41 -06:00
tidy-dev 466e3943b0
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-04-27 11:09:23 -04:00
tidy-dev 8f05123394
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-04-27 11:09:16 -04:00
tidy-dev f39ec39bb6
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-04-27 11:08:52 -04:00
tidy-dev 8abffaffed
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-04-27 11:08:26 -04:00
Sergio Padrino af018980ba Don't forget to include yarn.lock 😆 2021-04-27 15:33:21 +02:00
Becca 2e3c4fb19e Actual change log.. 2021-04-27 08:20:13 -04:00
Sergio Padrino ee18606a68 Also bump desktop-trampoline 2021-04-27 14:15:58 +02:00
Becca abae59b380 Release 2.8.0 2021-04-27 08:11:02 -04:00