development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-13 21:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
28527 commits 297 branches 696 tags 363 MiB
Commit graph

28527 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino 51b58c36a0
Apply suggestions from code review 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-02-08 18:02:26 +01:00
Sergio Padrino d7a8e0a024 Bump version to 2.6.3 and update changelog 2021-02-08 17:43:50 +01:00
Sergio Padrino 892044003b Bump version to 2.6.3-beta3 and update changelog 2021-02-04 18:05:36 +01:00
Sergio Padrino 1218f670e3 Bump dugite to v1.97.0 2021-02-04 18:02:15 +01:00
tidy-dev 5371285443 Woops.. left console log in there 2021-02-04 17:57:39 +01:00
tidy-dev a5d54dd84f About modal - provide a different logo for Mac vs Windows 2021-02-04 17:57:39 +01:00
Amanda Pinsker cc9452e7ed Update logo-64x64@2x.png 2021-02-04 17:57:39 +01:00
tidy-dev 04681206c9 Prettier... 2021-02-01 12:48:29 -05:00
tidy-dev 0139dfe9d5 Update to change log missing quotation 2021-02-01 12:32:12 -05:00
tidy-dev b4e209b0bf
Update changelog.json 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-02-01 12:24:43 -05:00
tidy-dev 55c9322744 Release 2.6.3-beta2 2021-02-01 11:38:21 -05:00
Billy Griffin 1316c9472c
Merge pull request #11484 from desktop/roadmap-updates 
Update roadmap
 2021-01-29 12:14:26 -07:00
Billy Griffin d3ba52f727
Update roadmap 2021-01-29 08:17:09 -07:00
Markus Olsson af1dc7a836
Merge pull request #11388 from desktop/new-icon 
Update app icon
 2021-01-29 14:57:49 +01:00
Markus Olsson 00f7c6553b
Merge pull request #11477 from desktop/update-release-process-doc 
Update instructions to stop a release mid-flight
 2021-01-29 12:46:24 +01:00
Sergio Padrino 95bf9cccea
Update instructions to stop a release mid-flight 2021-01-29 10:07:40 +01:00
tidy-dev 979c484628
Merge pull request #11473 from desktop/releases/2.6.3-beta1 
Release 2.6.3-beta1
 2021-01-28 14:52:06 -05:00
tidy-dev bd52adda2f
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-01-28 14:20:51 -05:00
tidy-dev ca6efb6761
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-01-28 14:20:41 -05:00
tidy-dev 9c2520374f
Update changelog.json 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-01-28 14:20:30 -05:00
tidy-dev 53b0ed5acf 2.6.3-beta1 Change log 2021-01-28 11:49:26 -05:00
tidy-dev 66f791e295
Merge pull request #11469 from desktop/update-dugite 
Update dugite
 2021-01-28 10:32:24 -05:00
tidy-dev 3c2bb7ee06 Better names 2021-01-28 08:05:45 -05:00
tidy-dev 76363ac273 Use Path.basename - cleaner solution 2021-01-28 07:47:10 -05:00
tidy-dev a25c9b3c5a Documenting Unit Test Change 2021-01-28 07:37:47 -05:00
tidy-dev 0cd7b98058 Use async method 2021-01-28 07:18:37 -05:00
tidy-dev 063c407e00 Update failing unit test due to 8.3 versus long name file system 2021-01-28 07:05:36 -05:00
Markus Olsson 53d6f575b6 Replace corrupt 16x16, 32x32 and remove 48x48 
Co-Authored-By: Amanda Pinsker <10404068+ampinsk@users.noreply.github.com>
 2021-01-27 18:04:03 +01:00
tidy-dev c631d92c63 Update dugite 2021-01-27 11:33:38 -05:00
Markus Olsson 6aee680fed
Merge pull request #11466 from desktop/rename-branch-remote-to-upstream-remote 
Rename branch.remote to branch.upstreamRemote
 2021-01-27 10:23:36 +01:00
tidy-dev 17b40f4893 UpstreamRemoteName 👍 2021-01-26 13:08:50 -05:00
tidy-dev 4293d3514b Rename branch.remote to branch.upstreamRemote 2021-01-26 11:32:01 -05:00
Markus Olsson bf8f7f9719
Merge pull request #11387 from desktop/branch-ff-improvements-1 
Branch fast-forwarding improvements: round 1
 2021-01-26 10:44:12 +01:00
Markus Olsson 5775edc3a9
Merge pull request #11452 from say25/beta-release-notes 
Beta Release Notes Url
 2021-01-26 10:40:32 +01:00
say25 55a0e558bf Lint? 2021-01-25 20:19:33 -06:00
say25 f8231593ad Beta Release Notes Url 2021-01-25 19:55:48 -06:00
Sergio Padrino 6b65413b83
Merge pull request #11450 from shiftkey/backport-linux-editor-fixes 
add additional editor detection for Linux
 2021-01-25 02:00:30 -08:00
Markus Olsson a24c8a545d
Merge pull request #11445 from desktop/add-beta-release-notes 
Add beta release notes to area of README where we suggest downloading it
 2021-01-25 10:24:20 +01:00
Brendan Forster 5e925fbc6f add additional editor detection for Linux 
Co-Authored-By: Andrea Pivetta <vanpivix@gmail.com>
Co-Authored-By: Tyler Sutterley <5384907+tsutterley@users.noreply.github.com>
Co-Authored-By: Jeff Gordon <55799997+jfgordon2@users.noreply.github.com>
 2021-01-24 12:14:26 -04:00
Billy Griffin f1b1b2f987
Add beta release notes 2021-01-22 15:18:08 -07:00
Amanda Pinsker e22b89c3e4 tweak shadows and colors 2021-01-22 12:38:33 -08:00
Sergio Padrino e896ba1c69 Fix typo String -> string 🤦‍♂️ 2021-01-22 15:36:58 +01:00
Sergio Padrino 6a99c3dec0 Clean up fixture repo for fast-forwarding test 2021-01-22 13:29:11 +01:00
Sergio Padrino e543240f85 Remove hooks from new fixture repo… d'oh! 2021-01-20 12:57:26 +01:00
Sergio Padrino 3f36eb3da1 Add a new unit test for getBranchesDifferingFromUpstream 2021-01-20 12:55:11 +01:00
Markus Olsson 42a5be758c
Merge pull request #11400 from desktop/external-editor-refactor 
Clean up editors code
 2021-01-20 11:28:50 +01:00
Sergio Padrino cbf0859506
Merge pull request #10996 from Hovemeyer5/optional-commit-spell-checking 2021-01-20 01:58:50 -08:00
Sergio Padrino c2b1b93489 Drop redundant comments for Windows editors 
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
 2021-01-20 10:31:27 +01:00
Amanda Pinsker f57d7d2e14 Merge branch 'development' into new-icon 2021-01-19 14:00:28 -08:00
tidy-dev f986913f06 Remove Spellcheck Option from Preferences 2021-01-19 13:02:14 -05:00