Commit graph

35351 commits

Author SHA1 Message Date
Sergio Padrino 5f3a2bb6c7 More cleanup 2023-11-12 23:24:47 +01:00
Sergio Padrino d6bdd5b57a Cleanup changes for easier review 2023-11-12 23:21:37 +01:00
Sergio Padrino dbdf79daa8 Update selection based on diff line number 2023-11-12 23:15:01 +01:00
Sergio Padrino bb79bcbe14 (WIP) Refactor to use diff line numbers instead of (row, column) 2023-11-11 18:59:01 +01:00
Sergio Padrino b68665472a Update "range selection" based on the mouse position 2023-11-06 19:24:56 +01:00
Sergio Padrino 13618926ba Fix drag-based selection on unified diffs for added lines 2023-11-06 11:53:25 +01:00
tidy-dev 555274f881
Merge pull request #17619 from desktop/commit-details-overflow
Commit Summary Expansion: Handle 200% zoom
2023-11-02 07:50:33 -04:00
Sergio Padrino c691f89872
Merge pull request #17630 from desktop/close-stash-dialog
Close squash dialog after submitting the commit message
2023-11-02 12:47:59 +01:00
tidy-dev acc85fb2cc
Merge pull request #17645 from DylanDevelops/add-gitconfig-to-settings
[Addition] Implementing the ability to open .gitconfig file in external editor from settings menu
2023-11-02 06:38:05 -04:00
tidy-dev 94d6d2ea9b
Merge pull request #17654 from desktop/releases/3.3.6-beta2
Release 3.3.6-beta2
2023-11-02 06:33:15 -04:00
Markus Olsson 670b638619
Merge pull request #17639 from desktop/dependabot/github_actions/actions/setup-node-4
Bump actions/setup-node from 3 to 4
2023-11-02 06:55:29 +01:00
Dylan Ravel 9137fa2f9b Pulling variable from props rather than state 2023-11-01 11:45:33 -07:00
Dylan Ravel 53f8374bd8 Possible Fix to rendering issue 2023-11-01 10:43:33 -07:00
tidy-dev 0f4acef0ef Release 3.3.6-beta2 2023-11-01 11:16:26 -04:00
Markus Olsson 113522b59f
Merge pull request #17653 from desktop/copy-empty-lines
Add br element for empty diff lines
2023-11-01 14:07:21 +01:00
Markus Olsson f43f2702e3 Add br element for empty diff lines 2023-11-01 11:34:26 +01:00
Dylan Ravel abaa12ecff Successfully passed down prop
- The function to open the file in an external editor has been successfully passed down and the new addition is working correctly I believe
2023-10-31 11:31:42 -07:00
Dylan Ravel 5c9b1e46c9 Updated link shown condition
- Added the check to see if a global config file path exists and an external editor has been selected
2023-10-31 10:22:00 -07:00
tidy-dev b655d13ad9
Merge pull request #17650 from desktop/let-similated-events-happen-on-test
Allow similated alive events in test environment
2023-10-31 12:12:12 -04:00
tidy-dev a3d0950357 allow similated alive events in test environment 2023-10-31 11:47:24 -04:00
tidy-dev 12b5437e1b
Merge pull request #17649 from desktop/releases/3.3.6-beta1
Release 3.3.6-beta1
2023-10-31 11:32:37 -04:00
tidy-dev e5fad20dff Merge branch 'development' into commit-details-overflow 2023-10-31 10:21:11 -04:00
tidy-dev c18d0eef84 Release 3.3.6-beta1 2023-10-31 10:05:14 -04:00
Markus Olsson edb2aed89e
Merge pull request #17648 from desktop/acs
Sign using ACS
2023-10-31 14:55:19 +01:00
Sergio Padrino f62e53a47b
Merge pull request #17640 from desktop/releases/3.3.5
Release 3.3.5
2023-10-31 11:34:38 +01:00
Sergio Padrino 765600597c
Update changelog.json 2023-10-31 09:31:36 +01:00
Dylan Ravel 39cd2c4e40 Added Ternary operator and link button
Still struggling to get open in external editor working correctly.
2023-10-31 01:10:34 -07:00
Dylan Ravel bf576437b5 Gitconfig path now stored in git.tsx
Moving onto opening it in an external editor
2023-10-30 21:14:29 -07:00
dependabot[bot] f0f0114ec8
Bump actions/setup-node from 3 to 4
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-30 17:27:06 +00:00
tidy-dev 13ce339f81
Merge pull request #17641 from desktop/fix-distutil-build-error
Pin python version 3.11
2023-10-30 13:26:30 -04:00
tidy-dev ddb67365e0 Pin python version 3.11 2023-10-30 12:59:32 -04:00
tidy-dev f8b0e91ffb 3.11 work? 2023-10-30 12:51:25 -04:00
tidy-dev 5f5797ab41 Python version? 2023-10-30 12:49:07 -04:00
tidy-dev 790fb88bf9 Release 3.3.5 2023-10-30 12:31:50 -04:00
tidy-dev e3832a7c74 extend stable fade 2023-10-30 06:45:15 -04:00
tidy-dev e66cae9bf3 Shadows be 30px 2023-10-30 06:25:34 -04:00
tidy-dev 24797b5b26 Only use background on expanded. 2023-10-30 06:22:57 -04:00
tidy-dev 621b6e7eed Make transition to shadow less noticeable 2023-10-30 06:20:20 -04:00
tidy-dev a5cf091030 Use linear gradient for scroll shadow 2023-10-27 10:24:27 -04:00
tidy-dev fc16aaf7a6 Merge branch 'development' into commit-details-overflow 2023-10-27 08:31:12 -04:00
tidy-dev a243bc7fe3
Merge pull request #17618 from desktop/description-tweaks
Commit Summary Expansion: Description tweaks
2023-10-27 06:48:27 -04:00
tidy-dev 7f5a4c619f
Merge pull request #17631 from desktop/popover-dropdown-announcement
Dialog headers needing announced.
2023-10-27 06:47:50 -04:00
Sergio Padrino 263fb24992
Merge pull request #17495 from desktop/dependabot/npm_and_yarn/postcss-8.4.31
Bump postcss from 8.4.14 to 8.4.31
2023-10-27 09:33:24 +02:00
tidy-dev e94f143009 Alert dialogs work as expected 2023-10-26 11:27:06 -04:00
tidy-dev 39cc338407 Remove wierd level announcements happening 2023-10-26 11:26:57 -04:00
Sergio Padrino aa0c6df305
Merge pull request #17628 from desktop/pull-request-renamed-branch
Rely first on upstream branch to create pull requests
2023-10-26 16:58:33 +02:00
tidy-dev b0b26c2afa Only Sonoma 2023-10-26 10:58:19 -04:00
tidy-dev 53fc7a49c9 Fix popover announcement
This adds a workaround for macOS Sonoma..
2023-10-26 10:42:27 -04:00
tidy-dev b4c81e602d Use Popover ariaLabelledby prop 2023-10-26 09:01:46 -04:00
tidy-dev d789a1ae00
Merge pull request #17570 from desktop/fix-electron-validation-failure
Fix Electron Validation Script
2023-10-26 08:18:47 -04:00