Sergio Padrino
|
e534559871
|
Merge branch 'development' into releases/2.6.6
|
2021-03-10 03:08:24 -08:00 |
|
tidy-dev
|
776d8e109c
|
Merge pull request #11753 from desktop/cherry-picking-merge-commits-error
Cherry picking merge commits error
|
2021-03-10 05:50:15 -05:00 |
|
tidy-dev
|
7d1ac33a65
|
tidying
|
2021-03-10 05:28:18 -05:00 |
|
tidy-dev
|
80234c5430
|
Merge branch 'development' into cherry-picking-merge-commits-error
|
2021-03-10 05:21:44 -05:00 |
|
tidy-dev
|
74281ffb1b
|
Copy work from cherry pick branch to handle new dugite error
|
2021-03-10 10:03:31 +01:00 |
|
Sergio Padrino
|
0b66bd1851
|
Bump version and changelog to v2.6.6
|
2021-03-10 09:52:28 +01:00 |
|
tidy-dev
|
6c2cf77451
|
Bump dugite
|
2021-03-10 09:47:44 +01:00 |
|
Sergio Padrino
|
e983abab74
|
Fix glitch in the UI when entering a custom git email
|
2021-03-10 09:47:20 +01:00 |
|
Sergio Padrino
|
154bf2002b
|
Use case-insensitive checks to verify possible misattributed commits
|
2021-03-10 09:47:16 +01:00 |
|
Sergio Padrino
|
405e2a2b83
|
Add new public property to determine if a TextBox is focused
|
2021-03-10 09:47:12 +01:00 |
|
tidy-dev
|
66bd304073
|
Merge pull request #11755 from desktop/bump-dugite
Bump dugite from 1.98.0 to 1.100.0
|
2021-03-10 03:10:07 -05:00 |
|
tidy-dev
|
8d1f559645
|
Copy work from cherry pick branch to handle new dugite error
|
2021-03-09 18:45:45 -05:00 |
|
tidy-dev
|
fae6781c95
|
Bump dugite
|
2021-03-09 16:40:58 -05:00 |
|
tidy-dev
|
c5f0d5dc31
|
Update to reflect change in copy
|
2021-03-09 16:35:44 -05:00 |
|
tidy-dev
|
d632b5bfde
|
Better copy
|
2021-03-09 14:57:04 -05:00 |
|
tidy-dev
|
09d895d7ad
|
Update merge commit test
|
2021-03-09 12:59:55 -05:00 |
|
tidy-dev
|
d1101156f7
|
Merge Commit Error Handling
|
2021-03-09 12:53:18 -05:00 |
|
tidy-dev
|
2471f8af13
|
Bump dugite for merge chosen error
|
2021-03-09 12:29:17 -05:00 |
|
tidy-dev
|
9cf2b09bb0
|
Merge pull request #11712 from desktop/cherry-picking-multiple-commits-via-context-menu
Cherry picking multiple commits
|
2021-03-09 07:48:18 -05:00 |
|
tidy-dev
|
f100d68e14
|
Merge branch 'development' into cherry-picking-multiple-commits-via-context-menu
|
2021-03-09 07:13:39 -05:00 |
|
tidy-dev
|
31a6f2815a
|
Merge pull request #11734 from desktop/cherry-picking-handle-working-directiory-dirty
Cherry picking handle working directory dirty
|
2021-03-09 07:13:17 -05:00 |
|
Sergio Padrino
|
e2bb0cb421
|
Merge pull request #11744 from desktop/dependabot/npm_and_yarn/elliptic-6.5.4
Bump elliptic from 6.5.3 to 6.5.4
|
2021-03-09 09:28:56 +01:00 |
|
dependabot[bot]
|
2aceac2a42
|
Bump elliptic from 6.5.3 to 6.5.4
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-03-09 01:01:14 +00:00 |
|
tidy-dev
|
7a14bccdd4
|
Merge branch 'development' into cherry-picking-handle-working-directiory-dirty
|
2021-03-08 13:49:35 -05:00 |
|
tidy-dev
|
93fdce04c1
|
Merge branch 'development' into cherry-picking-multiple-commits-via-context-menu
|
2021-03-08 13:48:39 -05:00 |
|
tidy-dev
|
537fc3120c
|
Merge pull request #11737 from desktop/cherry-picking-new-notification
Cherry picking new notification
|
2021-03-08 13:47:43 -05:00 |
|
tidy-dev
|
66c60cd68b
|
Only delay selection if dragging one of the selected commits
|
2021-03-08 13:33:43 -05:00 |
|
tidy-dev
|
6d0a4bdf76
|
Update comment to reflect need of code
|
2021-03-08 13:27:51 -05:00 |
|
tidy-dev
|
d64f0080cb
|
Feature flag the multiple commit selection
|
2021-03-08 13:18:01 -05:00 |
|
tidy-dev
|
33128da4fc
|
Pr commit
|
2021-03-08 13:02:57 -05:00 |
|
tidy-dev
|
605bd8aacd
|
Merge branch 'development' into cherry-picking-new-notification
|
2021-03-08 12:08:23 -05:00 |
|
tidy-dev
|
f90e001e59
|
Merge branch 'development' into cherry-picking-handle-working-directiory-dirty
|
2021-03-08 12:08:03 -05:00 |
|
tidy-dev
|
a817e5fed3
|
Merge branch 'development' into cherry-picking-multiple-commits-via-context-menu
|
2021-03-08 12:05:19 -05:00 |
|
tidy-dev
|
c753204882
|
Merge pull request #11717 from desktop/cherry-picking-allow-redundant-commits
Cherry Picking allow redundant and empty commits
|
2021-03-08 12:04:52 -05:00 |
|
tidy-dev
|
40c417a879
|
False by default
|
2021-03-08 12:03:33 -05:00 |
|
tidy-dev
|
0eb155a436
|
Add drag/drop image
|
2021-03-08 12:00:48 -05:00 |
|
tidy-dev
|
4403d147a2
|
Merge branch 'development' into cherry-picking-multiple-commits-via-context-menu
|
2021-03-08 11:42:00 -05:00 |
|
tidy-dev
|
1c83590a6c
|
tidying
|
2021-03-08 11:41:09 -05:00 |
|
tidy-dev
|
1c8e2237e7
|
Add in source branch to retry action
|
2021-03-08 11:39:45 -05:00 |
|
tidy-dev
|
48eb169ea3
|
Merge branch 'development' into cherry-picking-handle-working-directiory-dirty
|
2021-03-08 11:36:52 -05:00 |
|
tidy-dev
|
28f79b75f3
|
Update app/src/lib/stores/app-store.ts
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
|
2021-03-08 10:26:31 -05:00 |
|
tidy-dev
|
24fb0f05aa
|
Update app/src/ui/dispatcher/dispatcher.ts
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
|
2021-03-08 10:26:04 -05:00 |
|
tidy-dev
|
6074a28551
|
Update app/src/lib/stores/app-store.ts
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
|
2021-03-08 10:25:17 -05:00 |
|
tidy-dev
|
1866d77cee
|
Update app/src/lib/git/cherry-pick.ts
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
|
2021-03-08 10:24:20 -05:00 |
|
tidy-dev
|
06d406cda4
|
Merge pull request #11736 from desktop/cherry-picking-undo-to-source-branch
Cherry picking undo to source branch
|
2021-03-08 09:27:32 -05:00 |
|
tidy-dev
|
2c465fd3da
|
Merge branch 'development' into cherry-picking-new-notification
|
2021-03-08 08:13:36 -05:00 |
|
tidy-dev
|
682e4f514e
|
Merge branch 'development' into cherry-picking-multiple-commits-via-context-menu
|
2021-03-08 08:11:10 -05:00 |
|
tidy-dev
|
8c29299027
|
Merge branch 'development' into cherry-picking-allow-redundant-commits
|
2021-03-08 08:10:56 -05:00 |
|
tidy-dev
|
ad606a64c4
|
Merge branch 'development' into cherry-picking-handle-working-directiory-dirty
|
2021-03-08 08:10:40 -05:00 |
|
tidy-dev
|
81868edbb4
|
Merge branch 'development' into cherry-picking-undo-to-source-branch
|
2021-03-08 08:06:58 -05:00 |
|