Commit graph

28888 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Sergio Padrino
76b9dd71de
Merge pull request #11640 from desktop/cherry-picking-in-progress-ui 2021-02-23 16:27:49 +01:00
tidy-dev
95be0dc595 Add continueCherryPick to dispatcher 2021-02-23 10:21:34 -05:00
tidy-dev
7d1e09df9a Refactor processing cherry pick result into method 2021-02-23 10:21:08 -05:00
tidy-dev
d8e425420e Refactor switching to cherry pick progress into method 2021-02-23 10:20:04 -05:00
tidy-dev
9112fabf6a Add app-store call for continuing cherry pick 2021-02-23 10:19:13 -05:00
tidy-dev
f65b5aff52 Add manual resolutions to continueCherryPick 2021-02-23 10:18:42 -05:00
tidy-dev
1ce162e679 ... refactor fail .. unit test catch awesome 2021-02-23 10:11:12 -05:00
tidy-dev
29c23c029c Load Status after abort to ensure working directory refreshed 2021-02-23 08:40:41 -05:00
tidy-dev
4b8f0afc45 Merge branch 'cherry-picking-in-progress-ui' into cherry-picking-conflicts-ui 2021-02-23 08:29:58 -05:00
tidy-dev
060335cd51 Some tidying and updating if user has resolved conflicts 2021-02-23 08:28:29 -05:00
tidy-dev
1f957b532f Tidying 2021-02-23 08:01:27 -05:00
Sergio Padrino
275e6dabc2
Merge pull request #11621 from desktop/focus-co-authors
Focus co-author input after clicking on "Add co-authors"
2021-02-23 09:24:03 +01:00
tidy-dev
c8d8e5532e Add Manual Resolution Support to conflict dialog 2021-02-22 15:29:41 -05:00
tidy-dev
2f36e31a9e Merge branch 'cherry-picking-in-progress-ui' into cherry-picking-conflicts-ui 2021-02-22 14:01:47 -05:00
tidy-dev
6971b91da9 Update conflict state to cherry pick conflict state 2021-02-22 13:57:17 -05:00
tidy-dev
e9c39c22af Refactor to a boolean isCherryPickHeadFound 2021-02-22 13:55:21 -05:00
tidy-dev
30eda681ed Add in cherry pick conflict state 2021-02-22 13:00:21 -05:00