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

28744 commits

Author SHA1 Message Date
tidy-dev 2a008bc70d Merge branch 'development' into visual-improvements-on-checkall 2024-02-27 12:42:05 -05:00
tidy-dev 71d2108bb4
Merge pull request #18035 from desktop/jc-appearance-menu-underline 
Add support for toggling link underlines globally
 2024-02-27 12:38:31 -05:00
Jose Cortinas 1296b0b5c5 Formatting fix 2024-02-27 11:24:30 -06:00
Jose Cortinas 11dc95eab9
Apply suggestions from code review 
Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2024-02-27 11:20:00 -06:00
Jose Cortinas 021c324385 Add a feature flag 2024-02-26 17:45:27 -06:00
Jose Cortinas ec8f6bfc76 Set link underline default to true. 2024-02-26 07:57:42 -06:00
Jose Cortinas a1b7d2898b Merge branch 'development' into jc-icon-preview-dialog 2024-02-26 07:55:42 -06:00
tidy-dev 605bf7774f Update from recent development changes 2024-02-23 13:26:42 -05:00
tidy-dev 4b5ed761a0 Merge branch 'development' into add-check-all-semantic-control 2024-02-23 13:24:47 -05:00
tidy-dev d42a3c8b80 Update focus styles to be more consistent 2024-02-23 12:46:49 -05:00
tidy-dev 0910bbdabf Show gray border on context 2024-02-23 08:58:01 -05:00
tidy-dev 5c494415c8
Merge pull request #18206 from desktop/fix-ignore-folders-on-windows 
Use forward slash for path separation splicing in generating ignore folder paths
 2024-02-23 07:37:40 -05:00
Jose Cortinas b616b73ba7 Use a span for the example link 2024-02-22 16:53:23 -06:00
Jose Cortinas 7b3c649edb
Merge branch 'development' into jc-appearance-menu-underline 2024-02-22 16:22:51 -06:00
Jose Cortinas 7955530f59
Merge pull request #18162 from desktop/jc-icons-bigger-update 
Update primer octicons and add support for all sizes
 2024-02-22 16:12:41 -06:00
Jose Cortinas 623f6de5a9 Stop locking icons to 16px tall 2024-02-22 15:50:18 -06:00
Jose Cortinas f8a596f7b5 Add icon preview dialog 2024-02-22 15:50:01 -06:00
tidy-dev 600c26a797
Merge pull request #18202 from desktop/releases/3.3.9 
Release 3.3.9
 2024-02-22 11:43:57 -05:00
tidy-dev bcf53dd477 Use forward slash for path separation splicing 2024-02-22 10:35:48 -05:00
tidy-dev 2afc718b95 Make focus style match house hover 2024-02-21 16:43:10 -05:00
tidy-dev 4b529fc136 Add Gavin's thicker dash 2024-02-21 16:35:53 -05:00
tidy-dev 32366cc39e Fix history view regressions 2024-02-21 13:36:57 -05:00
tidy-dev 051b78a021 Release 3.3.9 2024-02-21 10:51:28 -05:00
tidy-dev 148d9e4ffd Add semantic check all 2024-02-21 09:40:29 -05:00
tidy-dev cd2c62bee0 Add more group meta data for check all semantics 2024-02-21 09:32:32 -05:00
Jose Cortinas 9d4b73408e Add a type guard for the missing case 2024-02-20 08:54:50 -06:00
Jose Cortinas 7a1cfb778a No need for a type assertion 2024-02-20 08:47:11 -06:00
Jose Cortinas b29d20415a Allow prettier to format generated icons file 2024-02-20 08:07:52 -06:00
tidy-dev e92ad863bb
Grammarly 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2024-02-16 11:15:34 -05:00
tidy-dev 81fda4e46d Make first line height not be default hunk-handle height 2024-02-16 11:10:24 -05:00
tidy-dev e676b02fbf If not selectable, don't show hunk handle 2024-02-16 09:57:50 -05:00
tidy-dev 53f75ec61e Make single line hunk handles selectable 2024-02-16 09:57:50 -05:00
tidy-dev 8778eea55e Make check all control visible single element 2024-02-15 15:16:53 -05:00
tidy-dev ed383e17b5 Calculate height of check all control 2024-02-15 15:16:05 -05:00
tidy-dev e962b8c867 Feature flag this check all work to development as much as possible for now 2024-02-15 15:15:02 -05:00
Jose Cortinas c7c85b9981 Update a comment 2024-02-14 14:22:54 -06:00
Jose Cortinas ef056e3fb6 Fix import in generate-icons that broke everything 2024-02-14 14:12:12 -06:00
tidy-dev 65aaff279d Make hunk-handle take up height of parent so it is hoverable 2024-02-14 07:59:35 -05:00
tidy-dev 2c870d70f6 Place the hunk handle 2024-02-14 07:46:08 -05:00
tidy-dev 8d1d413211 Let the hunk-handle take up space 2024-02-14 07:25:31 -05:00
tidy-dev 9dd976884f Remove line number borders aka visible hunk handles 2024-02-14 07:17:33 -05:00
tidy-dev fcc86b7c4e Group all the general .row styles 2024-02-14 07:14:09 -05:00
Jose Cortinas ee5c39580d Clean up for new types 
- Rename "* as OcticonSymbol" to "* as octicons" to denote a module namespace instead of a type.
- Change icon custom type to variant type.
 2024-02-13 15:04:27 -06:00
Jose Cortinas 6f18fe661d Update Octicon component for simpler structure 2024-02-13 15:01:54 -06:00
Jose Cortinas 8dd050835e Update generated icon output 2024-02-13 15:00:10 -06:00
Jose Cortinas a728f58804 Update icon generation and types 
- Stop storing non-essential information like the name of icons.
- Reorganize type names and definitions to avoid redundant "Type" suffix.
 2024-02-13 14:59:43 -06:00
Jose Cortinas 2bbeb45100 Use v for heights and less info for custom icons 2024-02-12 14:01:58 -06:00
Jose Cortinas cdcc1a484f Move Custom type to index 2024-02-12 08:35:47 -06:00
Jose Cortinas 2cb6a2cca2 Update all call sites and custom icon defs 2024-02-09 20:50:41 -06:00
Jose Cortinas 72c10becb8 Update Octicon component for new data struct 2024-02-09 20:50:29 -06:00
Jose Cortinas 9ad169aa64 Regenerate static icons and types 2024-02-09 20:49:27 -06:00
Jose Cortinas 76426f78d0 Resize all copy buttons to 12px 2024-02-09 14:04:49 -06:00
Jose Cortinas ecdb9d7317 Use checkCircleFill icon for success 2024-02-09 13:54:22 -06:00
Jose Cortinas 82df1d8116 Scale down success check and copy icon 2024-02-08 15:22:34 -06:00
Jose Cortinas 32fb80e514 settings -> gear 2024-02-08 15:21:58 -06:00
Jose Cortinas edd0551c75 Adjust manually created icons to new type 2024-02-08 15:21:39 -06:00
Jose Cortinas 57713a45d5 Support multiple paths in Octicon component render 2024-02-08 15:20:33 -06:00
Jose Cortinas 854ad5e563 Update generated icons and lint rules 2024-02-08 15:19:44 -06:00
tidy-dev 7707b9ed82 Method to gather row's group selection data 2024-02-08 14:13:57 -05:00
tidy-dev e96e1edde3 Add method to determine selection state of a range 2024-02-08 14:13:57 -05:00
tidy-dev 4b1a922cb2 Add interface to track row group data 2024-02-08 14:04:32 -05:00
Sergio Padrino 8c68856fac
Merge pull request #18135 from medchedli/patch-1 
Update Create Repository & Add Existing Repository Buttons text
 2024-02-08 16:13:02 +01:00
tidy-dev d0c62671d5 Release 3.3.9-beta2 2024-02-07 09:50:08 -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
Paul LeBlanc 435613691e
add pyi to syntax highlighting 2024-02-06 07:48:01 -06:00
Mohamed Chedli Ben Yaghlane 52b36a2522
Update Create Repository & Add Existing Repository Buttons text 2024-02-05 16:52:09 +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
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
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
Lucas 5d32f7ad57
Add support for multiple macOS shell bundle IDs 2024-01-29 13:51:50 +11: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 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 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
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 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
Markus Olsson a3d40802ef Resolve GHES API avatar URLs 2024-01-18 07:47:54 +01:00
Jose Cortinas 05ff47cf72
Merge branch 'development' into jc-appearance-menu-underline 2024-01-17 16:22:09 -06:00
Jose Cortinas 537ea46a0e Add accessibility preference for link underline 2024-01-17 15:49:38 -06:00
Jose Cortinas 39918ce644 Update octoicons package and generated output 2024-01-17 15:32:55 -06: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
masecla22 6349b23dbf Applied nitpick (not a nitpick, actually a good change) 2024-01-14 12:15:52 +01:00
masecla22 1036a84eb6
Update app/src/ui/changes/changes-list.tsx 
Removed gitignore text and switched to immutability

Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2024-01-14 12:11:40 +01:00
masecla22 95c7760a7f
Update app/src/ui/changes/changes-list.tsx 
Fixed bug with single files

Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2024-01-14 12:11:20 +01:00
tidy-dev 9488a2fb76 Move the redundant initial selected branch determination to the BaseChooseBranchDialog 2024-01-12 14:58:17 -05:00