development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-11-05 20:49:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
35834 commits 304 branches 713 tags 371 MiB
Commit graph

35834 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev
3d3bbe7591 Put diffCheck in it's own file 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2024-01-26 08:01:51 -05:00
Sergio Padrino
d3f7c5ec7e Rewrite comment to be more accurate 2024-01-26 13:34:00 +01:00
Sergio Padrino
92fecc1473 Improve diff parser tests to check diff line numbers when "no newline" marker is present 2024-01-26 13:17:24 +01:00
Sergio Padrino
2a686716d0 Fix diffLineNumber for lines after a "no newline" marker 2024-01-26 13:08:56 +01:00
Sergio Padrino
211ef8fc58
Merge pull request #18084 from desktop/eol-changes-warning-banner 
Use banner to announce line endings change warning in diffs
 2024-01-26 10:51:31 +01:00
Jose Cortinas
b608647dcb Add focus indicator when diff grid has focus 2024-01-25 15:46:01 -06:00
tidy-dev
0bb2627daf Cleaner diff check marks 
Co-Authored-By: Gavin Nelson <gavin@nelson.co>
 2024-01-25 13:29:27 -05:00
Sergio Padrino
373938ca4b Refactor to simplify DiffContentsWarning usage 2024-01-25 17:59:28 +01:00
Sergio Padrino
49b03bbe25 Group diff warnings inside the same banner 2024-01-25 17:56:17 +01:00
Sergio Padrino
cf10b38882
Merge pull request #18083 from desktop/fix-amend-non-gh-repo 
Restore message of commit to amend for non GitHub repos
 2024-01-25 17:18:28 +01:00
Sergio Padrino
204fbe92f7 Just like when undoing a commit, make sure message from commit to amend is restored 
This logic is copied from GitStore's `undoCommit`
 2024-01-25 13:37:22 +01:00
tidy-dev
228c82fa33 Don't add stuff to non selectable diffs 2024-01-24 11:58:04 -05:00
tidy-dev
022f6e17c1 Give some room for check marks on split diff 2024-01-24 11:50:01 -05:00
tidy-dev
dc71c8bca8 Keep consistent sizing and placement of check mark 2024-01-24 11:50:01 -05:00
tidy-dev
b9c7abbe9c Keep border on unified diff line numbers 2024-01-24 11:50:01 -05:00
tidy-dev
ca2e375963 Add a octicon check mark on selected line numbers 2024-01-24 11:50:01 -05:00
tidy-dev
642fc80fd5 Make focus ring rounded to match other styles 2024-01-24 11:50:00 -05:00
Sergio Padrino
c61852d3f7 First step to render the line endings change warning as a banner 2024-01-24 16:05:41 +01:00
Sergio Padrino
b83fd3f6cf
Merge pull request #18069 from desktop/eol-changes-warning 
Add aria-label to line-ending change warning icon in diffs
 2024-01-24 15:31:35 +01:00
Sergio Padrino
635b5ddd3b Always scroll to the mouse position 2024-01-24 15:30:33 +01:00
Sergio Padrino
958d84d4b9 Don't skip last line 2024-01-24 13:43:37 +01:00
Sergio Padrino
bd42f2e5ec Merge branch 'development' into fix-diff-drag-selection-scroll 2024-01-24 13:31:34 +01:00
Sergio Padrino
2c3234c980 Use Octicon title as its aria-label too 2024-01-24 13:27:29 +01:00
Jose Cortinas
9d05adbc9b
Apply suggestions from code review 
Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2024-01-23 09:51:23 -06:00
Sergio Padrino
d0a92695d7 Add aria-label to line-ending change warning icon in diffs 2024-01-23 13:52:47 +01:00
Sergio Padrino
ecada7b91b
Merge pull request #17651 from DylanDevelops/adding-new-syntax-highlighting 
Added new extensions to existing syntax highlighting
 2024-01-23 12:12:16 +01:00
tidy-dev
2d524bddb3 Remove debugger 2024-01-22 15:41:40 -05:00
tidy-dev
413ce9cb32 Remove attempt to remove mousedown linter disable.. 2024-01-22 15:31:48 -05:00
tidy-dev
b4f0099d0a Show whitespace popover when interacting 2024-01-22 13:43:07 -05:00
tidy-dev
d50969f68f Don't regress borders 2024-01-22 13:42:54 -05:00
tidy-dev
eef77351fc Finish that doc line 2024-01-22 13:03:13 -05:00
tidy-dev
f1216f3916 Use checkboxes to represent line number inclusion 2024-01-22 12:56:25 -05:00
Jose Cortinas
da61f9bbc0 Always write default setting to localstorage 2024-01-22 11:55:46 -06:00
Sergio Padrino
731a1a3312
Merge pull request #18040 from bentookey-yotta/add-mdx-highlighting 
Apply Markdown highlighting to .mdx files
 2024-01-22 12:21:43 +01:00
Jose Cortinas
ec1d29b8c1 Disable variable naming convention linter for generated octicons file 2024-01-18 13:51:17 -06:00
tidy-dev
9fdb8c3b09
Merge pull request #18042 from desktop/releases/3.3.9-beta1 
Release 3.3.9-beta1
 2024-01-18 14:16:01 -05:00
tidy-dev
4be9fa7638
Merge pull request #18029 from desktop/more-invalid-row-removal 
Remove returning -1 in file list for selected rows
 2024-01-18 09:47:53 -05:00
Markus Olsson
5f99b5a249 Merge branch 'development' into bot-avatars 2024-01-18 15:43:53 +01:00
Sergio Padrino
67aa66ca78
Merge pull request #18018 from desktop/alive-origin-fixes 
Improve method of building origin for Alive websockets
 2024-01-18 15:33:22 +01:00
tidy-dev
b7bde55c63 Release 3.3.9-beta1 2024-01-18 09:18:48 -05:00
tidy-dev
d946543f45
Merge pull request #18041 from desktop/releases/3.3.8 
Release 3.3.8
 2024-01-18 09:05:23 -05:00
tidy-dev
2d3d4cc01c Merge branch 'development' into releases/3.3.8 2024-01-18 08:49:22 -05:00
tidy-dev
8c2a84839e
Merge pull request #18039 from desktop/fix-button-enabled-regression 
Fix merge dialog button availability regression
 2024-01-18 07:54:40 -05:00
tidy-dev
48bb70598e Release 3.3.8 
Update changelog.json
 2024-01-18 07:22:01 -05:00
Markus Olsson
204e125bc9 Merge pull request #18036 from desktop/ghes-avatar-url 2024-01-18 07:22:01 -05:00
tidy-dev
0f60cccfb9 Fix merge button availability regression 2024-01-18 07:19:00 -05:00
tidy-dev
19ba6c87d3 Fix button availability regression 2024-01-18 07:12:47 -05:00
Markus Olsson
e72388f649
Merge pull request #18036 from desktop/ghes-avatar-url 2024-01-18 12:48:53 +01:00
Ben Tookey
847fa79621 feat: apply Markdown highlighting to .mdx files 2024-01-18 10:39:52 +00:00
Markus Olsson
1f43656a12 Merge branch 'ghes-avatar-url' into bot-avatars 2024-01-18 08:21:46 +01:00