development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-20 00:21:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
35708 commits 303 branches 696 tags 363 MiB
Commit graph

28532 commits

Author SHA1 Message Date
tidy-dev 51cd66f504 Merge branch 'development' into diff-line-checkboxes 2024-01-30 13:21:03 -05:00
Sergio Padrino 7c5111425c
Merge pull request #17688 from desktop/fix-diff-drag-selection-scroll 
Fix diff range-based selection dragging the mouse
 2024-01-30 15:47:22 +01: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
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 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
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 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
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
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
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
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 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 a3d40802ef Resolve GHES API avatar URLs 2024-01-18 07:47:54 +01:00
Sergio Padrino c941327e52 Update endpoint-capabilities.ts 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2024-01-17 15:54:57 +01:00
tidy-dev b92c946653
Merge pull request #18022 from desktop/releases/3.3.7 
Release 3.3.7
 2024-01-17 07:42:47 -05:00
tidy-dev fcf664f795 Remove returning -1 2024-01-17 07:37:44 -05:00
tidy-dev 52c7cb509d
Merge pull request #17894 from masecla22/development 
Implemented folder ignore with all parent directories
 2024-01-16 09:56:03 -05:00
tidy-dev 42a1c90f46 Release 3.3.7 2024-01-16 09:37:57 -05:00
masecla22 b2694dfc24 Reversed list of ignores 2024-01-16 14:56:18 +01:00
tidy-dev f8d75be6ce
Merge pull request #18005 from desktop/use-state-not-class-variables 
Use Component Composition instead of Class Inheritance for Merge/Rebase Choose Branch Dialog
 2024-01-16 08:44:54 -05:00
tidy-dev 00fe40c947 Use ref not branch object for comparison 2024-01-16 07:47:26 -05:00
tidy-dev 6bc6cd9fea Compare against the selectedBranch 2024-01-16 07:44:42 -05:00
Markus Olsson 502183c32d
Merge pull request #18019 from desktop/scroll-as-you-like 
Recompute grid size when scrolling using fake scroll container
 2024-01-16 13:02:07 +01:00
tidy-dev 0c899bdbba Do first selected branch update in componentDidMount 2024-01-16 07:00:38 -05:00
Yasuhiro, Kaneko 541dc544ad issue #18016 
"Unable to open shell" Diaglog to suggestion on how to open the "Shell Settings" dialog #18016
 2024-01-16 10:40:25 +09:00
Markus Olsson 7bcb8031e1 Recompute grid size when scrolling the fake scroll bar 2024-01-15 18:24:27 +01:00
Sergio Padrino c55b639cf9 Improve method of building origin for Alive websockets 2024-01-15 18:01:53 +01:00