development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-11-05 20:49:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
30292 commits 304 branches 713 tags 371 MiB
Commit graph

24091 commits

Author SHA1 Message Date
tidy-dev
66f1f5426d Update Intro Titles with "Drag and drop to" 2021-06-09 14:00:34 -04:00
Sergio Padrino
bb278691e2 Improve check to remove "New" badge from History tab 2021-06-09 18:30:28 +02:00
Sergio Padrino
5bb30eac03 Replace old cherry-picking intro with new drag&drop one 2021-06-09 18:19:38 +02:00
Sergio Padrino
ad6847c0ad Create new types for drag&drop intros 2021-06-09 18:18:32 +02:00
tidy-dev
65338d2301
Update app/src/ui/history/merge-call-to-action-with-conflicts.tsx 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-06-09 12:05:33 -04:00
tidy-dev
c845e650f0
Update app/src/ui/history/merge-call-to-action-with-conflicts.tsx 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-06-09 12:04:24 -04:00
tidy-dev
7dd72022d1 Need to tell dispatcher it's a squash 2021-06-09 09:13:44 -04:00
tidy-dev
9867c6577a Styling tweaks 2021-06-09 09:13:44 -04:00
tidy-dev
6066efc9a1 Implement multiple update options in compare branch view 2021-06-09 09:13:44 -04:00
tidy-dev
e8bb381aad Add click handler for non form use 2021-06-09 09:13:09 -04:00
tidy-dev
1ed16e7850 Move shared logic to library file 2021-06-09 09:13:09 -04:00
tidy-dev
e8c2148599 Make select work when disabled 2021-06-09 09:13:09 -04:00
Sergio Padrino
d2938d08fa
Merge pull request #12415 from desktop/reset-to-commit-stats 2021-06-09 12:57:40 +02:00
tidy-dev
02d1237a44
Merge pull request #12410 from desktop/remove-drag-prompt 
Remove cherry-picking drag prompt
 2021-06-09 06:56:20 -04:00
Sergio Padrino
c101bded82 Track metrics around resetting to a specific commit 2021-06-09 12:22:55 +02:00
tidy-dev
cbda390ee8 Move to a intializeMergeBranch method 2021-06-09 06:18:27 -04:00
tidy-dev
ba2dd8faa5 Fix update from default branch not being in merge state 2021-06-09 06:17:50 -04:00
tidy-dev
ddabe0dc6c Css and better naming 2021-06-09 06:13:14 -04:00
tidy-dev
725acd600e
Merge pull request #12408 from desktop/squash-and-squash-merge-metrics 
Squash and squash merge metrics
 2021-06-09 06:07:21 -04:00
tidy-dev
507a15ef23 log error not throw 2021-06-09 05:44:00 -04:00
Sergio Padrino
d51d99e4c8
Merge pull request #12406 from desktop/reorder-stats 2021-06-09 11:33:05 +02:00
dependabot[bot]
9b63ea6a12
Bump normalize-url from 4.5.0 to 4.5.1 in /app 
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 08:29:05 +00:00
Sergio Padrino
218f8719eb
Merge pull request #12409 from desktop/releases/2.8.4-beta2 2021-06-09 10:28:07 +02:00
Sergio Padrino
c9413df24d
Merge branch 'development' into reorder-stats 2021-06-09 10:24:38 +02:00
Sergio Padrino
14bdcffd26
Merge pull request #12404 from desktop/amend-stats 
Track metrics for amending commits
 2021-06-09 10:23:46 +02:00
tidy-dev
1aad1c4774 Remove cherry-picking drag prompt 2021-06-08 16:25:51 -04:00
tidy-dev
f55cca1707 Enable Reordering and reset to commit 2021-06-08 14:34:01 -04:00
tidy-dev
d764f5a520 Release 2.8.4 Beta2 2021-06-08 14:30:52 -04:00
tidy-dev
9ada3dbfdd Add whether squash merge is invoked 2021-06-08 12:48:23 -04:00
tidy-dev
c1c8ae050f
Merge pull request #12405 from desktop/set-source-branch-during-merge-operation 
Set source branch during merge operation for conflicts dialog
 2021-06-08 12:36:09 -04:00
tidy-dev
7ccd6ac88c Squashing and squash merging metrics 2021-06-08 12:32:17 -04:00
tidy-dev
b15c88bb01 Squashing and Squash Merge Metrics 2021-06-08 11:22:09 -04:00
tidy-dev
f8f0937bb4 Refactor drag started and canceled to not be cherry-pick specific 2021-06-08 11:21:48 -04:00
Sergio Padrino
4261915f00 Record stats of conflicts encountered when reordering 2021-06-08 16:33:25 +02:00
tidy-dev
2a622e514a Set source branch during merge operation for conflicts dialog 2021-06-08 10:31:58 -04:00
Sergio Padrino
9f33de4b1f Remove unnecessary reorder stats 2021-06-08 16:30:24 +02:00
Sergio Padrino
5f5ce205f9 Record stats of successful reorder operations 2021-06-08 16:30:10 +02:00
Sergio Padrino
b77120bfed Record stats of reorder operations undone and reordering multiple commits 2021-06-08 16:19:27 +02:00
Sergio Padrino
b82cba3a08 Add reorder-related metric fields 2021-06-08 16:18:41 +02:00
tidy-dev
c6363442df
Merge pull request #12396 from desktop/rebase-using-new-choose-branch-dialog 
Rebase using new choose branch dialog
 2021-06-08 10:04:33 -04:00
Sergio Padrino
bc423a29d4
Merge pull request #12393 from desktop/reset-to-commit 2021-06-08 15:44:18 +02:00
Sergio Padrino
da88e6632a Track metrics for amending commits 2021-06-08 13:42:09 +02:00
Sergio Padrino
28bd4b3995 Add separator to commit context menu 2021-06-08 13:06:12 +02:00
Sergio Padrino
c9e7dae9d5 Hide "Reset to Commit" behind feature flag 2021-06-08 13:06:05 +02:00
Sergio Padrino
e7d3330531 Improve documentation 2021-06-08 13:02:06 +02:00
Sergio Padrino
40762c68b5 Reuse existing function to look for remote commits 2021-06-08 13:00:39 +02:00
Sergio Padrino
b9bb047580 Add force-push warning to squash operation 2021-06-08 12:54:10 +02:00
Sergio Padrino
faf6f92825 Add force-push warning to reorder operation 2021-06-08 12:53:56 +02:00
tidy-dev
44f3a620d3
Update app/src/ui/multi-commit-operation/choose-branch/rebase-choose-branch-dialog.tsx 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-06-08 06:05:52 -04:00
Sergio Padrino
a6e989fac1 Show warning before resetting if there are changes in the working dir 2021-06-08 11:17:21 +02:00
Sergio Padrino
bd983fc2c5 Disable Reset to Commit instead of hiding it 2021-06-08 11:17:21 +02:00
Sergio Padrino
2b61cc01af Initial support for reset to commit 2021-06-08 11:17:10 +02:00
tidy-dev
ec29beab23 Remove old choose branch dialog 2021-06-07 13:50:54 -04:00
tidy-dev
2549aba386 Update rebase to use new RebaseChoosBranchDialog 2021-06-07 13:39:54 -04:00
tidy-dev
a918f5c927 Rebase choose branch dialog 2021-06-07 12:23:51 -04:00
Sergio Padrino
9e94978b26
Merge pull request #12389 from desktop/undo-state-null 2021-06-07 17:43:11 +02:00
tidy-dev
b618498843
Merge pull request #12390 from desktop/squash-merge-abort 
Abort squash merge
 2021-06-07 10:26:37 -04:00
tidy-dev
3c4c000b08
Merge pull request #12382 from desktop/squash-merge-via-branch-menu 
Squash merge via branch menu
 2021-06-07 10:22:37 -04:00
Sergio Padrino
fd5dddb727
Merge pull request #12385 from desktop/fix-drag-from-anywhere 
Fix for dragging commits clicking from anywhere in them
 2021-06-07 16:09:12 +02:00
Sergio Padrino
aa060e8d4b
Merge pull request #12386 from desktop/reorder-merge-commits-nope 2021-06-07 16:08:52 +02:00
tidy-dev
0fc29ecf6b Abort squash merge 2021-06-07 09:44:44 -04:00
Sergio Padrino
af50695475 Make multi commit operation undo state nullable 2021-06-07 15:42:22 +02:00
Sergio Padrino
10f5596c99
Merge pull request #12384 from desktop/reorder-commits-flow 2021-06-07 15:31:49 +02:00
tidy-dev
253c4b13eb
Merge pull request #12387 from desktop/Fix-merge-choose-branch-closing-regression 
Fix Merge choose branch dialog closing on app focus return
 2021-06-07 09:02:34 -04:00
tidy-dev
938a846a1a Add menu entry for squash and merge 2021-06-07 08:05:48 -04:00
tidy-dev
ec618e4e8f
Merge pull request #12381 from desktop/squash-merge-through-merge-modal-ui-wire-up 
Wire modal UI entry to squash and merge option
 2021-06-07 08:04:31 -04:00
tidy-dev
a80db45ebd Update unit tests 2021-06-07 07:41:49 -04:00
tidy-dev
693de18b01 Fix Merge choose branch dialog closing on app focus return 2021-06-07 07:32:23 -04:00
Sergio Padrino
89a61b5c4e Don't allow reordering commits when there are merge commits involved 2021-06-07 13:22:11 +02:00
tidy-dev
69391b6eca Add conflict check from getStatus to the status result and use that 2021-06-07 07:19:12 -04:00
Sergio Padrino
fcd9b0d46b Only show drag-related elements while dragging 2021-06-07 12:32:17 +02:00
Sergio Padrino
0a3e562e16 Enable (and fix) one test I forgot about 2021-06-07 11:33:18 +02:00
Sergio Padrino
e831ccff46 Fix typo in error messages 2021-06-07 11:26:48 +02:00
Sergio Padrino
ffa4566c6e Refactor method to process rebase result in multi-commit operations 2021-06-07 11:24:45 +02:00
Sergio Padrino
ba7ba81dd9 Refactor "completeBlahBlah" methods 2021-06-07 11:15:34 +02:00
Sergio Padrino
89f1db63ce Enable reordering commits! 2021-06-07 10:44:20 +02:00
tidy-dev
b0df26ee12 Wire UI entry to squash and merge option 2021-06-06 20:17:49 -04:00
tidy-dev
e3c71ec4c0 Modifying merge conflict detection/handling to support --squash 2021-06-06 20:02:01 -04:00
Andrei Maga
9d77234df8 Open in [Editor] will be enabled on bat/cmd/sh/exe extensions 2021-06-06 20:09:40 +03:00
tidy-dev
f88482a81a Adding --squash option to merge 2021-06-04 15:03:26 -04:00
tidy-dev
cadc38cc15 Remove remaining old merge logic 2021-06-04 14:57:20 -04:00
tidy-dev
9c43e9f1e4 Merge branch 'development' into refactor-merge-to-multi-commit-operation 2021-06-04 11:56:34 -04:00
tidy-dev
25d0853ac5 Change need do to development update 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2021-06-04 11:22:36 -04:00
tidy-dev
abd90eb285 Merge branch 'development' into shared-choose-branch-dialog 2021-06-04 11:10:31 -04:00
tidy-dev
1f1c453ada MergeChooseBranchDialog not abstract 
Co-Authored-By: Sergio Padrino <1083228+sergiou87@users.noreply.github.com>
 2021-06-04 11:09:43 -04:00
Sergio Padrino
a0005c83f1
Merge branch 'development' into amend-commits 2021-06-04 16:34:45 +02:00
Sergio Padrino
ec9969bd36
Merge pull request #12344 from desktop/undo-context-menu 2021-06-04 16:33:56 +02:00
Sergio Padrino
ca43b8ab97
Merge pull request #12341 from desktop/warn-before-undo 2021-06-04 16:33:34 +02:00
Sergio Padrino
5e220488b9
Merge pull request #12364 from desktop/reorder-drag-and-drop 
Drag & drop commits inside of the History tab
 2021-06-04 14:10:46 +02:00
Sergio Padrino
be3f38cead Refactor to reuse wall of text 😂 2021-06-04 14:06:37 +02:00
Sergio Padrino
d08cc26d55
Merge pull request #12358 from desktop/list-insertion-drag-and-drop 2021-06-04 14:01:23 +02:00
Sergio Padrino
783c4349cc
Merge pull request #12357 from desktop/git-reorder-commits 
Initial support for the git-based reorder implementation
 2021-06-04 13:34:38 +02:00
Sergio Padrino
9769225197 Enable commit drag&drop reordering in History tab 2021-06-04 13:00:41 +02:00
Sergio Padrino
d469cc74ef Add … to Undo Commit context menu action 2021-06-04 12:38:15 +02:00
Sergio Padrino
aa85e1a782 Fix lint 2021-06-04 11:33:33 +02:00
Sergio Padrino
47dfaa5e0e
Improve "stop amending" wording 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-06-04 09:48:13 +02:00
tidy-dev
e9c3240fbe Refactor conflict logic to multi commit operation 2021-06-03 20:45:25 -04:00
tidy-dev
63cde1bbf5 Remove squash option for now 2021-06-03 19:21:16 -04:00
tidy-dev
f8572dcfc0 Add merge multi commit operation choose branch invoking 2021-06-03 19:19:21 -04:00
tidy-dev
964533cb1d Merge multi commi operation kind 2021-06-03 19:03:44 -04:00
tidy-dev
3443ce75d6 Create Choose Branch Dialog for different types of merges 2021-06-03 19:02:53 -04:00
Sergio Padrino
aae65fd627 Switch to Changes tab after undoing a commit from History 2021-06-03 19:06:54 +02:00
Sergio Padrino
3157b36dd3 Improve readability of commit-message button title 2021-06-03 18:52:46 +02:00
Sergio Padrino
ca372b2ece Hide amend commit option behind feature flag 2021-06-03 18:52:46 +02:00
Sergio Padrino
a3752effd5 Instead, clear the isAmending flag automatically when needed 2021-06-03 18:52:46 +02:00
Sergio Padrino
0c1826df31 Do not stop amending manually on each conflicting operation 2021-06-03 18:52:46 +02:00
Sergio Padrino
c8e46f98ed Stop amending when certain operations start 
Pull, push, merge, update, squash, cherry-pick, rebase, switching branches, deleting branches…
 2021-06-03 18:52:46 +02:00
Sergio Padrino
b6566be1e4 Rename component for sanity 2021-06-03 18:52:46 +02:00
Sergio Padrino
c9c60204c2 Change commit message area while amending 2021-06-03 18:52:46 +02:00
Sergio Padrino
0db19dfe58 Add new amending attribute to the app state 2021-06-03 18:52:46 +02:00
Sergio Padrino
33e4a12e79 Allow amending previous commits 2021-06-03 18:52:46 +02:00
Sergio Padrino
980133e4d5 Don't clear commit selection after undoing 
`_refreshRepository` already takes care of that
 2021-06-03 18:51:39 +02:00
Sergio Padrino
c058b420f9 Add context menu action to undo the latest commit 2021-06-03 18:51:39 +02:00
Sergio Padrino
19c5752505 Fix typos and improve verbiage a bit more 2021-06-03 18:49:08 +02:00
Sergio Padrino
7fdad0960d Create overlay for inserting items in lists via drag&drop 2021-06-03 18:37:18 +02:00
Sergio Padrino
a32484aa03 Improve warning verbiage 
Co-Authored-By: tidy-dev <75402236+tidy-dev@users.noreply.github.com>
Co-Authored-By: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-06-03 18:19:52 +02:00
Sergio Padrino
f19462c760 Show warning before undoing a merge commit too 2021-06-03 18:17:28 +02:00
Sergio Padrino
db0ab06134 Improve verbiage 
Co-Authored-By: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-06-03 18:17:28 +02:00
Sergio Padrino
5a4478261c Always warn on undo if there are changes in the working dir 2021-06-03 18:17:28 +02:00
Sergio Padrino
4256014c44 Show warning before undoing commit if it conflicts changes in working directory 2021-06-03 18:17:28 +02:00
Sergio Padrino
3082274212 Initial support for the git-based reorder implementation 2021-06-03 17:51:10 +02:00
tidy-dev
c31560e519 Fix coauthor styling in commit message dialog 2021-06-03 11:07:52 -04:00
tidy-dev
bae5738e56 Documentation 2021-06-03 09:18:58 -04:00
tidy-dev
d9ba8f4418 Fix coauthor regression 2021-06-03 09:15:38 -04:00
tidy-dev
74dfe8972b
Merge pull request #12345 from desktop/dropdown-select-button 
Dropdown select button
 2021-06-03 08:09:06 -04:00
tidy-dev
748a6780ad Close dropdown on selection change 2021-06-02 15:36:09 -04:00
tidy-dev
19542febf7 CSS tweaking 2021-06-02 15:33:22 -04:00
tidy-dev
945af77c00 Tidying 2021-06-02 14:19:33 -04:00
tidy-dev
51ecf4a9da Dynamically pop over top if not enough space below 2021-06-02 14:18:12 -04:00
tidy-dev
4e8d6b0e6a Release 2.8.4-beta1 2021-06-02 10:34:01 -04:00
tidy-dev
7d3f9e2cc2 Make options container scroll if clipped 2021-06-02 09:04:50 -04:00
tidy-dev
bacaa1df0d Add dropdown-select-button 2021-06-02 08:03:01 -04:00
tidy-dev
3607f4abe6
Merge pull request #12336 from desktop/enable-squashing-for-beta 
Enable squashing for beta
 2021-06-02 07:59:01 -04:00
Sergio Padrino
0286ef52c0
Merge pull request #12333 from desktop/releases/2.8.3 2021-06-02 13:57:44 +02:00
tidy-dev
9c45d1ddda
Merge pull request #12331 from desktop/merge-commit-error-for-squashing 
Throw error if merge commit exists in squash
 2021-06-02 07:42:20 -04:00
tidy-dev
e51161b297
Merge pull request #12335 from desktop/stash-option-when-squashing 
Add stash for local changes on squash
 2021-06-02 07:41:07 -04:00
Sergio Padrino
61b1a3b13e
Merge branch 'development' into releases/2.8.3 2021-06-02 11:15:09 +02:00
tidy-dev
4eb62a8067 enable squashing for beta 2021-06-01 14:48:48 -04:00
tidy-dev
4ec2842cf2 Add stash for local changes on squash 2021-06-01 14:31:42 -04:00
tidy-dev
caa0b1d1ee Only apply highlighting styles when not comparing 2021-06-01 13:58:56 -04:00
tidy-dev
8b9b7f92de Functionally disable squashing when in compare mode 2021-06-01 13:58:42 -04:00
tidy-dev
5037f68ed3 Best wording 2021-06-01 13:58:08 -04:00
Sergio Padrino
32513f23b1 Bump version to 2.8.3 and update changelog 2021-06-01 19:11:59 +02:00
Sergio Padrino
a477ad0645 Merge pull request #12332 from desktop/enable-cross-auto-update 
Enable cross auto-update to arm64 on macOS production builds
 2021-06-01 19:08:00 +02:00
tidy-dev
0095df9100 Merge pull request #12308 from desktop/reload-that-cache 
Reload HTTP fetch cache when cloning
 2021-06-01 19:05:53 +02:00
Sergio Padrino
c84dec1def Merge pull request #12251 from desktop/fix-expand-whole-file 2021-06-01 19:05:53 +02:00
tidy-dev
1c01912899 Merge pull request #12178 from tsvetilian-ty/copy-to-clipboard 
Add copy to clipboard for branch/repository name
 2021-06-01 19:05:53 +02:00
Sergio Padrino
1f1e98745b Merge pull request #12165 from tsvetilian-ty/text-box-enter-listener 2021-06-01 19:05:53 +02:00
Sergio Padrino
f9c954b479 Merge pull request #12159 from desktop/fix-git-email-overflow 
FIx overflow behavior for tab-containers and select components
 2021-06-01 19:05:53 +02:00
tidy-dev
4da1713543 s 2021-06-01 13:04:04 -04:00
tidy-dev
a88bb3a100 Better wording.. 2021-06-01 13:02:55 -04:00
Sergio Padrino
3f3d81983a Enable cross auto-update to arm64 on macOS production builds 2021-06-01 18:43:33 +02:00
tidy-dev
d23738fd98 Throw error if merge in interactive rebase 2021-06-01 12:31:45 -04:00
Sergio Padrino
6dbd765fc6
Merge pull request #12326 from desktop/fix-drag-and-drop-warning 2021-06-01 13:33:14 +02:00
Sergio Padrino
bca5aa48c3 Remove extra space 2021-05-31 18:10:20 +02:00
Sergio Padrino
4b8179fa3a Clear some drag-and-drop subscriptions when components are unmounted 2021-05-31 18:02:02 +02:00
tidy-dev
168d6b322d Reload Http fetch cache when cloning 2021-05-27 13:42:35 -04:00
Kasper Mikiewicz
9b45da3351 Add Fluent Terminal to Windows Shells 2021-05-27 10:45:04 +02:00
tidy-dev
433ea98b86 Squash with progress/conflict dialogs and force push 2021-05-26 11:14:56 -04:00
tidy-dev
191671e082
Merge pull request #12296 from desktop/multi-commit-operation-popup 
Multi commit operation popup
 2021-05-26 11:10:26 -04:00
Sergio Padrino
192b3369c7
Merge pull request #12292 from desktop/releases/2.8.3-beta1 2021-05-26 17:09:24 +02:00
tidy-dev
b68a04caf5 Rename multi commit operation components and classes 2021-05-26 10:51:05 -04:00
tidy-dev
c89da3d706 Merge branch 'development' into multi-commit-operation-popup 2021-05-26 07:57:07 -04:00
tidy-dev
e470fc4598
Merge pull request #12295 from desktop/operation-squash 
Squash Operation
 2021-05-26 07:56:27 -04:00
tidy-dev
0443489e50 Remove duplicate interface 2021-05-26 07:47:51 -04:00
tidy-dev
fa5fb3eb1b remove space 2021-05-26 07:36:39 -04:00
tidy-dev
2110b21672 Skip rebase flow during multi commit operation 2021-05-26 07:31:23 -04:00
tidy-dev
3002a9125b Multi Commit Operation Popup 2021-05-26 07:31:23 -04:00
Sergio Padrino
aceb782347
Merge pull request #12294 from desktop/remove-taskbar-progress-indicator 
Remove taskbar progress indicator
 2021-05-26 13:22:00 +02:00
tidy-dev
be8a540a47 Not needed to be public 2021-05-26 07:14:33 -04:00
tidy-dev
7ae94339f5 Squash 2021-05-26 07:12:32 -04:00
tidy-dev
3600180430
Merge pull request #12288 from desktop/conflict-management-methods-and-rebase-refactor-for-squash 
Conflict management methods and rebase refactor for squash
 2021-05-26 07:03:36 -04:00
tidy-dev
591b69207b Fix returns 2021-05-26 06:42:42 -04:00
Sergio Padrino
985b2928a3 Remove taskbar progress indicator 2021-05-26 11:59:17 +02:00
tidy-dev
d5d1432d3a
Merge pull request #12286 from desktop/refactor-rebase-progress-for-squash-progress 
Refactor Rebase progress to generic to allow squash to use rebase progress parser
 2021-05-26 05:22:27 -04:00
Sergio Padrino
4d26260041 Bump version to 2.8.3-beta1 and update changelog 2021-05-26 11:01:54 +02:00
Sergio Padrino
da56a6f830
Merge pull request #12276 from desktop/releases/2.8.2 
Release 2.8.2
 2021-05-26 10:39:04 +02:00
tidy-dev
e96c04635e Add conflict management and continue rebase logic for multi commit/squash 2021-05-25 18:34:16 -04:00
tidy-dev
efb157c585 Remove method to be filled out later 2021-05-25 17:48:57 -04:00
tidy-dev
39de2300c9 Refactor Rebase progress and progress to squash 2021-05-25 17:42:38 -04:00
tidy-dev
f8e4847eb0 Remove unused state variable 2021-05-25 15:38:14 -04:00
tidy-dev
e5e2c3cb5b On conflicts found banner dispatcher 2021-05-25 15:21:18 -04:00
tidy-dev
3d3ee76c21 Multi Commit Operation base class 2021-05-25 15:14:13 -04:00
tidy-dev
18998f800f Can't update a null state, make initializer and clear methods 2021-05-25 12:18:22 -04:00
tidy-dev
7be6d97bb9 Update clearing the multiCommitOperationState 2021-05-25 12:08:13 -04:00
tidy-dev
4e04e1dd2e Merge branch 'development' into multi-commit-operation-state-methods 2021-05-25 11:58:41 -04:00
tidy-dev
dd7f5179ae Remove export on non exported interfaces 2021-05-25 11:20:50 -04:00
tidy-dev
200587d7fc Refactoring State logic to use null at the top 2021-05-25 10:47:56 -04:00
tidy-dev
f8f189c518 Add import 2021-05-25 10:13:22 -04:00
tidy-dev
f754835764 Multi Commit Operation State Management Dispatcher Methods 2021-05-25 10:12:01 -04:00
tidy-dev
97def5d422 Cherry-picked uneeded import 2021-05-25 10:03:32 -04:00
tidy-dev
75d04212e1 State management methods 2021-05-25 09:49:55 -04:00
tidy-dev
de7e22e5ac Adding MultiCommitOperation models 2021-05-25 09:03:42 -04:00
Sergio Padrino
be4534ca70
Merge pull request #12272 from desktop/releases/2.8.2-beta3 2021-05-24 19:19:33 +02:00
Sergio Padrino
82023b699d
Merge pull request #12252 from desktop/releases/2.8.2-beta2 2021-05-24 19:19:18 +02:00
Sergio Padrino
4423bb9d80 Bump version to 2.8.2 and update changelog 2021-05-24 19:09:54 +02:00
Sergio Padrino
5f4aed70b1
Merge pull request #12274 from desktop/refactor-on-drag-end 2021-05-24 15:12:16 +02:00
tidy-dev
41db73893a Better naming 2021-05-24 08:44:00 -04:00
tidy-dev
eb309fe7f7 Do generic app stuff on drag end 2021-05-24 06:54:20 -04:00
tidy-dev
9e0cdb0a4b Emit drag end 2021-05-24 06:54:02 -04:00
tidy-dev
f70b8fecdb Remove bubbled up on drag end as no need to verify cherry-pick state now 2021-05-24 06:53:50 -04:00
tidy-dev
a5a41dce5b Typify drop target selectors 2021-05-24 06:52:58 -04:00
Sergio Padrino
0d7664c8f4
Merge pull request #12273 from desktop/cherry-pick-end-state-regression 
It isn't a drop if there is no drag in progress
 2021-05-24 12:44:13 +02:00
tidy-dev
35f2e269cf It isn't a drop if there is no drag in progress 2021-05-24 06:17:20 -04:00
Sergio Padrino
bf11d6a4d6 Bump version to 2.8.2-beta3 and update changelog 2021-05-24 12:01:43 +02:00
Sergio Padrino
96151115a8
Merge pull request #12264 from desktop/resusable-force-push-warning 2021-05-24 11:59:39 +02:00
tidy-dev
d03919171b Lower case for windows 2021-05-24 05:40:28 -04:00
Sergio Padrino
0c92f818f7 Merge pull request #12258 from desktop/undo-metrics 
Track stats when users undo a commit
 2021-05-24 11:30:50 +02:00
Sergio Padrino
106a80c93f
Merge pull request #12249 from desktop/merge-dialog 2021-05-24 11:06:22 +02:00
Sergio Padrino
4b11498d1c
Merge pull request #12260 from desktop/reusable-progress-dialog 2021-05-24 10:53:51 +02:00
Sergio Padrino
83f2d110ad
Merge pull request #12257 from desktop/reusable-confirm-abort-dialog 2021-05-24 10:36:32 +02:00
Sergio Padrino
67872c618d
Merge pull request #12258 from desktop/undo-metrics 
Track stats when users undo a commit
 2021-05-24 09:55:42 +02:00
kaatt
e09cc0cade
use app.hide() 2021-05-23 03:31:37 +05:30
tidy-dev
f998e23007 Tidying 2021-05-21 14:08:26 -04:00
tidy-dev
cfe8dc3202 Create resusable warn force push-dialog 2021-05-21 13:55:42 -04:00
tidy-dev
0ecdb453a2 Forgot to bring dialog update from other branch 😄 2021-05-21 13:35:44 -04:00
Sergio Padrino
487d37bcf2 Differentiate metrics of undone commits with or without changes 2021-05-21 19:12:30 +02:00
tidy-dev
3936dc7295 Resuable Progress Dialog 2021-05-21 11:40:55 -04:00
tidy-dev
991601806b Multi Commit Operation Progress State 2021-05-21 11:40:37 -04:00
tidy-dev
42800e28dd Correct extra space 2021-05-21 11:29:03 -04:00
tidy-dev
615616c5ae Note about capitalized 2021-05-21 11:22:18 -04:00
tidy-dev
9418230ccb Consistent name/reference 2021-05-21 08:14:37 -04:00
tidy-dev
5378ee8132 Add reusable conflicts banner 2021-05-21 08:11:42 -04:00
Sergio Padrino
05a64d4e1c Track stats when user undoes a commit 2021-05-21 14:01:55 +02:00
tidy-dev
9fe666f756 Tidying 2021-05-21 07:51:23 -04:00
tidy-dev
bf93599c0b Add a reusable confirm abort dialog 2021-05-21 07:47:34 -04:00
tidy-dev
88a50c132d Merge pull request #12148 from desktop/thank-you-retrieve-more-release-notes 
Get all previous releases to retroactively thank contributors
 2021-05-20 18:53:09 +02:00
Sergio Padrino
37d90d82f1 Merge pull request #12207 from desktop/detect-windows-x64-emulation 2021-05-20 18:50:35 +02:00
Billy Griffin
b293649314 Merge pull request #12153 from desktop/thank-you-kindly 
Minor changes to thank you card
 2021-05-20 18:49:25 +02:00
Sergio Padrino
6c7381c8a7 Bump version and changelog to 2.8.2-beta2 2021-05-20 18:25:45 +02:00
tidy-dev
51085148ef Merge branch 'development' into merge-dialog 2021-05-20 12:02:08 -04:00
tidy-dev
b51c9a9ff9
Merge pull request #12248 from desktop/rebase-dialog 
Use new Conflicts Dialog for Rebase
 2021-05-20 12:01:46 -04:00
tidy-dev
2c402da165
Merge pull request #12244 from desktop/squash-drag-ux-improvement 
Squash drag ux improvement
 2021-05-20 12:01:17 -04:00
Sergio Padrino
5f46ab1bc2 Fix off-by-one issue expanding whole files 2021-05-20 17:04:46 +02:00
tidy-dev
a339910821 Note why the +1 2021-05-20 10:56:19 -04:00
tidy-dev
0d06f9ae01 Remove other reference to merge conflicts dialog 2021-05-20 07:06:48 -04:00
tidy-dev
f5744fddba Delete old merge conflicts dialog 2021-05-20 06:41:04 -04:00
tidy-dev
d21e3821a9 Lint... 2021-05-19 14:42:19 -04:00
tidy-dev
5afaed4368 Scope copy to link to windows 2021-05-19 14:31:25 -04:00
tidy-dev
ddb4dc296e Merge branch 'squash-drag-ux-improvement' of https://github.com/desktop/desktop into squash-drag-ux-improvement 2021-05-19 14:26:54 -04:00
tidy-dev
3e77364e0f Adjust cop to styles 2021-05-19 14:26:39 -04:00
tidy-dev
a2ca0454e9 Adjust dialog styles 2021-05-19 14:12:37 -04:00
tidy-dev
5c4a7dbdc5 Same timer as cherry-picking 2021-05-19 14:12:26 -04:00
tidy-dev
b9c1f5710f Emit Commit Drop Target 2021-05-19 13:39:01 -04:00
tidy-dev
71513456ad Remove tooltip on commits during drag 2021-05-19 13:37:19 -04:00
tidy-dev
7377d68a0d Refactor drop targets to be a typed object 2021-05-19 13:37:08 -04:00
tidy-dev
89f4d50822 Implement new conflict dialog 2021-05-19 11:33:21 -04:00
Daniel Hix
0d211673f2 Make changes based on suggestions 2021-05-19 10:09:21 -05:00
tidy-dev
87f2624a36 Refactor conflicts css to more generic naming 2021-05-19 10:30:03 -04:00
tidy-dev
160678623b Delete _rebase-conflicts css file 2021-05-19 10:29:38 -04:00