development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-31 05:19:03 +00:00
Code Issues Projects Releases Packages Wiki Activity
35150 commits 305 branches 713 tags 371 MiB
Commit graph

35150 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev
8288126980
Merge pull request #17375 from desktop/prettier-default-formatter 
Make prettier the default formatter in workspace settings.
 2023-09-11 10:56:07 -04:00
tidy-dev
7db5037a70 Update settings.json 2023-09-11 09:22:40 -04:00
tidy-dev
fb2b0320b1 Conflicts need side padding for scrollbar 2023-09-11 08:38:06 -04:00
Sergio Padrino
44bfc3c1d8 Fix styling 2023-09-11 13:51:46 +02:00
Sergio Padrino
b8c0e59521 Replace Undo link when resolving conflicts with button 2023-09-11 13:51:40 +02:00
Sergio Padrino
b720d31848
Merge pull request #17331 from desktop/always-allow-rebasing 
Allow rebasing even when the branch is a direct descendant of the base branch
 2023-09-11 13:22:32 +02:00
Ryan Stillings
22b92e5b00 Add option to disable commit message length warning 2023-09-10 21:28:31 -04:00
Sergio Padrino
30a180acfa Don't do anything in processMultiCommitOperationRebaseResult for RebaseResult.AlreadyUpToDate 2023-09-06 18:59:35 +02:00
Jose Cortinas
3ded969a9b Use better words 2023-09-06 11:22:04 -05:00
Jose Cortinas
3a03318875 Add label and haspopup for button 2023-09-06 11:05:19 -05:00
tidy-dev
a1ece186ba
Merge pull request #17351 from desktop/releases/3.3.2-beta1 
Release 3.3.2-beta1
 2023-09-06 11:56:55 -04:00
Sergio Padrino
8c09c2523a Revert mistake and add documentation 2023-09-06 17:54:09 +02:00
Sergio Padrino
4043d34830 Add stats for rebases where the branch was already up-to-date 2023-09-06 17:52:36 +02:00
Sergio Padrino
63666d9232 Clean up old code 2023-09-06 17:39:06 +02:00
Sergio Padrino
e8556662d4 Clean up "branch already updated" case for rebases 2023-09-06 17:38:11 +02:00
tidy-dev
22aaf636a0 Release 3.3.2-beta1 2023-09-06 08:56:56 -04:00
tidy-dev
98b37d3b8c
Merge pull request #17304 from desktop/record-explicit-merges-with-conflicts 
Track when merge conflicts happens from explicit merge
 2023-09-06 08:46:23 -04:00
Sergio Padrino
3618331c62
Merge pull request #17324 from desktop/focus-clear-button 
Make clear button in textboxes keyboard accessible
 2023-09-06 13:33:10 +02:00
Sergio Padrino
2fef5ba055
Merge pull request #17345 from desktop/fix-tab-flat-list 
Fix tab behavior on flat lists with no selected item
 2023-09-05 19:32:11 +02:00
Sergio Padrino
c7b9a62a41 Fix tab behavior on flat lists with no selected item 2023-09-05 18:26:03 +02:00
Sergio Padrino
982b37fc13
Merge pull request #17337 from desktop/scroll-clone-repo-dialog 
Make clone & create repository dialogs accessible when zooming in
 2023-09-05 17:35:17 +02:00
Sergio Padrino
c8ec9002d3
Merge pull request #17311 from desktop/fix-keyb-nav-lists 
Fix keyboard navigation of filter lists
 2023-09-05 17:10:29 +02:00
Sergio Padrino
3bbe5d7ed3
Merge pull request #17314 from desktop/fix-compare-list-focus-on-tab 
Fix branch list focus using tab key in compare mode
 2023-09-05 16:21:31 +02:00
Sergio Padrino
899fa8f50c In selectable (section) lists without selected items, set first item as next tab stop 2023-09-05 15:55:41 +02:00
Sergio Padrino
2fd0eb8328 In selectable (flat) lists without selected items, set first item as next tab stop 2023-09-05 15:55:41 +02:00
Sergio Padrino
cfb53226b4 Fix keyboard navigation of flat filter list 2023-09-05 15:54:01 +02:00
Sergio Padrino
e7607116b1 Fix keyboard navigation of section filter list 2023-09-05 15:54:01 +02:00
Sergio Padrino
b2251989a5 Revert "Revert "Merge pull request #17225 from desktop/jc-live-container-chill"" 
This reverts commit a58b635bd8.
 2023-09-05 15:53:50 +02:00
Sergio Padrino
737d3e24e1 Allow scrolling create-repo dialog when zooming in 2023-09-04 19:28:16 +02:00
Sergio Padrino
eb873a0dd4 Allow scrolling clone-repo dialog when zooming in 2023-09-04 19:28:04 +02:00
dependabot[bot]
4adb3a9241
Bump actions/checkout from 3 to 4 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-04 15:50:24 +00:00
Sergio Padrino
cedf4c6412 Fix successful merge banner styling 2023-09-03 10:58:56 +02:00
Sergio Padrino
4961dacf57 Show "already up-to-date" banner when needed after rebase 2023-09-03 10:13:24 +02:00
Sergio Padrino
ccc73f4c12 Rename enum value 2023-09-03 10:05:20 +02:00
Sergio Padrino
5b6af7d1d2 Use … instead of ... 2023-09-02 19:08:01 +02:00
Sergio Padrino
e7dda3bce3 Make sure textbox always gets focused after clearing 2023-09-02 19:07:43 +02:00
Sergio Padrino
57e180c572 Fix clear button in compare filter textbox 2023-09-02 19:07:23 +02:00
Sergio Padrino
004f170041 Restore text-box implementation for type=search 2023-09-02 19:00:55 +02:00
Sergio Padrino
b0aa81c607 Add aria-live message when input is cleared via the clear button 2023-09-02 18:59:22 +02:00
Sergio Padrino
461e625aa3 Improve clear button styling 2023-09-02 18:49:44 +02:00
Sergio Padrino
9b7f90f41f Cleanup 2023-09-01 11:13:20 +02:00
Sergio Padrino
d8134f3e42 Add new clear button to text box component 2023-09-01 11:02:44 +02:00
Sergio Padrino
61a952930f (WIP) some work 2023-09-01 09:51:10 +02:00
Markus Olsson
2e2c010d02
Merge pull request #17307 from desktop/retain-focus 2023-08-31 22:01:11 +02:00
tidy-dev
cb7dc2df88
Merge pull request #17313 from desktop/releases/3.3.1 
Release 3.3.1
 2023-08-31 07:09:59 -04:00
Markus Olsson
831a92def4 First take on changelog 2023-08-31 10:35:46 +02:00
Markus Olsson
a58b635bd8 Revert "Merge pull request #17225 from desktop/jc-live-container-chill" 
This reverts commit 426b6dd0a7, reversing
changes made to 289e4bc250.
 2023-08-31 10:21:45 +02:00
Markus Olsson
6276830343 Don't assign gpgSignEnabled more than once 2023-08-31 10:20:13 +02:00
vaindil
4bd49263e7 add commit signing warning 2023-08-31 10:20:10 +02:00
Markus Olsson
c1d4ecff3a
Merge pull request #17310 from vaindil/vaindil/commit-signing-check 
Add commit signing repo rules warning
 2023-08-31 10:07:52 +02:00