Commit graph

35845 commits

Author SHA1 Message Date
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
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 2723e61b4a Or... the other one .. 2024-01-16 10:51:15 -05:00
tidy-dev fb8a5543f1 Consolidate tooltip notes 2024-01-16 10:49:19 -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
tidy-dev 83aa39f4ef
Merge pull request #18021 from yasuking0304/desktop-issue-18016
"Unable to open shell" Diaglog to suggestion on how to open the "Shell Settings" dialog #18016
2024-01-16 06:58:39 -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
Markus Olsson cbddc32481
Merge pull request #18004 from CarsonDay11/development
Updated README.md and changed the link from just Electron to Electron-based
2024-01-15 17:08:53 +01:00
Markus Olsson 55c317bae3
Merge pull request #17993 from adamplocieniak/patch-1
landing page footer fix: 2023 -> 2024
2024-01-15 17:05:26 +01:00
Markus Olsson e453d7aeba Revert suffix inclusion in link 2024-01-15 16:51:31 +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
Steve Ward f15c48b4b9
Merge pull request #18006 from clackwork/patch-1
README: Fix link to Getting Started docs
2024-01-12 10:28:49 -05:00
clackwork f768684a75
README: Fix link to Getting Started docs
Link to prior location yields 404. Updated.
2024-01-11 16:22:57 -08:00
tidy-dev fe8b8444c2 Woops.. don't invert that logic check 2024-01-11 15:45:10 -05:00
Carson Day 4eb5b6d645
Update README.md 2024-01-11 14:16:29 -06:00
tidy-dev 81c0a0e2f1
Merge pull request #17995 from desktop/releases/3.3.7-beta3
Release 3.3.7-beta3
2024-01-11 10:05:57 -05:00
Markus Olsson 3521a93ab4 Bail if unmounted 2024-01-11 11:32:57 +01:00
Markus Olsson bf13915638 Avoid attempting to resolve unless email appears to be a bot email 2024-01-11 11:29:58 +01:00
masecla22 e8e4921ee4 Update changes-list.tsx 2024-01-10 21:54:24 +02:00
masecla22 a9763fb39c Patched a small issue with paths 2024-01-10 21:52:00 +02:00
masecla22 0a56e7611a Fixed a small oversight in vscode settings. 2024-01-10 21:51:54 +02:00
tidy-dev 1f88d63f45 Tidying 2024-01-10 14:48:02 -05:00