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
29005 commits 304 branches 713 tags 371 MiB
Commit graph

29005 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino
e3f947d115 Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-03-04 16:55:47 +01:00
Sergio Padrino
cfb86d827c Bump version to 2.6.6-beta1 and update changelog 2021-03-04 16:55:47 +01:00
Sergio Padrino
fa0bb524a9
Merge pull request #11695 from desktop/releases/2.6.5 2021-03-04 16:53:47 +01:00
Billy Griffin
ea48d9d405
Add note at the top of ask-pass issue 2021-03-04 08:41:45 -07:00
tidy-dev
bb74d56399 Display message for multiple commits selected 2021-03-04 10:36:02 -05:00
Billy Griffin
1995d7d8d4 Update changelog.json 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-03-04 15:50:12 +01:00
Sergio Padrino
518410c92b Bump version to 2.6.5 and update changelog 2021-03-04 15:50:12 +01:00
Sergio Padrino
68ff92e41b Restrict the new trampoline to beta builds under a feature flag 2021-03-04 15:50:12 +01:00
tidy-dev
58418ba424 Finish change to multiple shas 2021-03-04 06:56:48 -05:00
tidy-dev
f466ac0c8c Woopps.. remove stuff done to dispatcher while debugging something. 2021-03-04 06:52:55 -05:00
tidy-dev
b16656d84e
Merge pull request #11644 from desktop/cherry-picking-launch-conflicts-dialog-on-open 
Cherry picking launch conflicts dialog on open
 2021-03-04 06:22:41 -05:00
Sergio Padrino
b9af0eaa02
Merge pull request #11694 from desktop/handle-trampoline-tcp-errors 
Handle socket errors coming from the TCP trampoline client
 2021-03-04 12:05:20 +01:00
tidy-dev
bb1d2fb75e Updating some documentation I see I missed 2021-03-04 06:00:57 -05:00
tidy-dev
e4de08e002 More explicit use of undefined 2021-03-04 05:55:27 -05:00
tidy-dev
3745741a5a Working towards storing state of multiple commits selected 2021-03-04 05:44:39 -05:00
Sergio Padrino
b33ee102ae Handle socket errors coming from the TCP trampoline 2021-03-04 10:28:28 +01:00
tidy-dev
1eea3e1d91 Tidying from pr comments 2021-03-03 14:23:19 -05:00
Sergio Padrino
a8c7240880
Merge pull request #11674 from desktop/releases/2.6.4 2021-03-03 17:19:04 +01:00
Sergio Padrino
1864024f67 Enable the new TCP-based trampoline for production 2021-03-03 15:29:33 +01:00
tidy-dev
f9f3f7a36a Merge branch 'development' into cherry-picking-drag-and-drop 2021-03-03 06:34:26 -05:00
Billy Griffin
8a3defb533
Update changelog.json 2021-03-02 13:33:53 -07:00
Billy Griffin
5bc407beea
Update changelog.json 2021-03-02 13:33:48 -07:00
tidy-dev
3bdfefac9e Version and Initial Change log 2021-03-02 13:56:14 -05:00
tidy-dev
ac71fbabdd Really Rough Start.. but I just cherry picked 3 commits! 2021-03-02 13:05:18 -05:00
tidy-dev
4dd7faea12 Merge branch 'development' into cherry-picking-launch-conflicts-dialog-on-open 2021-03-02 12:24:17 -05:00
tidy-dev
b17d2038c5
Merge pull request #11643 from desktop/cherry-picking-conflicts-banner 
Cherry picking conflicts banner
 2021-03-02 12:23:36 -05:00
tidy-dev
c6c1b17568 Refactor drop zone for branch selection 2021-03-02 10:57:23 -05:00
tidy-dev
495f626298 Tidying 2021-03-02 08:32:42 -05:00
tidy-dev
7b6a55679b Merge branch 'development' into cherry-picking-drag-and-drop 2021-03-02 07:50:48 -05:00
tidy-dev
16620cf530 Close branch dropdown on cherry pick or invalid drop 2021-03-02 07:44:18 -05:00
tidy-dev
1fde6d6ceb Merge branch 'development' into cherry-picking-conflicts-banner 2021-03-02 07:25:15 -05:00
tidy-dev
08267c678a
Merge pull request #11642 from desktop/cherry-picking-continue-after-conflicts 
Cherry picking Continue After Conflicts
 2021-03-02 07:24:10 -05:00
tidy-dev
af86130436 Tidying per PR comments 2021-03-02 07:03:07 -05:00
tidy-dev
adac27d087 Merge branch 'development' into cherry-picking-continue-after-conflicts 2021-03-02 06:09:20 -05:00
tidy-dev
0116f68391 Highlight row dragged over 2021-03-01 15:18:27 -05:00
tidy-dev
67707931bf Add CommitsChosenStep in cherry picking for during commits drag 2021-03-01 12:52:20 -05:00
tidy-dev
68c054d8f5 tidying 2021-03-01 11:51:16 -05:00
tidy-dev
386759cd63 Merge branch 'development' into cherry-picking-drag-and-drop 2021-03-01 11:49:20 -05:00
tidy-dev
ed1b972d22
Merge pull request #11641 from desktop/cherry-picking-conflicts-ui 
Cherry Picking Conflicts UI Part One - Dialog
 2021-03-01 09:57:54 -05:00
tidy-dev
9eba86dcec First steps can drag and drop a commit on to a branch 
Needs to store dragged commit in app state
Needs to highlight branch on drag over
 2021-03-01 08:04:20 -05:00
tidy-dev
6bacbe4d11 Typo 2021-02-24 15:16:02 -05:00
tidy-dev
23eb369ec6 Better wording 2021-02-23 15:56:54 -05:00
tidy-dev
85b4622b61 Trigger cherry pick conflict dialog on app load status 2021-02-23 15:53:25 -05:00
tidy-dev
6bb03c5bad Refactor source branch to be null for scenario were cherry pick initiated outside of Desktop 2021-02-23 15:52:59 -05:00
tidy-dev
a83268f218 Remove dispatcher 2021-02-23 15:51:00 -05:00
tidy-dev
13d6a5432d Show conflicts banner from cherry pick flow 2021-02-23 15:02:08 -05:00
tidy-dev
d2ee87bfb6 Set cherry picking progress state from snapshot 2021-02-23 15:01:44 -05:00
tidy-dev
da2c827dda Add cherry pick conflicts banner 2021-02-23 15:00:50 -05:00
tidy-dev
34703a422d Dispatcher continueCherryPick 2021-02-23 12:45:15 -05:00
tidy-dev
3ee36e67ab Add conflict flow with empty commit and single commit in snapshot 2021-02-23 12:45:03 -05:00