Commit graph

29498 commits

Author SHA1 Message Date
Sergio Padrino 04f18a0a8a Bump version and changelog to 2.8.1-beta1 2021-04-28 10:56:34 +02:00
Sergio Padrino ab92efb705
Merge pull request #12081 from desktop/releases/2.8.0 2021-04-28 10:48:13 +02:00
Sergio Padrino dafe97e6d2
Merge pull request #12083 from desktop/bump-arm64-deps 2021-04-27 18:18:11 +02:00
Billy Griffin 853674e1c3
Correct version number
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
2021-04-27 10:06:41 -06:00
tidy-dev 466e3943b0
Update changelog.json
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
2021-04-27 11:09:23 -04:00
tidy-dev 8f05123394
Update changelog.json
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
2021-04-27 11:09:16 -04:00
tidy-dev f39ec39bb6
Update changelog.json
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
2021-04-27 11:08:52 -04:00
tidy-dev 8abffaffed
Update changelog.json
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
2021-04-27 11:08:26 -04:00
Sergio Padrino af018980ba Don't forget to include yarn.lock 😆 2021-04-27 15:33:21 +02:00
Becca 2e3c4fb19e Actual change log.. 2021-04-27 08:20:13 -04:00
Sergio Padrino ee18606a68 Also bump desktop-trampoline 2021-04-27 14:15:58 +02:00
Becca abae59b380 Release 2.8.0 2021-04-27 08:11:02 -04:00
Sergio Padrino 041206c74c Bump node version in .nvmrc file to match what we use in our CI builds 2021-04-27 14:07:58 +02:00
Sergio Padrino adccd32035 Bump dependencies in order to support arm64 builds for macOS 2021-04-27 14:07:43 +02:00
Sergio Padrino df50dd0656
Merge pull request #12064 from desktop/report-architecture 2021-04-27 13:23:49 +02:00
Sergio Padrino 21725f9079 Don't use functions from script in the app, thanks 2021-04-27 11:23:42 +02:00
Sergio Padrino c08707b31a Add new getArchitecture function for metrics and error reports 2021-04-27 11:17:36 +02:00
Sergio Padrino a09b8d6509 Rename old getArchitecture function to getDistArchitecture 2021-04-27 11:17:36 +02:00
tidy-dev 26694c10f4
Merge pull request #12067 from desktop/enable-hide-white-space-in-diff-option
Enable Hide White Space In Diff Option
2021-04-27 05:10:56 -04:00
Sergio Padrino 44e55f5c6c
Merge branch 'development' into enable-hide-white-space-in-diff-option 2021-04-27 10:49:48 +02:00
Sergio Padrino cab66f7dff
Merge pull request #12069 from desktop/flip-save-dialog-on-clone-feature-flag
Flip save dialog on clone feature flag
2021-04-27 09:23:55 +02:00
Sergio Padrino 1f1da9f58b
Merge branch 'development' into flip-save-dialog-on-clone-feature-flag 2021-04-27 09:04:16 +02:00
tidy-dev ea64fe9ded
Merge branch 'development' into enable-hide-white-space-in-diff-option 2021-04-26 13:54:20 -04:00
tidy-dev f8a3ae2097
Merge pull request #12065 from desktop/enable-diff-expansion
Enable diff expansion feature flag
2021-04-26 13:53:27 -04:00
tidy-dev 7b05d4f86a
Flip save dialog on clone feature flag 2021-04-26 13:38:02 -04:00
tidy-dev 9f3dfff225
Merge branch 'development' into enable-diff-expansion 2021-04-26 13:36:16 -04:00
tidy-dev af08be2586
Enable Hide White Space In Diff Option 2021-04-26 13:25:55 -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