Commit graph

35763 commits

Author SHA1 Message Date
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
masecla22
8a77be6366 Patched up everything 2024-01-10 21:46:05 +02:00
tidy-dev
b4db5764af Tidying 2024-01-10 14:42:00 -05:00
tidy-dev
666ed70d4c Consolidate redundant can start logic 2024-01-10 14:35:56 -05:00
tidy-dev
fbc9276b57 Tidying 2024-01-10 14:28:06 -05:00
tidy-dev
96dcb4959b Remove unneeded method 2024-01-10 14:15:21 -05:00
tidy-dev
9a81b40de6 Remove some lingering abstract class references 2024-01-10 14:12:07 -05:00
tidy-dev
f78def12ba Merge branch 'development' into use-state-not-class-variables 2024-01-10 14:10:17 -05:00
tidy-dev
382b24144d Use React composition instead of inheritance 2024-01-10 14:10:12 -05:00
tidy-dev
0533ff3db3 Release 3.3.7-beta3 2024-01-10 14:01:18 -05:00
tidy-dev
67b09decf0
Merge pull request #17934 from desktop/Fix-race-condition-in-mergability-check
Fix merge branch dialog preview message check for slow merge check
2024-01-10 13:57:04 -05:00
Markus Olsson
724b7ef75e Language 2024-01-10 17:30:39 +01:00
Markus Olsson
1f75d346ca Just the one bot 2024-01-10 17:26:39 +01:00
Markus Olsson
78ccf445cd Reuse getInitialStateForUser 2024-01-10 17:11:20 +01:00
Markus Olsson
1f516c6728 📖 2024-01-10 16:59:31 +01:00
Markus Olsson
806049111f Merge branch 'development' into bot-avatars 2024-01-10 16:57:44 +01:00
Adam Płócieniak
30c742783e
formatting fixed 2024-01-10 15:02:17 +01:00
Adam Płócieniak
d540c6ace3
landing page footer fix -> 2023 -> 2024 2024-01-10 14:58:44 +01:00
Markus Olsson
789563ae39
Merge pull request #17992 from desktop/how-do-domains-even-work
Fix hostname detection
2024-01-10 14:18:28 +01:00
Markus Olsson
37f02e3b65 fooghe.com isn't the same as foo.ghe.com 2024-01-10 13:34:21 +01:00
Markus Olsson
2e36a33bc2
Merge pull request #17991 from desktop/ghe-avatars
Resolve token for avatars when necessary
2024-01-10 13:31:30 +01:00
Markus Olsson
d3cee28135 Get rid of null 2024-01-10 12:57:08 +01:00
Markus Olsson
3b2c1553bd Be explicit about null meaning 2024-01-10 11:55:16 +01:00
Markus Olsson
ba5ada9cb0 Remove duplicated logic 2024-01-10 11:52:45 +01:00
Markus Olsson
672515d62e Simplify 2024-01-10 11:43:41 +01:00
Markus Olsson
822fc49a80 Merge branch 'development' into ghe-avatars 2024-01-09 14:57:00 +01:00
tidy-dev
8d88edc18f Don't update this.mergeStatus until ready to update preview 2024-01-09 08:05:45 -05:00
Sergio Padrino
805e439b7a
Merge pull request #17879 from desktop/amend-with-coauthors
Restore co-authors trying to amend a commit
2024-01-09 13:21:05 +01:00
tidy-dev
473d3939b2
Merge pull request #17954 from desktop/read-tags-with-commas
Comma is a valid character in tags
2024-01-09 07:20:40 -05:00
tidy-dev
c0b1505cae Use flatmap
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
2024-01-09 07:03:22 -05:00
tidy-dev
566ecb642a
Merge pull request #17936 from desktop/fix-reveal-in-finder-crashing-finder
Fix "Reveal in Finder" in conflicts resolution dialog
2024-01-09 06:44:57 -05:00
Sergio Padrino
5a75257c63
Merge pull request #17987 from desktop/bulb-button-not-submit
Explicit use of type=button for ToggletippedContent
2024-01-09 12:39:53 +01:00
Sergio Padrino
d13f7bfd58 Explicit use of type=button for ToggletippedContent
Since we're not using our `Button` component here, using this `ToggletippedContent` component in forms will result in the containing button to adopt the `type=submit` by default, causing undesired behaviors when clicked.
2024-01-09 12:21:48 +01:00