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

33473 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino 9a89aa1eed
Merge branch 'development' into releases/3.1.2 2022-10-20 10:39:33 +02:00
tidy-dev 526af4be51
Merge pull request #15471 from angusdev/issue-13081-menu-disabled 
Fix menu items disabled if close the "Resolve conflicts before Rebase" dialog
 2022-10-19 08:51:15 -04:00
Sergio Padrino eeec273046 Check if notification matches current repository 2022-10-19 12:17:31 +02:00
Sergio Padrino f4d8e8cc77
Merge pull request #15462 from angusdev/issue-13636-incorrect-tooltip-position 
Fix incorrect tooltip position if mouse is not moved
 2022-10-19 10:34:33 +02:00
Markus Olsson 7cd667172c Revert file transport setting 2022-10-18 20:35:28 +02:00
Markus Olsson 11870edb89 Revert file transport setting 2022-10-18 20:35:17 +02:00
Markus Olsson fbedef2bf1 Changelog and package version bump 2022-10-18 19:55:23 +02:00
Markus Olsson 0c79553b8c Changelog and package version 2022-10-18 19:54:45 +02:00
Markus Olsson 689c7f5728 Bump dugite to 2.1.0 
This will get us Git v2.35.5
 2022-10-18 19:51:37 +02:00
Markus Olsson 2a2ad0fcf4 Update dugite to 2.1.0 
This will get us Git v2.35.5
 2022-10-18 19:48:43 +02:00
Sergio Padrino c1751e864d
Merge pull request #15470 from desktop/dependabot/github_actions/peter-evans/create-pull-request-4.1.4 
Bump peter-evans/create-pull-request from 4.1.3 to 4.1.4
 2022-10-18 10:22:23 +02:00
Angus eddd8b9f5a Update function name to updateMouseRect 2022-10-18 07:32:49 +01:00
Angus 1315f8cc67 Use text color for repository change indicator when selected and with focus 2022-10-17 22:35:24 +01:00
Angus afc2fac625 Fix menu items are disabled if close the rebase conflict dialog 
onDismissed didn't reset IAppState. currentPopup so the menu is disabled.

Need to call closePopup in onInvokeConflictsDialogDismissed

"Abort Rebase" works properly since it calls onFlowEnded()
 2022-10-17 18:29:44 +01:00
Angus ab9f11909e Refactoring 
extract the code to set this.mouseRect to rememberMousePosition
 2022-10-17 17:14:27 +01:00
dependabot[bot] 2c6cae8c1c
Bump peter-evans/create-pull-request from 4.1.3 to 4.1.4 
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.1.3 to 4.1.4.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v4.1.3...v4.1.4)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-17 16:08:50 +00:00
tidy-dev aac5fd4d43 Consistently disable multi commit operations 2022-10-17 08:16:22 -04:00
Sergio Padrino a937c9f215
Merge pull request #15460 from angusdev/issue-15424-avatar-tooltip-scrollbar 
Fix issue #15424 Commit author tooltips does not wrap properly on long email
 2022-10-17 11:22:51 +02:00
Sergio Padrino 8288cfa138
Merge pull request #15465 from angusdev/issue-11953-clone-repository-hide-foldout 
Fix issue #11953 Progress bar during cloning partially hidden
 2022-10-17 11:14:31 +02:00
Angus 9ffb204167 Issue 11953 Progress bar during cloning partially hidden 
Close the repository list when clone starts
 2022-10-16 00:35:25 +01:00
Angus 56e965cb10 Fix issue #13636 - Tooltip position is (0,0) if mouse is not moved 
The tooltip position is referenced to mouse position set in mousemove event. If the tooltip is triggered by events other than mousemove (e.g. scroll the list with mousewheel or keyboard arrow keys, or click the Fetch Origin button without moving the mouse), the mouse position is not set (0,0).  The fix is to set the mouse position in mouseenter event as well
 2022-10-15 20:35:02 +01:00
Angus 8675ea638b Fix avatar tooltip does not wrap properly in some cases 2022-10-15 01:49:44 +01:00
Sergio Padrino 5e633a13f4
Merge pull request #15449 from desktop/squirrel-bypass-staggered-releases 
Make sure Squirrel.Windows isn't affected by partially or completely disabled releases
 2022-10-12 13:20:31 +02:00
Sergio Padrino 581567d64b Make sure Squirrel.Windows isn't affected by partially or completely disabled releases 2022-10-12 12:13:10 +02:00
Sergio Padrino 3d5eca0e11
Merge pull request #15445 from desktop/fix-cmd-enter-amend 
Fix cmd/control + enter shortcut while amending a commit
 2022-10-12 11:53:34 +02:00
Sergio Padrino 8b827a336e Fix linting issue… 2022-10-12 10:23:52 +02:00
Sergio Padrino f3e32e8e59 Fix cmd/control + Enter shortcut while amending a commit 2022-10-11 18:21:18 +02:00
Sergio Padrino 379b7d1045 Fix copying all content in unified diff of experimental diff viewer 2022-10-11 18:14:48 +02:00
Sergio Padrino 2411ec53a7 Fix appearance of experimental diff viewer in unified mode 2022-10-11 18:05:19 +02:00
Sergio Padrino f2d7d3281d Enable experimental diff viewer for unified diffs 2022-10-11 17:15:11 +02:00
Sergio Padrino b1b0a6f25c Fix colors of hunk handle in unified diff 2022-10-11 17:10:56 +02:00
Sergio Padrino 4e3ff0a7c8 Calculate the gutter width for unified diffs properly 2022-10-11 17:10:36 +02:00
Sergio Padrino c4369fe567
Merge pull request #15442 from Niko-O/patch-1 
Add link to build instructions to README.md
 2022-10-11 15:57:48 +02:00
Sergio Padrino 58554a6182 Improve verbiage 
Co-Authored-By: Maximilian Sachs <15086212+masachs@users.noreply.github.com>
 2022-10-11 13:45:25 +02:00
Sergio Padrino 8c100bb0c7 Make the alert "scarier" 2022-10-11 13:29:13 +02:00
Niko-O 4dbcf07b38
Add link to build instructions to README.md 
Those instructions are otherwise buried behind 2 links. That is, I first have to see the link to CONTRIBUTING.md, then find the tiny "Set Up Your Machine" section in there. In my case, I wasn't even going at it from the perspective of trying to contribute; I just wanted to build the program. So I had a very hard time finding this information.
Adding this link here would make finding this infromation a lot easier.
 2022-10-10 16:26:45 +02:00
Sergio Padrino c334c203c8 Revert changes we don't want merged 2022-10-10 16:18:27 +02:00
Sergio Padrino 7888f0372d Merge branch 'development' into update-before-closing 2022-10-10 14:08:30 +02:00
Sergio Padrino 1a1abaede5 Use "loading" indicator from header 2022-10-10 14:05:29 +02:00
Sergio Padrino bf0e389705
Merge pull request #15421 from desktop/releases/3.1.2-beta1 
Release 3.1.2-beta1
 2022-10-10 11:02:09 +02:00
Sergio Padrino 397a12b578
Update changelog.json 2022-10-10 10:40:23 +02:00
tidy-dev bccec59c08 Update changelog.json 2022-10-06 10:58:28 -04:00
tidy-dev 6eefbc96c9 Release 3.1.2-beta1 2022-10-06 10:56:42 -04:00
tidy-dev 7f51813c75
Merge pull request #15401 from sathvikrijo/extending-zoom-levels 
Adding new levels in zooming
 2022-10-06 10:32:38 -04:00
tidy-dev e024f08ba9
Merge pull request #15410 from desktop/merge-conflicts-warning 
PR View: Mergeability checking
 2022-10-06 09:47:15 -04:00
tidy-dev c2232a52c3 Add message about unrelated commit histories to no changes view 2022-10-06 09:26:56 -04:00
tidy-dev 55f4d561d5 Disable create pull request button for no changes 2022-10-06 09:21:51 -04:00
tidy-dev 7d1ecec457 Don't bother with mergeability check if no mergebase 2022-10-06 09:21:51 -04:00
tidy-dev fbd5def4a3 Update invalid to represent unrelated histories 2022-10-06 09:06:50 -04:00
tidy-dev 6a4a279c7d Handle no merge base 2022-10-06 09:06:50 -04:00