Commit graph

36115 commits

Author SHA1 Message Date
Markus Olsson ccb169183b 🔥 redundant debugging 2024-04-29 17:27:46 +02:00
Markus Olsson 9465f9e967 Don't prompt for generic credentials for github.com 2024-04-29 17:09:21 +02:00
Markus Olsson 0b754c39db Remove deprecated error handler 2024-04-29 17:09:21 +02:00
Markus Olsson 315d34dff2 Move acquiring creds into the trampoline 2024-04-29 17:09:21 +02:00
Markus Olsson a50d179472 Let trampoline environment know if we're in a background task or not 2024-04-29 17:09:21 +02:00
Markus Olsson 7a743489a1 Don't attempt to update remote head if pull fails 2024-04-29 14:11:51 +02:00
Markus Olsson 8461f421dc We do support multiple popups these days 2024-04-29 11:17:57 +02:00
Markus Olsson 5bf2c25673 Debugging 2024-04-29 11:07:03 +02:00
Markus Olsson 441c8d3fa8 Handle generic git accounts directly in trampoline 2024-04-29 11:06:52 +02:00
Markus Olsson bc2efbe210 Give askpass handler direct access to accounts store 2024-04-29 11:06:35 +02:00
Sergio Padrino b14d5a173c
Merge pull request #18373 from desktop/dependabot/npm_and_yarn/express-4.19.2
Bump express from 4.17.3 to 4.19.2
2024-04-25 15:58:01 +02:00
Sergio Padrino 6709f7f2e7
Merge pull request #18501 from desktop/dependabot/github_actions/peter-evans/create-pull-request-6.0.4
Bump peter-evans/create-pull-request from 6.0.3 to 6.0.4
2024-04-25 15:57:21 +02:00
Markus Olsson bc723ddd2c
Merge pull request #18503 from desktop/update-gitignore-submodule
Update gitignore and choosealicense submodules to latest versions
2024-04-25 10:42:55 +02:00
Steve Ward 3d9c19ab2d Update submodules to latest 2024-04-23 11:40:00 -04:00
dependabot[bot] 7da684f824
Bump peter-evans/create-pull-request from 6.0.3 to 6.0.4
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.0.3 to 6.0.4.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v6.0.3...v6.0.4)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-22 15:43:51 +00:00
tidy-dev 873520111b
Merge pull request #18477 from desktop/releases/3.3.15-beta1
Release 3.3.15-beta1
2024-04-18 11:29:38 +00:00
tidy-dev 6f966315b7 Add reset to a previous commit 2024-04-17 09:51:03 -04:00
tidy-dev 9bc7ed2d36 Merge branch 'development' into releases/3.3.15-beta1 2024-04-17 09:49:10 -04:00
tidy-dev 26430b0ab6
Merge pull request #18470 from desktop/enable-reset-commit-beta
Enable "reset to commit" in beta builds
2024-04-17 13:47:20 +00:00
Sergio Padrino fe99464782 Turn WarningBeforeReset into an alertdialog
Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
2024-04-17 14:45:09 +02:00
tidy-dev 03a074f5fa Release 3.3.15-beta1 2024-04-17 08:30:27 -04:00
tidy-dev e8390b227e
Merge pull request #18461 from desktop/accessibility-setting-stats
Accessibility setting stats
2024-04-17 11:09:39 +00:00
Sergio Padrino 92fa649817
Merge pull request #18444 from desktop/everything-goes-brrr
Remove remaining `<br />`
2024-04-17 12:34:51 +02:00
Sergio Padrino b26ac65e03 Improve spacing of Large Diff description text 2024-04-16 17:05:06 +02:00
Sergio Padrino d38574a3f0 Adjust p margin in ConfirmRemoveRepository 2024-04-16 16:59:46 +02:00
tidy-dev 6636b5aedc
Merge pull request #18466 from desktop/releases/3.3.14
Release 3.3.14
2024-04-16 13:59:13 +00:00
tidy-dev 77ee123554
Merge pull request #18412 from desktop/create-repository-dialog-not-clipped-when-zoomed
Apply zoom overflow media queries to all dialogs
2024-04-16 13:45:57 +00:00
tidy-dev 081a8de9e2
Update changelog.json
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
2024-04-16 09:45:17 -04:00
tidy-dev efef66d37d Move to calculated stats 2024-04-16 09:41:06 -04:00
Sergio Padrino ef71ab0334 Enable "reset to commit" in beta builds 2024-04-16 15:37:05 +02:00
tidy-dev ab6d28c602
Update app/src/lib/stats/stats-database.ts 2024-04-16 08:36:27 -04:00
Markus Olsson db033c17b8
Merge pull request #18449 from desktop/dependabot/npm_and_yarn/app/tar-6.2.1
Bump tar from 6.1.13 to 6.2.1 in /app
2024-04-16 14:22:29 +02:00
tidy-dev b6c1402ee0 Add Electron release note? 2024-04-15 13:09:18 -04:00
tidy-dev 0f0fbff1e7 Release 3.3.14 2024-04-15 12:53:12 -04:00
Sergio Padrino 78195151db
Merge pull request #18463 from desktop/dependabot/github_actions/peter-evans/create-pull-request-6.0.3
Bump peter-evans/create-pull-request from 6.0.2 to 6.0.3
2024-04-15 18:12:40 +02:00
dependabot[bot] e6d77c9656
Bump peter-evans/create-pull-request from 6.0.2 to 6.0.3
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.0.2 to 6.0.3.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v6.0.2...v6.0.3)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-15 15:17:40 +00:00
Sergio Padrino bedcb73ec3
Merge pull request #17957 from imkylecat/development
feat: Zig Highlighting
2024-04-15 15:29:16 +02:00
tidy-dev b3286b233a Use app default as stats default 2024-04-15 08:42:19 -04:00
tidy-dev 461dcfce30 Add Diff and Underline Visibility tracking in stats 2024-04-15 08:37:31 -04:00
Sergio Padrino c6edb587ab Use p instead of br in CloneGenericRepository 2024-04-12 13:14:32 +02:00
Sergio Padrino 45de2a344d Use p instead of br in AddExistingRepository 2024-04-12 12:31:00 +02:00
Sergio Padrino 007ff435eb Use p instead of br in OpenPullRequestDialogHeader 2024-04-11 17:49:57 +02:00
dependabot[bot] 2ff02db153
Bump tar from 6.1.13 to 6.2.1 in /app
Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.13 to 6.2.1.
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.1.13...v6.2.1)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-04-11 06:28:11 +00:00
Sergio Padrino 05362a9634 Use p instead of br in ConfirmRemoveRepository 2024-04-10 16:50:24 +02:00
Sergio Padrino de4381060a Use p instead of br in AddSSHHost 2024-04-10 16:44:29 +02:00
Sergio Padrino f627921c05 Use p instead of br for the disclaimer notes of the welcome start screen 2024-04-10 16:35:59 +02:00
Sergio Padrino 974e8b9067 Use p instead of br in WarnLocalChangesBeforeUndo 2024-04-10 16:33:57 +02:00
Sergio Padrino dd92c3ce8d Replace br with margin-top for Notifications setting warning 2024-04-10 15:49:42 +02:00
tidy-dev ef51659c30 Tweak Release and Thank you notes dialogs for zoom to 200% 2024-04-10 08:20:25 -04:00
tidy-dev 030011e3df Override other max-height styles 2024-04-10 08:09:25 -04:00