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

32841 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino c41b1670a5 Fix issue number in changelog 2022-09-06 17:18:18 +02:00
Sergio Padrino 5dc30f1b9d Bump changelog and version to 3.0.8 2022-09-06 17:15:05 +02:00
Sergio Padrino 5d9c3b4081 Revert "Revert "Merge pull request #14813 from desktop/upgrade-to-electron-v19"" 
This reverts commit b581860acb.
 2022-09-06 17:04:42 +02:00
Sergio Padrino 38727e628e Bump changelog and version to 3.0.7 2022-08-29 14:56:51 +02:00
Sergio Padrino dde7462eb4 Merge pull request #15190 from desktop/fix-credentials-prompt-spam 
Stop showing login prompts from GCM for git operations
 2022-08-29 14:54:10 +02:00
Sergio Padrino c0dfc3a2a3 Merge pull request #15161 from desktop/enable-x64-to-arm64-immediate-update 
Enable x64-to-arm64 immediate updates in prod builds
 2022-08-29 14:54:10 +02:00
tidy-dev 1ae63f2698 Revert "Merge pull request #14813 from desktop/upgrade-to-electron-v19" 
This reverts commit 5cc82654ad, reversing
changes made to 5c6eb98e11.
 2022-08-29 14:54:10 +02:00
tidy-dev 635516e166 Release 3.0.6 2022-08-23 11:55:22 -04:00
tidy-dev b581860acb Revert "Merge pull request #14813 from desktop/upgrade-to-electron-v19" 
This reverts commit 5cc82654ad, reversing
changes made to 5c6eb98e11.
 2022-08-23 11:55:22 -04:00
tidy-dev b91c5ae993
Update changelog.json 2022-08-22 12:11:49 -04:00
Sergio Padrino 640e69e700 Bump version and changelog to 3.0.6-beta3 2022-08-22 16:30:08 +02:00
Sergio Padrino 4189cc8914
Merge pull request #14883 from desktop/force-non-staggered-updates 
Allow bypassing staggered releases
 2022-08-22 16:28:35 +02:00
Sergio Padrino 617c21697c Update wording of check updates button 2022-08-22 15:46:43 +02:00
Sergio Padrino bb3faa294f
Merge pull request #15117 from vbwx/patch-1 
Search for all bundle identifier entries instead of just the first one
 2022-08-19 12:57:05 +02:00
Bernhard Waldbrunner c70e9f862d
Fix lint error 2022-08-18 01:19:17 +02:00
Bernhard Waldbrunner a138652506
Merge branch 'desktop:development' into patch-1 2022-08-18 01:17:19 +02:00
Sergio Padrino 1b30bfb027
Merge pull request #15087 from shiftkey/refine-test-for-unsafe-directory-warning 
update test to properly override `safe.directory` if set in system or global config
 2022-08-17 12:30:31 +02:00
Markus Olsson ead6765d06
Merge pull request #15103 from desktop/node-16-recommendation 
Remove mention of Node 12
 2022-08-17 10:33:42 +02:00
Bernhard Waldbrunner 0bf02e8746
Search for all bundle identifier entries 
This should fix a bug that caused Desktop to only find the latest version of supported text editors.
 2022-08-16 17:53:51 +02:00
Markus Olsson 8e6ca01127
Update setup-windows.md 2022-08-12 17:32:00 +02:00
Markus Olsson 8c6aab8643
Update documentation to show we're using Node 16 2022-08-12 17:31:01 +02:00
Markus Olsson c08377f852
Merge pull request #14701 from tsvetilian-ty/fix-commit-shortcut 
Fix commit shortcut (Ctrl/Cmd + Enter)
 2022-08-12 11:04:16 +02:00
Brendan Forster e664234bee patch test to properly override safe.directory so we can assert on behaviour 2022-08-06 11:51:35 -03:00
Sergio Padrino 59312e9c1f
Merge pull request #15042 from desktop/releases/3.0.6-beta2 
Release 3.0.6-beta2
 2022-07-28 11:41:31 +02:00
Sergio Padrino 706ecf578f Bump changelog and version to 3.0.6-beta2 2022-07-27 16:34:10 +02:00
Sergio Padrino edddd9f328
Merge pull request #15018 from tsvetilian-ty/intellij-ide-bundle-changes 
Add PyCharm CE bundle id
 2022-07-25 13:25:01 +02:00
Sergio Padrino 44531552de
Merge pull request #15009 from desktop/fix-unified-diff-discard-changes-availability 
Fix unified diff discard changes availability
 2022-07-25 10:44:00 +02:00
Sergio Padrino 129d35e56f
Merge pull request #14985 from desktop/update-remote-head 
Update default branch from remote
 2022-07-25 10:07:55 +02:00
Sergio Padrino 58b3b018a9
Merge pull request #15011 from andymckay/andymckay/show-label 
Show email label on the preferences form if email isn't defined
 2022-07-25 09:46:48 +02:00
Andy McKay a9bfe9f94a
Apply suggestions from code review 
Co-authored-by: Sergio Padrino <sergiou87@github.com>
 2022-07-22 12:19:47 -07:00
Tsvetilian Yankov 22f5b1e54d Add PyCharm CE bundle identifier 2022-07-22 16:03:36 +03:00
tidy-dev 4a0452e342
Merge pull request #14921 from desktop/less-is-more 
Retrieve changed files and diff stat in one Git call
 2022-07-22 07:44:12 -04:00
tidy-dev f61265fb74 Linter... 2022-07-22 07:23:54 -04:00
tidy-dev 884588d43d Merge branch 'development' into less-is-more 2022-07-22 07:10:54 -04:00
tidy-dev af3843f320
Merge pull request #14994 from desktop/multi-commit-diffing-metrics 
Add multi commit diffing metrics
 2022-07-22 05:47:13 -04:00
tidy-dev 14a9b7c6ef
Update app/src/ui/diff/text-diff.tsx 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2022-07-22 05:21:22 -04:00
tidy-dev 04e5548fb6
Update app/src/ui/diff/text-diff.tsx 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2022-07-22 05:21:16 -04:00
Sergio Padrino 5fbc732f70
Merge pull request #15010 from say25/patch-1 
Apple silicon covers more than M1
 2022-07-22 09:58:47 +02:00
Andy McKay c4b18b6b6d update other use of this too 2022-07-21 13:49:53 -07:00
Andy McKay 0f63dedee6 check email isn't empty 2022-07-21 13:35:15 -07:00
Steven Yeh 55ca290729
Apple silicon covers more than M1 2022-07-21 12:49:13 -05:00
tidy-dev f4c6594319 Fix whitespace popover disappearing on unified diff 2022-07-21 12:32:04 -04:00
tidy-dev a65e99c167 Don't enable discard changes on unified diff when whitespace hidden 2022-07-21 12:31:41 -04:00
Sergio Padrino 608005d941 Remove more async code 2022-07-21 18:04:46 +02:00
Sergio Padrino a89688f866 Remove unnecessary async code 2022-07-21 18:03:09 +02:00
Sergio Padrino a1463e3e0f Remove defaultBranch field from database, but don't do migrations 2022-07-21 17:50:53 +02:00
Sergio Padrino 3f9b610cbb Store upstream default branch in app state 2022-07-21 16:49:53 +02:00
Sergio Padrino 6880ab1b16
Merge pull request #15000 from desktop/releases/3.0.6-beta1 
Release 3.0.6-beta1
 2022-07-21 13:33:22 +02:00
tidy-dev 0ef901eadf Release 3.0.6-beta1 2022-07-20 10:50:46 -04:00
Sergio Padrino 5d081f0d15
Merge pull request #14999 from desktop/dependabot/npm_and_yarn/terser-5.14.2 
Bump terser from 5.10.0 to 5.14.2
 2022-07-20 16:39:35 +02:00