Commit graph

28501 commits

Author SHA1 Message Date
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
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
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
tidy-dev
f986913f06 Remove Spellcheck Option from Preferences 2021-01-19 13:02:14 -05:00
Sergio Padrino
7fd2571d6a Merge remote-tracking branch 'origin/development' into external-editor-refactor 2021-01-19 16:14:20 +01:00
Markus Olsson
2acc0dd1ec
Merge pull request #11418 from hubgit/patch-2
Describe how to find the bundle identifier for a macOS application
2021-01-19 16:08:22 +01:00
tidy-dev
af081c4d4f Add documentation and more cleanup 2021-01-19 09:20:54 -05:00
tidy-dev
adb5125119 Absolute Check 2021-01-19 09:19:43 -05:00
tidy-dev
9e65e19e19 Add platform wording and clean up to function 2021-01-19 09:19:29 -05:00
Sergio Padrino
4ec6e45139 Cleanup from review feedback
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
2021-01-19 14:05:04 +01:00
Sergio Padrino
666d692ff4 More cleanup :_D 2021-01-19 13:04:41 +01:00
Sergio Padrino
e71ce8d9b1 Iterate through the paths in Linux editors 🤦‍♂️ 2021-01-19 12:13:51 +01:00
Sergio Padrino
312eac26de Refactor editors code for Linux 2021-01-19 11:51:44 +01:00
Alf Eaton
089ccaa4cc
Describe how to find the bundle identifier for a macOS application
Add an example to the editor integration docs of how to read CFBundleIdentifier from a macOS application bundle.
2021-01-19 09:55:29 +00:00
Sergio Padrino
c2a2798ec3
Merge pull request #11369 from desktop/releases/2.6.2 2021-01-19 01:17:23 -08:00
Sergio Padrino
224863ec24 Update editor integration document to reflect Windows & macOS changes 2021-01-18 18:17:39 +01:00
Sergio Padrino
b266e5d6d8 Use some utility functions to clean up registry keys
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
2021-01-18 17:42:49 +01:00
Sergio Padrino
e3512c6dec MOAR cleanup :_D
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
2021-01-18 17:14:41 +01:00
Sergio Padrino
b9cabf5a37 More cleanup and a fix for how registry keys are iterated
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
2021-01-18 17:12:09 +01:00
Sergio Padrino
6b2ab502c7 Delete more unnecessary code 😍
Co-Authored-By: Markus Olsson <634063+niik@users.noreply.github.com>
2021-01-18 16:52:05 +01:00
Sergio Padrino
eed2087cb0 Fix typos and rename things 💖 2021-01-18 16:38:48 +01:00
Markus Olsson
c184eb25c4
Merge branch 'development' into releases/2.6.2 2021-01-18 14:51:28 +01:00
Sergio Padrino
82dfe2cee0 Improve comments 🤓 2021-01-18 09:52:02 +01:00
Sergio Padrino
7ea92a68ae Add some comments to the new editor entries 2021-01-15 17:04:06 +01:00
Sergio Padrino
db12ff94d1 Get rid of ExternalEditor since an enum it's not needed 2021-01-15 16:50:29 +01:00
Sergio Padrino
30d1c7a55f Clean up Windows editors code? Hopefully! 2021-01-15 16:21:22 +01:00
Sergio Padrino
fef60eb4c7 Clean up macOS editors code and use open instead of looking for the executable 2021-01-15 16:21:22 +01:00