development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-08-28 20:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
35763 commits 300 branches 689 tags 357 MiB
Commit graph

35763 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev 8579a225d6 Release 3.3.10 2024-03-05 07:29:17 -05:00
Sergio Padrino ad57d67df6 Merge pull request #18239 from desktop/diff-container-flexbox 
Make diff side-by-side diff container a flexbox container
 2024-03-05 07:26:20 -05:00
tidy-dev c86ed7b413 Merge pull request #18206 from desktop/fix-ignore-folders-on-windows 
Use forward slash for path separation splicing in generating ignore folder paths
 2024-03-05 07:25:20 -05:00
tidy-dev 051b78a021 Release 3.3.9 2024-02-21 10:51:28 -05:00
tidy-dev d0c62671d5 Release 3.3.9-beta2 2024-02-07 09:50:08 -05:00
tidy-dev 2b17667b38
Merge pull request #18147 from desktop/feature-flag-diff-checkmarks 
Feature flag and setup for adding setting of diff checkmarks
 2024-02-07 09:36:36 -05:00
tidy-dev a1fc55bdf2 Add diff check marks setting 2024-02-07 08:49:29 -05:00
tidy-dev 0780dfdad6 Add diff checks feature-flag 2024-02-07 08:26:48 -05:00
Sergio Padrino 1ec6086e4e
Merge pull request #18141 from pLeBlanc93/pyi-syntax-highlight 
add `pyi` to syntax highlighting
 2024-02-06 15:21:41 +01:00
Sergio Padrino 72bec2ee41
Merge pull request #18134 from desktop/dependabot/github_actions/peter-evans/create-pull-request-6.0.0 
Bump peter-evans/create-pull-request from 5.0.2 to 6.0.0
 2024-02-06 14:59:10 +01:00
Paul LeBlanc 435613691e
add pyi to syntax highlighting 2024-02-06 07:48:01 -06:00
dependabot[bot] 636700e65a
Bump peter-evans/create-pull-request from 5.0.2 to 6.0.0 
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5.0.2 to 6.0.0.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v5.0.2...v6.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-05 15:41:55 +00:00
Sergio Padrino a7856a1ccc
Merge pull request #18132 from desktop/fix-permissions 
Fix close single-word issue action permissions
 2024-02-05 15:33:17 +01:00
Steve Ward 636b9697f6
Fix action permissions 2024-02-05 08:50:50 -05:00
Sergio Padrino 6858fce8de
Merge pull request #18124 from desktop/submodule-sha-copy 
Replace SHA tooltips with copy buttons in submodule diffs
 2024-02-02 16:27:06 +01:00
Sergio Padrino 0f5bce40af Replace sha tooltips with copy buttons in submodule diffs 2024-02-02 14:08:37 +01:00
tidy-dev ecb68b6e4e
Merge pull request #18077 from desktop/add-visual-checks-to-diff 
Add visual checks to diff
 2024-02-01 08:08:40 -05:00
Sergio Padrino 3093f01a37
Merge pull request #18001 from desktop/bot-avatars 
Add support for bot avatars
 2024-02-01 11:07:47 +01:00
Jose Cortinas 52dafb3b02
Merge pull request #18086 from desktop/jc-diff-focus-indicator 
Add focus indicator when diff grid has focus
 2024-01-31 13:45:29 -06:00
tidy-dev 3b0613a955 Update extra width for both diffs 2024-01-31 12:48:46 -05:00
tidy-dev 82fb6dbc3c Make sure cursor style applies to everything 2024-01-31 12:19:13 -05:00
tidy-dev 3e106252d9 Align checks to line numbers when wrapped 2024-01-31 12:03:14 -05:00
tidy-dev e5d989023f
Merge pull request #18064 from desktop/diff-line-checkboxes 
Using a checkbox input for managing line inclusion toggling
 2024-01-31 09:14:13 -05:00
Sergio Padrino 81602ac18d Remove unwanted tab 
Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2024-01-31 13:20:16 +01:00
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 51a86df5ff Align user avatar to the center of the tooltip 2024-01-30 13:30:55 +01:00
Sergio Padrino 55706e82f1 Set user name for known bots to fix their avatar tooltips 2024-01-30 13:30:31 +01:00
Sergio Padrino db23071c4b
Merge pull request #18091 from desktop/close-single-word-issues 
Add a new action to automatically close issues with single-word titles
 2024-01-30 11:52:34 +01:00
Jose Cortinas 6f7ec44fb6
Update app/styles/ui/_diff.scss 
Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2024-01-29 10:54:47 -06:00
Steve Ward 53df115a24
Update .github/workflows/close-single-word-issues.yml 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2024-01-29 11:41:50 -05:00
Sergio Padrino c2a964f80d
Merge pull request #18089 from desktop/fix-select-last-line 
Fix diff parser when last line of file has "no newline" marker before the change
 2024-01-29 15:06:52 +01:00
Steve Ward cd5d9168e0 Fix linting 2024-01-26 13:31:58 -05:00
Steve Ward 893b00e4d7
Add a new GitHub Action to close issues with only a single word in the title 2024-01-26 13:09:24 -05:00
tidy-dev 4b874c952e Don't mess up the check mark symbol... 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2024-01-26 10:45:34 -05:00
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