Commit graph

29472 commits

Author SHA1 Message Date
tidy-dev
9f3dfff225
Merge branch 'development' into enable-diff-expansion 2021-04-26 13:36:16 -04:00
tidy-dev
14a3ae7eb5
Merge pull request #12066 from desktop/enable-repo-aliases
Enable repository aliases feature flag
2021-04-26 13:07:59 -04:00
Sergio Padrino
e40149f102 Enable repository aliases feature flag 2021-04-26 18:48:51 +02:00
Sergio Padrino
d653a0df5b Enable diff expansion feature flag 2021-04-26 18:46:44 +02:00
tidy-dev
ff8eaabcf6
Merge pull request #12046 from desktop/releases/2.7.3-beta4
Release 2.7.3-beta4
2021-04-23 14:21:02 -04:00
tidy-dev
c30e09ff57
Merge branch 'development' into releases/2.7.3-beta4 2021-04-23 14:01:17 -04:00
tidy-dev
a71bab23dc
Merge pull request #12048 from desktop/tidy-dev-patch-1
Update build timeout
2021-04-23 13:21:57 -04:00
tidy-dev
0eeecfd0e6
Update build timeout 2021-04-23 13:02:09 -04:00
Becca
3f398f16f3 Merge branch 'development' into releases/2.7.3-beta4 2021-04-23 09:17:00 -04:00
tidy-dev
99c8f2431c
Merge pull request #12045 from desktop/arm64-updates-url
Add the architecture as path component of the updates URL
2021-04-23 08:22:19 -04:00
tidy-dev
61911b8605
Merge branch 'development' into arm64-updates-url 2021-04-23 08:02:50 -04:00
Becca
d4b861b61a Release 2.7.3-beta4 2021-04-23 07:50:36 -04:00
tidy-dev
10d4343634
Merge pull request #12020 from desktop/fix-branch-tooltip
Fix branch tooltip
2021-04-23 07:39:27 -04:00
Sergio Padrino
6bad4540ca Add the architecture as path component of the updates URL 2021-04-23 11:10:24 +02:00
tidy-dev
965f738a24
Merge branch 'development' into fix-branch-tooltip 2021-04-22 13:32:48 -04:00
Becca
85d47d6b1a Documentation 2021-04-22 13:24:00 -04:00
Becca
bea26c1c36 macOS feel on copy to tool tip 2021-04-22 07:07:08 -04:00
tidy-dev
9bbe0ec8f0
Merge pull request #12038 from desktop/improve-release-instructions
Improve release instructions
2021-04-22 06:38:40 -04:00
Sergio Padrino
f267894ea3 Update releasing-updates.md 2021-04-22 10:11:32 +02:00
tidy-dev
a54a8c14af
Merge pull request #12035 from maifeeulasad/enhance/clone_full_message
#11375 : on clone show full message + on hover show full message
2021-04-21 18:13:27 -04:00
maifeeulasad
89e9e84ce9 #11375 : on clone show full message + on hover show full message 2021-04-21 23:26:21 +06:00
tidy-dev
344e06c601
Merge pull request #12032 from desktop/cherry-pick-multiple-non-sequential-commits
Cherry-pick multiple non sequential commits
2021-04-21 12:49:30 -04:00
Becca
5935e4f8c3 Use spread operator for copy 2021-04-21 12:20:57 -04:00
tidy-dev
ac0eb6210a
Merge branch 'development' into cherry-pick-multiple-non-sequential-commits 2021-04-21 07:37:58 -04:00
tidy-dev
9754ecbed1
Simpler logic
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
2021-04-21 07:35:11 -04:00
Sergio Padrino
20cb2187f0
Merge pull request #12031 from desktop/releases/2.7.3-beta3 2021-04-21 12:56:24 +02:00
Becca
c3585b6730 Switch to 'multi' selection as opposed to 'range' 2021-04-20 13:46:41 -04:00
Becca
4c358242c4 Allow multi selection to be dragged 2021-04-20 13:46:24 -04:00
Sergio Padrino
1c8a1f39a3
Apply suggestions from code review
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
2021-04-20 17:37:00 +02:00
Sergio Padrino
d122721657 Bump version and changelog to 2.7.3-beta3 2021-04-20 17:27:23 +02:00
Sergio Padrino
18238077aa
Merge pull request #12029 from desktop/feature-flag-cleanup 2021-04-20 16:56:05 +02:00
Sergio Padrino
7a2bf2bcff Remove enableCherryPicking 2021-04-20 14:26:08 +02:00
Sergio Padrino
25ba807b3f Remove enableDefaultBranchSetting 2021-04-20 14:22:09 +02:00
Sergio Padrino
b761cbdfce Remove enableSideBySideDiffs 2021-04-20 14:20:42 +02:00
Sergio Padrino
4cd51221bb Remove enableDiscardLines 2021-04-20 14:12:39 +02:00
Sergio Padrino
1703498732 Remove enableForkSettings 2021-04-20 14:11:50 +02:00
Sergio Padrino
ee19d30841 Remove enableGitTagsCreation 2021-04-20 14:08:35 +02:00
Sergio Padrino
4454a394e5 Remove enableGitTagsDisplay 2021-04-20 14:07:10 +02:00
Sergio Padrino
65de42b066 Remove enableForkyCreateBranchUI 2021-04-20 14:05:59 +02:00
Sergio Padrino
e6c14ede52 Remove enableUpdateRemoteUrl 2021-04-20 14:02:51 +02:00
Sergio Padrino
a3c7912a4a Remove enableCreateGitHubIssueFromMenu 2021-04-20 14:01:35 +02:00
Sergio Padrino
4629e4e35a
Merge pull request #12028 from desktop/repo-alias-tooltip
Add the repo alias to its tooltip
2021-04-20 13:58:20 +02:00
Sergio Padrino
e72e20fa9f Remove enableAutomaticGitProxyConfiguration 2021-04-20 13:36:39 +02:00
Sergio Padrino
b2b6736e8d Remove enableCreateForkFlow 2021-04-20 13:33:53 +02:00
Sergio Padrino
efbe4248e5
Merge pull request #12027 from desktop/repo-alias-styling
Use italics for aliases in the repository list
2021-04-20 13:28:22 +02:00
Sergio Padrino
db80844fe6 Add the repo alias to its tooltip 2021-04-20 12:53:10 +02:00
Sergio Padrino
c8f153e6e4 Use italics for aliases in the repository list 2021-04-20 12:47:24 +02:00
Sergio Padrino
3738880d4e
Merge pull request #12024 from desktop/dependabot/npm_and_yarn/ssri-6.0.2
Bump ssri from 6.0.1 to 6.0.2
2021-04-20 11:04:53 +02:00
dependabot[bot]
e7aee58e37
Bump ssri from 6.0.1 to 6.0.2
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-19 21:14:04 +00:00
Becca
e5ec4240e2 Using copy to on macos 2021-04-19 09:34:41 -04:00