Commit graph

35145 commits

Author SHA1 Message Date
tidy-dev
043bc9f4d0 Expand meta data on expansion 2023-10-11 12:01:46 -04:00
tidy-dev
02a3316ec5 Adapt styles for expander in summary 2023-10-11 11:57:28 -04:00
tidy-dev
78b5327c58 Render expander in summary 2023-10-11 11:53:27 -04:00
tidy-dev
5e21bb821f Removed unused class assignment 2023-10-11 11:27:00 -04:00
tidy-dev
48dd1a4620 Remove scss hypen hack 2023-10-11 10:58:46 -04:00
tidy-dev
ee1782180b Merge branch 'commit-summary-expansion-history-file-list-header' into de-shortcut-commit-summary-css 2023-10-11 10:42:50 -04:00
tidy-dev
6700c370ba Merge branch 'commit-expansion-file-diff-header' into commit-summary-expansion-history-file-list-header 2023-10-11 10:42:02 -04:00
tidy-dev
b7e7f7acfa Merge branch 'development' into commit-expansion-file-diff-header 2023-10-11 10:40:37 -04:00
tidy-dev
f80d29f63c
Merge pull request #17533 from desktop/commit-expansion-feature-flag2
Commit Summary Expansion: Add feature flag and make a copy of `CommitSummary` component to modify
2023-10-11 10:40:06 -04:00
tidy-dev
4460015cdf Merge branch 'commit-expansion-feature-flag2' into de-shortcut-commit-summary-css 2023-10-11 10:22:53 -04:00
tidy-dev
f4d2a809b1 Make copy of commit summary scss too 2023-10-11 10:14:21 -04:00
tidy-dev
1f5aea3859 Remove from ExpandableCommitSummary 2023-10-11 09:33:52 -04:00
tidy-dev
b8db1cd237 Add File List header- matching changed file list header styles 2023-10-11 09:31:55 -04:00
tidy-dev
a4936941a7 Remove diff settings from ExpandableCommitSummary 2023-10-11 08:56:40 -04:00
tidy-dev
31971aa590 Generalize changes view stiles to diff-container class 2023-10-11 08:53:17 -04:00
tidy-dev
ce930e6ad4 Use DiffHeader in SelectedCommit (History view) 2023-10-11 08:52:54 -04:00
tidy-dev
a381dc5d8c Change ChangedFileDetails component name to DiffHeader to be more descriptive of use 2023-10-11 08:47:06 -04:00
tidy-dev
44af54b404 Move diff header to diff directory 2023-10-11 08:44:52 -04:00
tidy-dev
a927045758 Make copy of current commit summary 2023-10-11 08:17:28 -04:00
tidy-dev
cf9364c8ee Add Expansion Header feature flag 2023-10-11 08:17:28 -04:00
Sergio Padrino
4ec9f2fae9
Merge pull request #17528 from desktop/releases/3.3.4-beta3
Release 3.3.4-beta3
2023-10-11 00:33:33 +02:00
Sergio Padrino
fe55cc72ca Bump version and changelog to 3.3.4-beta3 2023-10-10 16:31:40 +02:00
Sergio Padrino
f4cd2c13af
Merge pull request #17524 from desktop/electron-26-2-4 2023-10-10 15:31:11 +02:00
Sergio Padrino
80a77bf5f5
Merge pull request #17453 from desktop/check-node-winarm64 2023-10-10 15:30:57 +02:00
Sergio Padrino
dd28e405ee
Merge pull request #17519 from desktop/alertdialog-for-local-changes-error
Use `role=alertdialog` for errors when trying to do operations with local changes
2023-10-10 11:02:45 +02:00
Sergio Padrino
fa75165100 Bump Electron to v26.2.4 2023-10-10 09:59:48 +02:00
Sergio Padrino
f769165e55 Use role=alertdialog for errors when trying to do operations with local changes 2023-10-09 10:14:14 +02:00
Sergio Padrino
57180aa893
Merge pull request #17505 from imkylecat/development
fix: JetBrains PhpStorm Capitalization
2023-10-06 17:07:46 +02:00
Sergio Padrino
de0296321c Revert "No need to download node for win-arm64???"
This reverts commit a894ca12b9.
2023-10-06 15:46:47 +02:00
Sergio Padrino
a894ca12b9 No need to download node for win-arm64??? 2023-10-06 15:41:46 +02:00
Sergio Padrino
c519003099 Revert "Revert "Bump node version to v18.16.1""
This reverts commit 3ad30a2702.
2023-10-06 15:41:46 +02:00
Kyle
89e1aa679d fix: JetBrains PhpStorm Capitalization 2023-10-05 15:56:29 -04:00
tidy-dev
8d987788d1
Merge pull request #17501 from desktop/releases/3.3.4-beta2
Release 3.3.4-beta2
2023-10-05 13:58:02 -04:00
tidy-dev
1d08d0334e
Use familiar language 2023-10-05 10:48:14 -04:00
tidy-dev
1fe7179626 Add tab character fix 2023-10-05 10:46:56 -04:00
tidy-dev
044a556340 Merge branch 'development' into releases/3.3.4-beta2 2023-10-05 10:45:49 -04:00
Sergio Padrino
6c214b86a0
Merge pull request #17428 from desktop/render-tab-characters-correctly
Render tab characters properly in diffs
2023-10-05 16:45:33 +02:00
tidy-dev
200b76eb06 Order.. 2023-10-05 10:23:39 -04:00
tidy-dev
99b9730e93 Release 3.3.4-beta2 2023-10-05 10:20:40 -04:00
Markus Olsson
89a832e9c6
Merge pull request #17496 from desktop/lower-dash
Avoid importing all of lodash
2023-10-05 15:44:56 +02:00
Markus Olsson
099fc60e79 Make sure we import lodash from app, not from ambient node_modules 2023-10-05 11:35:02 +02:00
Sergio Padrino
282a8d6acf
Merge pull request #17488 from desktop/branch-filter-aria-label
Add `aria-label` to "compare" filter textbox
2023-10-05 11:32:44 +02:00
Markus Olsson
df91626390
Merge pull request #17494 from desktop/yarn-why
Remove unused dependencies
2023-10-05 10:51:26 +02:00
Markus Olsson
5de0e89df4 Don't import all of lodash 2023-10-05 09:36:07 +02:00
Markus Olsson
903785a9d2 Import escapeReExp directly 2023-10-05 09:29:18 +02:00
Markus Olsson
87049f6e57 Remove unused dependencies
electron-debug and devtron haven't been updated in years. Electron-devtools main function is adding keyboard shortcuts in dev mode to open devtools and the element selector. We use neither of these
2023-10-05 09:19:19 +02:00
Sergio Padrino
2aaf1a9335
Merge pull request #17479 from desktop/generic-error-alertdialog
Add `role="alertdialog"` to generic app error dialog
2023-10-05 08:45:43 +02:00
Sergio Padrino
eab913ab83
Merge pull request #17483 from desktop/dialog-h1-to-h2
Use `h2` for dialog titles
2023-10-05 08:43:36 +02:00
Sergio Padrino
756b259f05 Add aria-label to "compare" filter textbox 2023-10-04 18:32:57 +02:00
Sergio Padrino
c4c0035349 Remove unused CSS for merge dialogs
The dialog with `id="merge"` was deleted in cadc38cc15
2023-10-03 18:09:00 +02:00