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

33473 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino 3abd7b29ac Bump changelog and version to 3.1.6 2023-02-06 16:50:50 +01:00
Sergio Padrino 43f1b55d8e Merge pull request #15915 from desktop/bump-git-2.39.0 
Bump to git 2.39.0 and git-lfs 3.3.0
 2023-02-06 16:48:56 +01:00
Sergio Padrino 08d57d4bf3
Update changelog.json 
Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2023-01-23 17:56:50 +01:00
Sergio Padrino d534511f61
Apply suggestions from code review 
Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2023-01-23 17:56:33 +01:00
Sergio Padrino 61c5bdd57a Enable preventing closing while updating feature flag 2023-01-23 17:21:57 +01:00
Sergio Padrino 561930573f Bump changelog and version to 3.1.5 2023-01-23 17:21:20 +01:00
Markus Olsson 54965753e3 Bump dugite in app folder 2023-01-18 08:36:03 +01:00
tidy-dev d606ce2232 Bump dugite to 2.2.0 2023-01-17 15:30:36 -05:00
tidy-dev b55ac83289 Release 3.1.4-beta1 2023-01-17 15:29:40 -05:00
Sergio Padrino ced3ceae7a
Merge pull request #15780 from tsvetilian-ty/jetbrains-toolbox-support 
Support for JetBrains Toolbox and JetBrains Fleet editor
 2023-01-17 18:16:01 +01:00
Tsvetilian Yankov 7f5d8b6d86 Update the usage docs for JetBrains Toolbox 2023-01-12 00:01:26 +02:00
tidy-dev 41674c655e
Merge pull request #15864 from desktop/Align-branch-to-center 
Align no branches text in the center
 2023-01-05 12:57:35 -05:00
tidy-dev c75d37d5a8
Merge pull request #15788 from desktop/releases/3.1.3 
Release 3.1.3
 2023-01-05 12:56:07 -05:00
Sergio Padrino ce4fbb259e Merge branch 'development' into releases/3.1.3 2023-01-05 15:50:43 +01:00
tidy-dev 94f50d3b3f Align no branches text in the center 2023-01-04 10:31:40 -05:00
tidy-dev af7b8ae7d1 Revert "Align no branches text in the center" 
This reverts commit 2b3eaaaffd.
 2023-01-04 10:31:21 -05:00
tidy-dev 2b3eaaaffd Align no branches text in the center 2023-01-04 10:30:26 -05:00
tidy-dev 39346e10dc
Merge pull request #15768 from desktop/pr-preview-only-using-remote-base-branches 
PR Preview: Only default remote branches as base branches
 2023-01-04 10:18:50 -05:00
tidy-dev 37d0a59135
typo.. 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2023-01-04 09:38:42 -05:00
tidy-dev ce10ec491f Some reason this was missing? 2023-01-04 09:36:45 -05:00
tidy-dev 895fcec53f Merge branch 'development' into pr-preview-only-using-remote-base-branches 2023-01-04 09:32:56 -05:00
tidy-dev fc1acbf6d5 Better messaging when no branch found 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2023-01-04 09:24:17 -05:00
tidy-dev ecc5b00ec3 Lint.. 2023-01-04 08:29:30 -05:00
tidy-dev 0e3cc645dd Better naming 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2023-01-04 08:22:01 -05:00
tidy-dev ef1e403b49
Merge pull request #15747 from desktop/add-preview-pull-request-metrics 
PR Preview: Add Preview Pull Request Metrics
 2023-01-04 08:18:24 -05:00
Sergio Padrino 5513d4e961
Merge pull request #15855 from desktop/dependabot/npm_and_yarn/json5-1.0.2 
Bump json5 from 1.0.1 to 1.0.2
 2023-01-04 13:10:01 +01:00
Sergio Padrino 0623698de8
Merge pull request #15857 from zipperer/patch-2 
Update linux.ts -- add editor Emacs
 2023-01-04 12:17:42 +01:00
zipperer 6e601a551e
Update editor-integration.md 
Linux editors list: add entries for JetBrains {PHPStorm|WebStorm}.
Before this commit, [`app/src/lib/editors/linux.ts`](https://github.com/desktop/desktop/blob/development/app/src/lib/editors/linux.ts) includes these editors.

This commit is not related to the pull request for adding Emacs. However, I tacked this commit onto the pull request in passing.
 2023-01-03 11:53:07 -06:00
zipperer 061bf74553
Update editor-integration.md 
Linux editors list -- add entry for Emacs.
 2023-01-03 11:46:08 -06:00
zipperer 7165ffe672
Update linux.ts -- add editor Emacs 
In `editors: ILinuxExternalEditor[]`, add entry for [Emacs](https://www.gnu.org/savannah-checkouts/gnu/emacs/emacs.html).
 2023-01-03 11:25:11 -06:00
dependabot[bot] 0d2335948b
Bump json5 from 1.0.1 to 1.0.2 
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-03 16:28:57 +00:00
tidy-dev 340acfc1c2
Merge pull request #15789 from desktop/releases/3.1.3-beta4 
Release 3.1.3-beta4
 2023-01-03 11:28:06 -05:00
tidy-dev 25732d6750 Merge branch 'development' into add-preview-pull-request-metrics 2022-12-20 12:14:40 -05:00
Tsvetilian Yankov 9a3db00ce4 Update docs 2022-12-17 00:01:29 +02:00
Tsvetilian Yankov 7204c01aad Extract JetBrains Toolbox detection to a function 2022-12-16 22:07:54 +02:00
Tsvetilian Yankov f4b221afe9 Remove unnecessary type for toolbox 2022-12-16 22:03:37 +02:00
tidy-dev 95a9cd37fb
Update changelog.json 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2022-12-15 07:52:47 -05:00
tidy-dev 695d121c2c Release 3.1.3-beta4 2022-12-14 11:10:16 -05:00
tidy-dev 4731f27676 Release 3.1.3 2022-12-14 10:35:05 -05:00
tidy-dev f7a4aa6bf6 Merge pull request #15549 from desktop/shift-down-arrow 
Fix Shift + Down Arrow not selecting properly in the Commit List
 2022-12-14 10:24:16 -05:00
tidy-dev 7700404834 Merge pull request #15468 from desktop/consistently-disable-multi-commit-operations-in-progress 
Consistently disable multi commit operations
 2022-12-14 10:22:47 -05:00
tidy-dev d47d694fc9 Merge pull request #15471 from angusdev/issue-13081-menu-disabled 
Fix menu items disabled if close the "Resolve conflicts before Rebase" dialog
 2022-12-14 10:21:59 -05:00
Sergio Padrino be3868e2ee Merge pull request #15445 from desktop/fix-cmd-enter-amend 
Fix cmd/control + enter shortcut while amending a commit
 2022-12-14 10:18:54 -05:00
tidy-dev 87fd61879f
Merge pull request #15668 from desktop/introduce-react-context-for-stacked-popups 
PR Preview: Introduce react context for managing open/closing stacked popups
 2022-12-14 09:18:52 -05:00
tidy-dev ef7c998327 Other isTopMost unmounts consistent 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2022-12-14 08:57:51 -05:00
tidy-dev 84fb598008
Use helper 
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
 2022-12-14 08:54:26 -05:00
tidy-dev 23aec14b75
Use helper 
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
 2022-12-14 08:54:19 -05:00
tidy-dev d2e0015305 Make popupStack Readonly 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2022-12-14 08:41:30 -05:00
tidy-dev 7d65115d05 Doc 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2022-12-14 08:35:34 -05:00
tidy-dev 3b722a6776
Redefine array on insert 
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
 2022-12-14 08:24:13 -05:00