development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-13 21:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
33260 commits 297 branches 696 tags 363 MiB
Commit graph

33260 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev 008a0fb793 Release 3.1.3-beta2 2022-10-26 09:50:25 -04:00
Sergio Padrino fafd8b0034
Merge pull request #15416 from desktop/update-before-closing 
Prevent closing the app while it's updating
 2022-10-26 15:10:00 +02:00
Sergio Padrino 9ca90af91f Merge branch 'development' into update-before-closing 2022-10-26 14:47:28 +02:00
tidy-dev 064af1640d
Merge pull request #15500 from desktop/dynamic-size-pr-dialog 
PR View: Dynamic Dialogs
 2022-10-26 08:43:56 -04:00
tidy-dev 364fe06e16
Merge pull request #15496 from desktop/stacked-popups 
Stacked popups
 2022-10-26 08:39:50 -04:00
Sergio Padrino 87cad47073
Merge pull request #15521 from desktop/let-me-force-push 
Allow force-pushing from menu every time a branch has diverged
 2022-10-25 15:30:56 +02:00
Sergio Padrino b77e601e6c
Merge pull request #15507 from desktop/dependabot/github_actions/peter-evans/create-pull-request-4.2.0 
Bump peter-evans/create-pull-request from 4.1.4 to 4.2.0
 2022-10-25 15:24:13 +02:00
Sergio Padrino fe93c29579 Cancel quitting when the "Installing update" dialog is closed 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2022-10-25 15:20:19 +02:00
Sergio Padrino f80fab55b4
Update app/src/ui/installing-update/installing-update.tsx 
Co-authored-by: Markus Olsson <j.markus.olsson@gmail.com>
 2022-10-25 15:11:03 +02:00
Sergio Padrino 368db20df4
Merge pull request #15520 from desktop/let-me-fetch 
Allow fetching at any time from menu
 2022-10-25 15:10:17 +02:00
Sergio Padrino 83daa84acc
Update app/src/lib/stores/app-store.ts 
Co-authored-by: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
 2022-10-25 15:09:41 +02:00
Sergio Padrino c4e60121e4 Allow force-pushing from menu every time a branch has diverged 2022-10-25 11:24:31 +02:00
Sergio Padrino 5374b3b8c7 Allow fetching at any time from menu 2022-10-25 11:03:25 +02:00
Sergio Padrino cd9df2addd
Merge pull request #15487 from desktop/more-notification-fixes 
Check if notification matches current repository
 2022-10-25 10:57:57 +02:00
Sergio Padrino 22ca426f04 Feature flag it! 2022-10-25 10:45:35 +02:00
dependabot[bot] 35ec067c77
Bump peter-evans/create-pull-request from 4.1.4 to 4.2.0 
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.1.4 to 4.2.0.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v4.1.4...v4.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-24 15:48:14 +00:00
tidy-dev ab2f0bf2bc Only listen for dialog events when code mirror is descendent of a dialog 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2022-10-24 08:50:53 -04:00
tidy-dev d9a09f897a Test stacked popups 2022-10-24 07:51:16 -04:00
tidy-dev 936120fa14 Feature-flag it 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2022-10-24 06:32:52 -04:00
tidy-dev ae91f5acfd Less changes same extensibility 
This reverts commit ba0cbcde3e.

Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2022-10-24 06:15:11 -04:00
tidy-dev 45fabbf1c5 Merge branch 'stacked-popups' of https://github.com/desktop/desktop into stacked-popups 2022-10-24 06:11:31 -04:00
tidy-dev 4a4ef96015 Are there or are? 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2022-10-24 06:10:20 -04:00
tidy-dev 3cc3b88148
Should be checking against undefined 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2022-10-24 06:08:50 -04:00
tidy-dev 53cc945f92
No need for array copy. 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2022-10-24 06:03:31 -04:00
tidy-dev 7bd2924c0f Centralize popup manager to be accessed through the app-store 2022-10-21 10:35:00 -04:00
Markus Olsson 11d84577fa Refresh codemirror once the dialog has appeared fully 2022-10-21 14:37:00 +02:00
Markus Olsson d238d5e0bc Expand to fill available height 2022-10-21 14:03:06 +02:00
Markus Olsson 189767e394 Full size PR create dialog 2022-10-21 13:23:51 +02:00
tidy-dev 1bee22cc75 grammars.. 2022-10-20 15:25:37 -04:00
tidy-dev fe1f46fc2f Add popup stack limit 2022-10-20 15:03:47 -04:00
tidy-dev e8aa39a064 Correct null/undefined check 2022-10-20 15:03:47 -04:00
tidy-dev 6f9b2638bd Documenting 2022-10-20 15:03:46 -04:00
tidy-dev 59a3c86d55 Use logger, fix popuptypes, use uuid 2022-10-20 15:03:46 -04:00
tidy-dev 1109720cbf Use popup manager 2022-10-20 15:03:46 -04:00
tidy-dev 814cc5b5af Create a popup manager 2022-10-20 15:03:46 -04:00
tidy-dev ba0cbcde3e Extensify popups to add id's 2022-10-20 15:03:46 -04:00
tidy-dev b405454b0f
Merge pull request #15468 from desktop/consistently-disable-multi-commit-operations-in-progress 
Consistently disable multi commit operations
 2022-10-20 10:22:30 -04:00
Sergio Padrino b09fc79a87
Merge pull request #15481 from desktop/releases/3.1.3-beta1 
Release 3.1.3-beta1
 2022-10-20 13:59:32 +02:00
Sergio Padrino dbefefe2d7
Merge pull request #15475 from angusdev/issue-7651-repository-change-dot-color 
Fix repository change indicator not visible if selected and in focus
 2022-10-20 13:43:29 +02:00
Sergio Padrino f03b65be4a
Merge branch 'development' into releases/3.1.3-beta1 2022-10-20 13:40:32 +02:00
Sergio Padrino bb3b388fcd
Merge pull request #15349 from daniel-ciaglia/15348-VSCodium 
(fix) #15348 // VSCodium not recognised as external editor
 2022-10-20 13:37:28 +02:00
Sergio Padrino 908029ab94
Merge pull request #15479 from desktop/releases/3.1.2 
Release 3.1.2
 2022-10-20 13:37:03 +02:00
Daniel Ciaglia 8f0c589508 satisfy prettier 2022-10-20 12:14:13 +02:00
Sergio Padrino 9a89aa1eed
Merge branch 'development' into releases/3.1.2 2022-10-20 10:39:33 +02:00
tidy-dev 526af4be51
Merge pull request #15471 from angusdev/issue-13081-menu-disabled 
Fix menu items disabled if close the "Resolve conflicts before Rebase" dialog
 2022-10-19 08:51:15 -04:00
Sergio Padrino eeec273046 Check if notification matches current repository 2022-10-19 12:17:31 +02:00
Sergio Padrino f4d8e8cc77
Merge pull request #15462 from angusdev/issue-13636-incorrect-tooltip-position 
Fix incorrect tooltip position if mouse is not moved
 2022-10-19 10:34:33 +02:00
Markus Olsson 7cd667172c Revert file transport setting 2022-10-18 20:35:28 +02:00
Markus Olsson 11870edb89 Revert file transport setting 2022-10-18 20:35:17 +02:00
Markus Olsson fbedef2bf1 Changelog and package version bump 2022-10-18 19:55:23 +02:00