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
35734 commits 297 branches 696 tags 363 MiB
Commit graph

1163 commits

Author SHA1 Message Date
Billy Griffin 4385790987 Simplify and update Desktop roadmap 2019-09-09 16:43:37 -06:00
evelyn masso de789ea066
Update README.md 2019-09-06 08:50:35 -07:00
evelyn masso 6ca7ad6227
Rename pull-request-triage.md to pull-requests.md 2019-09-06 08:46:37 -07:00
Mislav Marohnić 7888898a4b Add instructions on doing a focused test run 
It is no longer accurate that `--debug` opens Chrome Dev Tools, since
currently this flag is forwarded to Jest and has different semantics.

[ci skip]
 2019-09-05 14:57:14 -07:00
Katrina Uychaco 7c6add620b
Add some context 2019-08-23 20:45:10 -07:00
Katrina Uychaco 59f69093d8
Add documentation for authenticating GHE from dev build 2019-08-23 20:25:25 -07:00
Katrina Uychaco 9ece1a6fa6
Add project boards and drop jolo 
Co-authored-by: evelyn masso <outofambit@github.com>
Co-authored-by: Corey Johnson <probablycorey@github.com>
 2019-08-09 10:55:39 -07:00
Tiernan L db12c14049
update acronym 2019-08-05 09:39:49 -10:00
jipexu e2669b36d2
Merge branch 'development' into patch-1 2019-07-30 17:39:49 +02:00
Tiernan L f7e73106f8
adding build number for context 2019-07-29 08:32:22 -10:00
Brendan Forster 61cea247d1
Merge branch 'development' into dependency-version-lag-docs 2019-07-29 11:30:47 -03:00
jipexu eaa4ab54b0
Update docs/known-issues.md 
update doc for #3263

Co-Authored-By: Steve Ward <ward@github.com>
 2019-07-26 20:34:46 +02:00
jipexu d16a5ee882
Merge branch 'development' into patch-1 2019-07-26 19:01:03 +02:00
Brendan Forster b6f7840ab1
Merge branch 'development' into patch-1 2019-07-25 06:52:15 -03:00
jipexu 427b1fb095
update affected version of mac os 
still present with mojave
[#3263]
 2019-07-25 11:38:02 +02:00
William Shepherd 9d3a658f9f
Merge branch 'development' into add-20-syntax-highlighting-languages 2019-07-24 09:19:44 -05:00
Rexogamer 9a8906fd6e
add atom beta/nightly 2019-07-24 15:08:43 +01:00
Robert James Gabriel cf61941ea8 Add Kitty support for macOs 
See more details here. Thought it would be an easy and fun pr

Added kitty to docs
 2019-07-12 15:03:39 -07:00
KennethSweezy 46a3a25713 ❌ Removed Octave from the list of supported languages. 2019-07-09 22:14:30 -04:00
KennethSweezy 63a7062cbf 📝 Updated list of languages that Desktop syntax highlights 
Added sTex, SPARQL, Stylus, Soy, Smalltalk, Slim, Sieve, Scheme, ReStructuredText, RPM, Q, Puppet, Pug, Protobuf, Properties, Apache Pig, ASCII Armor (PGP), Octave, Oz and Pascal to the list of languages that GitHub Desktop will syntax highlight.
 2019-07-06 15:56:59 -04:00
Brendan Forster 268d93fbe6
Merge branch 'development' into enterprise-server-naming 2019-06-17 17:09:13 -03:00
Brendan Forster e37765c598
Merge branch 'development' into record-success-for-rebase 2019-06-14 17:05:13 -03:00
Brendan Forster c45083d1b9
Update docs/process/metrics.md 
Co-Authored-By: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2019-06-14 17:02:54 -03:00
Nathan Henderson 9243fd36d6
Merge branch 'development' into enterprise-server-naming 2019-06-14 14:17:07 -04:00
evelyn masso 5f0424c2da
Merge branch 'development' into iAmWillShepherd-patch-1 2019-06-14 10:00:10 -07:00
Brendan Forster e8c2db8331 add new metric to measure successful rebases without conflicts 2019-06-14 12:07:59 -03:00
William Shepherd 406e94b872
Merge branch 'development' into iAmWillShepherd-patch-1 2019-06-13 11:34:53 -05:00
William Shepherd 969c27dd88 Add details for when to produce report 2019-06-13 11:32:40 -05:00
Brendan Forster bb08fb39f6 add rebaseCurrentBranchMenuCount metric to list 2019-06-13 13:05:37 -03:00
evelyn masso 2358d2d09b
Apply suggestions from code review 
Co-Authored-By: Brendan Forster <brendan@github.com>
 2019-06-11 10:36:49 -07:00
William Shepherd b541097920
Update docs/process/releasing-updates.md 
Co-Authored-By: Steven Yeh <say25@cornell.edu>
 2019-06-11 08:27:54 -05:00
Brendan Forster c169af3fff
Merge branch 'development' into shiftkey-patch-3 2019-06-11 08:34:11 -03:00
William Shepherd bb5c317822
Update releasing-updates.md 2019-06-10 15:45:29 -05:00
William Shepherd 7b037dbbff
Add notes on checking haystack for final beta 2019-06-10 15:44:08 -05:00
Nathan Henderson 6d2b14ae07 Update additional 'Enterprise' references to 'Enterprise Server' 2019-06-07 16:47:48 -04:00
Billy Griffin 62856cbfa8
Update roadmap post 2.0 ship 
We're going to update this again in the next two weeks after deciding on the next few things we're going to ship, but I at least wanted the in-progress things to be updated to shipped since 2.0 has gone out.
 2019-06-07 11:24:26 -06:00
Leelena Asfaw 52bdfa4781
Remove url and replaces with text links 
Makes minor changes so that following the steps is intuitive
 2019-06-01 16:21:13 -04:00
Brendan Forster 4e805fa380 add section about the installer log locations 2019-05-30 10:41:22 -03:00
Brendan Forster 06129bfe4b update docs 2019-05-28 17:12:22 -03:00
Brendan Forster 9b20094c5b need another metric 
This one will be used to identify "people who have committed to a repo with at least one protected branch"
 2019-05-28 17:12:22 -03:00
Brendan Forster 27f67c5e9b naming things is hard 2019-05-28 17:12:21 -03:00
Brendan Forster 9872cede13 add to docs 2019-05-28 17:11:32 -03:00
Brendan Forster d5f94a2f2d
wrapping up the current rebase epic 2019-05-20 15:38:16 -03:00
evelyn masso 69daf39b0b Merge branch 'development' into releases/1.6.6 2019-05-15 13:28:43 -07:00
Billy Griffin 5b73e982c5
Update docs/process/metrics.md 2019-05-14 12:32:03 -06:00
William Shepherd a33fd3c297 Update metrics.md 
Co-Authored-By: Billy Griffin <billygriffin@users.noreply.github.com>
 2019-05-14 12:57:25 -05:00
William Shepherd 2de68dfd1e
Update docs/process/metrics.md 
Co-Authored-By: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2019-05-14 09:37:59 -05:00
William Shepherd 800766fae1 Add docs for baseline stashing metrics 2019-05-13 11:06:47 -05:00
Brendan Forster 0febd884d9 add comment to doc about the pattern 2019-05-08 10:07:34 -03:00
Tiernan L f24790c2f6
Merge pull request #7448 from desktop/stashing-update 
updating the test cases
 2019-05-03 10:07:27 -07:00
Tiernan L fc4d8e6a41
added next steps 2019-05-02 15:15:53 -10:00
Tiernan L 375d76b7e3
add onboarding steps 2019-05-02 15:07:41 -10:00
Tiernan L 10424a7354
remove binary rebase mention 2019-05-02 15:00:42 -10:00
Billy Griffin 7d8590b044
Update docs/process/testing.md 
Co-Authored-By: tierninho <tierninho@github.com>
 2019-05-02 17:58:45 -07:00
Billy Griffin c6c43f56e2
Update docs/process/testing.md 
Co-Authored-By: tierninho <tierninho@github.com>
 2019-05-02 17:58:28 -07:00
Billy Griffin e26569145d
Update docs/process/testing.md 
Co-Authored-By: tierninho <tierninho@github.com>
 2019-05-02 17:57:30 -07:00
Billy Griffin 6fe06f2d5b
Update docs/process/testing.md 
Co-Authored-By: tierninho <tierninho@github.com>
 2019-05-02 17:57:23 -07:00
Billy Griffin 4f3ddcacc9
Update docs/process/testing.md 
Co-Authored-By: tierninho <tierninho@github.com>
 2019-05-02 17:57:11 -07:00
Billy Griffin 54c56ad694
Update docs/process/testing.md 
Co-Authored-By: tierninho <tierninho@github.com>
 2019-05-02 17:56:58 -07:00
Billy Griffin 6a56608fec
Update docs/process/testing.md 
Co-Authored-By: tierninho <tierninho@github.com>
 2019-05-02 17:56:48 -07:00
Billy Griffin 76710ae931
Update docs/process/testing.md 
Co-Authored-By: tierninho <tierninho@github.com>
 2019-05-02 17:56:37 -07:00
Billy Griffin d2858eb031
Update docs/process/testing.md 
Co-Authored-By: tierninho <tierninho@github.com>
 2019-05-02 17:56:28 -07:00
Brendan Forster 5edd79a8a4
Update docs/process/testing.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-05-02 12:17:54 -04:00
Steven Yeh f6e0c30b61
Update docs/process/testing.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-05-02 12:17:37 -04:00
Tiernan L 12d49f5729
updating the test cases 
adds stashing, rebasing, next steps (wip), onboardin (wip), small edits
 2019-05-01 15:32:10 -10:00
Brendan Forster 5af0ffb6fb
Apply suggestions from code review 
Co-Authored-By: shiftkey <brendan@github.com>
 2019-05-01 13:47:02 -03:00
William Shepherd 28d4434764
Update docs/technical/rebase-flow.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-05-01 12:06:46 -04:00
William Shepherd 76d562c769
Update docs/technical/rebase-flow.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-05-01 12:01:39 -04:00
William Shepherd 450ba6f1e1
Update docs/technical/rebase-flow.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-05-01 12:01:32 -04:00
William Shepherd ff09069814
Update docs/technical/rebase-flow.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-05-01 11:59:43 -04:00
Brendan Forster 355ec89c89 flesh out the other sections 2019-04-29 17:20:01 -03:00
Brendan Forster 83ac80670b wrote some more words 2019-04-29 17:05:06 -03:00
Billy Griffin feabaf7a6f
Minor grammar change 2019-04-25 10:58:08 -06:00
Markus Olsson 6454052799 Add button order doc stub 
Co-Authored-By: Billy Griffin <billygriffin@users.noreply.github.com>
 2019-04-25 16:42:43 +02:00
Neha Batra 85ac6af591
Update docs/process/labels.md 
Co-Authored-By: shiftkey <brendan@github.com>
 2019-04-25 10:07:53 -03:00
Brendan Forster 4928dc531f
add links for new labels 2019-04-23 15:28:52 -03:00
Brendan Forster 9ec0b20bab
Update labels.md 2019-04-22 13:22:19 -03:00
Brendan Forster 076030a8b6
generalize the labels to be usable more broadly 2019-04-22 13:14:49 -03:00
Brendan Forster 707b2650ad
Update labels.md 2019-04-22 12:18:38 -03:00
Brendan Forster e74f75b6e8
experiment with using labels to track workflow work 2019-04-22 11:36:10 -03:00
Brendan Forster 1185f8e487
Update docs/contributing/setup-macos.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-04-18 09:16:56 -06:00
Brendan Forster c9d1cee3c9
Update docs/contributing/setup-windows.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-04-18 09:16:51 -06:00
Brendan Forster d2c29f2f04
Update docs/contributing/setup-windows.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-04-18 09:16:43 -06:00
Brendan Forster f771792c6e
Update docs/contributing/setup-macos.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-04-18 09:16:35 -06:00
Brendan Forster 7792ff9cbf
Update docs/contributing/setup-linux.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-04-18 09:16:28 -06:00
Brendan Forster 65e34a5abc
Update docs/contributing/setup.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-04-18 09:15:40 -06:00
Brendan Forster bd1f46aa5c
Update docs/contributing/setup-windows.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-04-18 09:15:24 -06:00
Brendan Forster 99dc3d1383
Update docs/contributing/setup-macos.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-04-18 09:15:13 -06:00
Brendan Forster d56e1aac1b
Update docs/contributing/setup-linux.md 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-04-18 09:15:04 -06:00
Billy Griffin b233f4d856 Update linux setup instructions 2019-04-18 08:28:21 -06:00
Billy Griffin a77e547fc6 Update Windows setup instructions 2019-04-18 08:25:32 -06:00
Billy Griffin cdf1b2383d Remove versions specified from the tools list 2019-04-18 08:21:59 -06:00
Billy Griffin c3e7d576f9 Update macOS setup docs 
* Added a way to get back to the overall setup after getting dependencies all 👍
* Node versioning should all be reasonable
 2019-04-17 14:43:47 -06:00
Billy Griffin b02ae93bfe Update dependencies and make instructions clearer 2019-04-17 14:34:10 -06:00
evelyn masso d4d005df33 Merge branch 'development' into dependency-version-lag-docs 2019-04-01 15:45:22 -07:00
evelyn masso 0eae62ef64 remove extra line break 2019-04-01 11:24:54 -07:00
evelyn masso 88611c0d6a add general versioning guidelines for dependencies 2019-04-01 11:19:07 -07:00
Brendan Forster 002cabb009
Merge branch 'development' into git-plumbing-for-rebase-progress 2019-03-29 15:40:04 -03:00
Brendan Forster 6f209e13e4 first pass at some docs 2019-03-29 14:24:02 -03:00
Brendan Forster 78cff951f8 writing some docs 2019-03-27 08:07:51 -03:00
Steve Ward 76db9e03ad
Fix spacing 2019-03-22 12:06:05 -04:00
Steve Ward edc95966f3 Resize images for better clarity 2019-03-22 11:53:26 -04:00
Steve Ward 46650578e2 Update screenshots 2019-03-22 11:48:53 -04:00
Steve Ward b56202fdb7 Add some minor fixes 2019-03-22 11:30:07 -04:00
Steve Ward 40b129c80b Add guide for authentication to Bitbucket 2019-03-22 11:29:40 -04:00
Steve Ward b838cfeed1 Add guide for authenticating to GitLab 2019-03-22 11:06:11 -04:00
Billy Griffin f68738aa9f
Merge pull request #7094 from desktop/add-askpass-notes 
Add notes about ask-pass errors to known-issues.md
 2019-03-18 10:22:47 -06:00
Brendan Forster ce8eb4dddc
Apply suggestions from code review 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-03-18 09:28:31 -06:00
Steve Ward b665f7ac21 Add notes about ask-pass errors to known-issues.md 2019-03-15 10:04:19 -04:00
Billy Griffin 9360b9d147 Previous open issues for FRR 
Co-Authored-By: Neha Batra <nerdneha@users.noreply.github.com>
 2019-03-14 17:20:59 -06:00
Billy Griffin 1b0075d6eb Decouple reviewing PRs from FRR expectations 2019-03-14 16:39:36 -06:00
Billy Griffin b990b4b60e Remove future proposals from issue triage 2019-03-14 16:37:35 -06:00
Billy Griffin b5ee1ade4f Added support to issue triage 2019-03-14 13:54:30 -06:00
Billy Griffin ba334b59c1 Add support process to first responder doc. 2019-03-14 13:43:12 -06:00
Billy Griffin 52299951f4 Spelling consistency 2019-03-14 13:38:34 -06:00
Billy Griffin 02448899b1
Update roadmap 2019-02-28 10:58:18 -07:00
Brendan Forster 2a02f03cd0 add docs for new rebase metrics 2019-02-27 11:27:21 -04:00
Brendan Forster 6663b3f999 rewrote workaround to use a newer Git config value 2019-02-19 08:45:27 -04:00
Brendan Forster 45518bd0ad
Merge pull request #6791 from desktop/pull-request-metrics 
Pull request metrics
 2019-02-08 14:32:43 -04:00
Brendan Forster 6e305c2a21
Merge pull request #6721 from desktop/add-some-tests-for-pull 
add Git tests for our current pull behaviour
 2019-02-08 11:26:04 -04:00
William Shepherd f168a8dbb0 Add documentation 
Co-Authored-By: Billy Griffin <billygriffin@users.noreply.github.com>
 2019-02-07 12:30:00 -06:00
Dan McCarthy 55ebb7b752
Fix typo 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-02-04 13:55:27 -08:00
Steven Yeh 7ced385599
Add release to feature 
Co-Authored-By: billygriffin <5091167+billygriffin@users.noreply.github.com>
 2019-02-04 13:55:17 -08:00
Billy Griffin cf1c8a1d8d
Linkify 2019-02-04 13:39:57 -07:00
Billy Griffin 8f8c2c14cc
Update roadmap 2019-02-04 13:05:38 -07:00
Brendan Forster 62e4aedbaf use contents rather than value 2019-02-04 15:38:43 -04:00
Brendan Forster b9f485e75a writing some docs 2019-02-04 15:24:53 -04:00
Kenneth Blake Sweezy 769df1d032
Update syntax-highlighting.md 
Add Crystal and Julia to the list of languages
 2019-01-27 12:35:54 -05:00
SimpleBinary ec762683e7
Update syntax-highlighting.md 2019-01-24 12:51:57 +10:00
Dan McCarthy 6af5e8827b Removed no longer needed transitioning to Jest documentation 
This documentation explains the process of switching any existing chai tests to jest.

Currently there are no more chai tests left to convert, therefore chai is being removed from the project.

This documentation is no longer needed and is being removed.
 2019-01-22 10:26:41 -06:00
Steve Ward dd89310f2a
Add screenshots 2019-01-14 13:08:20 -05:00
Steve Ward edc9d41aa1
Update words 2019-01-04 15:42:39 -05:00
Steve Ward 0c3ac21f54
Rename vsts.md to azure-devops.md 2019-01-04 14:39:26 -05:00
evelyn masso d4be778adf remove references to master in docs 2018-12-27 15:38:17 -08:00
SimpleBinary be1dbdc7e9
Add Syntax Highlighting for VB 2018-12-21 08:59:17 +10:00
Brendan Forster b556ff8f97
Merge pull request #6272 from KennethSweezy/add-webstorm-support 
Add integration for JetBrains Webstorm
 2018-12-20 10:23:14 -04:00
Billy Griffin 6bd12eae19
Update merge conflicts metrics justification 2018-12-17 09:04:22 -07:00
Brendan Forster 5f8b1cf575
Merge pull request #6269 from desktop/update-setup-guides 
update other setup guides to match macOS format
 2018-12-17 11:37:10 -04:00
evelyn masso bee1d72f16 Update metrics.md 2018-12-14 14:54:47 -08:00
William Shepherd ae0168d5cd
Update setup.md 2018-12-14 10:08:19 -08:00
Billy Griffin 6837957814
Update metrics.md 2018-12-13 16:36:58 -07:00
William Shepherd 2836007d09 alphabetize 2018-12-13 15:00:39 -08:00
William Shepherd c0ee4f7710 Add new metrics 2018-12-13 13:44:17 -08:00
William Shepherd e15eb5e994 Put event type at top of list 
This value never changes, may as well stay at top
 2018-12-13 13:43:13 -08:00
Billy Griffin ae18a20ade
Added merge conflicts iteration to roadmap 2018-12-11 09:16:41 -07:00
Billy Griffin bc526dfcf1
Add description for enhancement 2018-12-06 13:48:11 -07:00
Billy Griffin 291def8811
Add support label 2018-12-06 13:45:15 -07:00
evelyn masso 306e1cc206
Merge pull request #6308 from desktop/i-need-all-the-credits 
Add metrics for capturing unattributed commits
 2018-12-03 14:44:20 -08:00
William Shepherd c638394c8f Update metrics docs 2018-11-30 11:33:56 -06:00
William Shepherd 6bb8a4b260
Merge pull request #6125 from desktop/extract-update-logic-for-testing 
refactoring to extract and test more AppStore functionality
 2018-11-29 16:40:55 -06:00
William Shepherd 323426d517 Better docs? 2018-11-29 16:01:15 -06:00
Billy Griffin 44ee343a31
Add metrics justification 2018-11-29 14:41:04 -07:00
William Shepherd a01b548a9c update metrics doc 2018-11-29 15:36:50 -06:00
Billy Griffin 7e0bc598f2
Fix checkbox formatting 2018-11-27 13:57:32 -07:00
Tiernan L 0d936acae2
Update tests to include merge conflicts 2018-11-27 11:43:10 -08:00
Brendan Forster 2230e9a8c3 some tweaks to the doc based on feedback 2018-11-23 09:38:12 -04:00
Brendan Forster 326d76b784 Merge branch 'master' into extract-update-logic-for-testing 2018-11-23 08:12:22 -04:00
William Shepherd 9da63e0c66
Apply suggestions from code review 
Co-Authored-By: shiftkey <brendan@github.com>
 2018-11-23 08:00:21 -04:00
Kenneth Blake Sweezy a0f5d35a5e
Update list of currently supported editors 
Updated the list of currently supported editors to include JetBrains WebStorm.
 2018-11-22 17:36:16 -05:00
Brendan Forster b7ccba89a6 nvm has a Windows port 2018-11-22 11:39:43 -04:00
Brendan Forster 842f560bd9 move yarn instructions into each section to ensure it's not overlooked 2018-11-22 11:37:46 -04:00
Brendan Forster 759c2e5a04 rewrite Linux section 2018-11-22 11:28:55 -04:00
Brendan Forster 1f4238e259 group sections better 2018-11-22 11:08:27 -04:00
Brendan Forster 9328f5b022 expand arm64 into a more friendly document 2018-11-22 11:08:27 -04:00
Brendan Forster 17cfa4d922 rewrite Windows docs in the style of our macOS guide 2018-11-22 11:08:27 -04:00
Brendan Forster b669d8ac48 break out sections into own docs 2018-11-22 11:08:27 -04:00
Brendan Forster b38e0780bc
Merge pull request #6204 from desktop/no-lint-scripts 
pull eslint scripts into package.json
 2018-11-21 19:59:44 -04:00
William Shepherd f7c63e046c
Merge pull request #6095 from desktop/upgrade-dependencies-doc 
first pass at a doc about upgrading dependencies
 2018-11-21 15:01:49 -05:00
evelyn masso 7e4053581d newline 2018-11-21 10:22:47 -08:00
evelyn masso b126619b13 capitalization 2018-11-21 10:22:43 -08:00
Brendan Forster 4deaf03dbe
Merge pull request #6257 from Daniel-McCarthy/Teams-Doc-Line-Fix 
Fixed broken maintainers line in Teams doc
 2018-11-21 11:34:03 -04:00
Dan McCarthy 6b9835de56 Fixed broken maintainers line in Teams doc 
In a previous pull request a typo was fixed, but this issue was introduced. Part of the word "developing" was cut off and the rest of the sentence was split onto the next line as a result.

This undoes that change while keeping the typo fix.
 2018-11-21 08:43:04 -06:00
evelyn masso 540248acc7 Create linting.md 2018-11-20 15:01:27 -08:00
evelyn masso c0ecd05bde
Merge pull request #6181 from msftrncs/win32_LaunchEditor_UseShell 
Win32 LaunchEditor use Shell for .CMD files
 2018-11-20 12:53:50 -08:00
Billy Griffin 24266982a9
Update roadmap 
- Put 1.5 things in past category (trying this out)
- Add several upcoming areas of exploration to roadmap
 2018-11-19 18:50:34 -07:00
msftrncs 51ba5315e0 provide documentation for 'usesShell' 2018-11-17 17:16:45 -06:00
Brendan Forster cc212398c3
Merge pull request #6030 from texasaggie97/master 
Add support for Visual SlickEdit as an external editor
 2018-11-16 08:58:06 -04:00
Brendan Forster 6c3f35d26c Merge branch 'master' into extract-update-logic-for-testing 2018-11-15 11:43:39 -04:00
Markus Olsson 0279e816b4
Merge pull request #4533 from say25/docker-highlights 
Add Dockerfile Highlights
 2018-11-15 15:53:05 +01:00
evelyn masso 8e675e73eb
Merge pull request #6152 from desktop/bump-for-last-node-8 
Bump for last node 8
 2018-11-15 06:51:16 -08:00
Brendan Forster 2f3a41cdf6 Merge branch 'master' into pr/4533 2018-11-14 13:00:46 -04:00
Brendan Forster 19943a28b8 write some docs about this area 2018-11-14 10:44:54 -04:00
evelyn masso 1f6bb898a3
Merge pull request #6131 from desktop/docs-tweak 
updated link to new location in repository
 2018-11-13 13:25:53 -08:00
Billy Griffin 2a5f5b8272
Add time-sensitive label for PRs 2018-11-13 09:17:24 -07:00
Brendan Forster f59a4a7dd3 update section because Node 8 is no longer LTS 2018-11-12 16:04:42 -04:00
Brendan Forster 86f89e625d update comment 2018-11-12 16:02:07 -04:00
Brendan Forster 39f05e0f60 update docs to mention new version 2018-11-09 16:44:35 -04:00
Brendan Forster be224b28ab
updated link to new location 2018-11-08 11:57:24 -04:00
Steven Yeh d99a95ff5b
Update docs/contributing/upgrading-dependencies.md 
Co-Authored-By: shiftkey <brendan@github.com>
 2018-11-05 17:44:28 -04:00
Brendan Forster ecdb9ba292
tweaks 2018-11-05 12:28:35 -04:00
Brendan Forster 63962f2b9e first pass at a doc about upgrading dependencies 2018-11-05 12:19:19 -04:00
Brendan Forster a942abb0f5 whitespaaaace 2018-11-02 12:02:44 -03:00
Brendan Forster 8088c0ea9e Merge branch 'master' into issue-labels 2018-11-02 11:58:50 -03:00
Mark Silva 2b5a85ec03 Update code snippets to match current code 2018-11-01 11:12:24 -05:00
Mark Silva f515973ad9 Add SlickEdit to documentation 2018-11-01 11:12:03 -05:00
Mark Silva 308ceef00e Add SlickEdit to documentation 2018-11-01 11:04:26 -05:00
Brendan Forster bce9ebe45d
Merge pull request #5809 from desktop/conflicted-merge-flow 
Conflicted merge resolution flow
 2018-10-30 10:02:11 -03:00
evelyn masso f94a5cf81f
Merge pull request #5941 from desktop/refine-release-planning 
expand on how we plan and co-ordinate releases
 2018-10-29 07:23:33 -07:00
Brendan Forster 16921d9d7a
fixed me up a typo 2018-10-29 10:29:20 -03:00
Brendan Forster 8c564dc5ee refresh doc to reflect current usage of labels 2018-10-26 17:01:45 -03:00
Brendan Forster 1ac6b7fccd move labels into own doc 2018-10-26 17:01:45 -03:00
evelyn masso 8a205fe74a Merge branch 'master' into conflicted-merge-flow 2018-10-25 14:25:32 -07:00
William Shepherd d5ed7c9220
Merge pull request #5899 from desktop/shiftkey-patch-1 
refreshed screenshots and instructions for timeline doc
 2018-10-25 11:50:56 -05:00
Brendan Forster 8f6c77aa76 refreshd docs section 2018-10-25 12:09:41 -03:00
William Shepherd 290496d0d5
Merge pull request #5645 from desktop/docs-on-structure 
documenting an aspirational structure of the app directory
 2018-10-24 15:40:50 -05:00
Brendan Forster 6d507ffdb4
link to feature flag doc 2018-10-24 15:50:55 -03:00
William Shepherd 0bd9ccdf78
Merge pull request #5951 from desktop/bump-linux-tooling 
add some packaging improvements for Linux
 2018-10-24 10:13:19 -05:00
Brendan Forster 42f4fda22b
Update adding-tests.md 2018-10-24 11:19:45 -03:00
Brendan Forster 4681df716e
tweaks 2018-10-24 11:19:31 -03:00
Brendan Forster d6870af501 a quick guide to adding tests 2018-10-24 11:12:00 -03:00
evelyn masso 9aaf2a1d0a
Merge pull request #5940 from desktop/shiftkey-patch-2 
codified section about where to start a release from
 2018-10-23 08:48:59 -07:00
Brendan Forster a902aa12d1
milestones are not 1-1 with marketing releases 2018-10-23 12:03:06 -03:00
Brendan Forster f7c8657ab2 a new format approaches! 2018-10-23 11:26:06 -03:00
Brendan Forster cce8e9d874 tidy up and reordering 2018-10-23 10:50:15 -03:00
Billy Griffin fd37e40189
Update roadmap 2018-10-19 14:19:11 -06:00
Brendan Forster a6bbb44ea7 use the right words 2018-10-19 17:06:52 -03:00
Billy Griffin 732edb09aa
Update docs/process/release-planning.md 
Co-Authored-By: shiftkey <brendan@github.com>
 2018-10-19 16:04:35 -03:00
Billy Griffin 28122571a8
Update docs/process/release-planning.md 
Co-Authored-By: shiftkey <brendan@github.com>
 2018-10-19 16:04:30 -03:00
Billy Griffin 2c9c7ac32d
Update docs/process/release-planning.md 
Co-Authored-By: shiftkey <brendan@github.com>
 2018-10-19 16:04:26 -03:00
Billy Griffin 786cd49a6c
Update docs/process/release-planning.md 
Co-Authored-By: shiftkey <brendan@github.com>
 2018-10-19 16:04:19 -03:00
Billy Griffin b6a1cd1b9a
Update docs/process/release-planning.md 
Co-Authored-By: shiftkey <brendan@github.com>
 2018-10-19 16:04:14 -03:00
Billy Griffin 8a8b40f3cd
Update docs/process/release-planning.md 
Co-Authored-By: shiftkey <brendan@github.com>
 2018-10-19 16:04:06 -03:00
Brendan Forster c37c64f2e8
tweaks and typo 2018-10-19 15:28:23 -03:00
Brendan Forster bf220962be
be a bit more detailed around things 2018-10-19 15:27:02 -03:00
Brendan Forster f1c0a3e98c
words are hard 2018-10-19 13:56:05 -03:00
Brendan Forster 9a5b229b3b
one more rename 2018-10-19 13:53:57 -03:00
Brendan Forster d22a0961d7
make it clear this is for the future 2018-10-19 13:52:48 -03:00
Brendan Forster e34b5793b3
make this link more clear 2018-10-19 13:20:56 -03:00
William Shepherd ff249a7d44
Update docs/process/release-planning.md 
Co-Authored-By: shiftkey <brendan@github.com>
 2018-10-19 13:20:09 -03:00
Brendan Forster dd1f63a02a
codified section about where to start a release from 2018-10-18 16:14:32 -03:00
Brendan Forster f3e710dd2f tweaks 2018-10-17 16:25:09 -03:00
Brendan Forster 377540e53e rewrite this doc to reflect some recent discussions 2018-10-17 16:20:33 -03:00
evelyn masso b8a7bc2c96
Merge pull request #5810 from desktop/did-you-merge-it 
Add metrics for completing/aborting a merge after conflicts
 2018-10-16 13:55:16 -07:00
William Shepherd 1110cabbd4 Update metric names 2018-10-15 14:47:34 -05:00
Brendan Forster 7a2cb05788
refreshed screenshots and instructions 
Electron 2.x has a new version of Chrome Dev Tools ✨
 2018-10-14 17:16:59 -03:00
Brendan Forster 7044454c81 Merge branch 'master' into pr/4533 2018-10-14 13:05:40 -03:00
Billy Griffin 9669533d25
Add justification for post-merge conflict metrics 2018-10-11 13:44:17 -06:00
William Shepherd 71029ec37c document new metrics 2018-10-11 11:54:09 -05:00
David Sanders e801d1f2ff
Fix typo 2018-10-11 04:14:33 -07:00
Billy Griffin d90698f6b8
Link last two known issues 2018-10-02 09:46:40 -06:00
myqpalzm147 305a18d64c
fixed a typo 2018-09-29 19:38:45 +07:00
Brendan Forster 7615b887fa
Merge pull request #5753 from joaomlneto/terminator 
Linux Shells: add Terminator, MATE Terminal, Terminology
 2018-09-28 11:01:36 -03:00
Billy Griffin 3d7a3dd571
Merge pull request #5737 from desktop/what-the-what 
Define GitHub Desktop product vision
 2018-09-26 16:11:56 -06:00
João Neto e8bce8341c update shell integration docs 2018-09-26 21:37:14 +01:00
João Neto b8e0501be0 add missing shells in documentation 2018-09-26 19:09:16 +01:00
João Neto 1daf36a597 Linux Shell Integration: add Terminator and MATE Terminal 2018-09-26 19:03:54 +01:00
Billy Griffin 035f3b0620
Verbiage change 2018-09-26 08:41:18 -06:00
Tiernan L b9e6eb9437
Merge pull request #5726 from desktop/test-manifest 
test manifest update for v1.4
 2018-09-25 13:35:19 -07:00
Billy Griffin 64ea77603f
Add GHE 2018-09-25 13:52:55 -06:00
Billy Griffin 4cd4ff0a0a
Define GitHub Desktop product vision 
What is GitHub Desktop and who is it for?
 2018-09-25 10:02:42 -06:00
Tiernan L b95758e5d1
small edits and fixes to manifest 2018-09-24 15:03:08 -07:00
Tiernan L f920634083
merge conflicts, small changes and edits 2018-09-24 14:35:08 -07:00
Billy Griffin e41c428148
Update roadmap after 1.4 release 2018-09-24 13:06:51 -06:00
Tiernan L e51e235fae
test manifest update for v1.4 
WIP, partial update
 2018-09-24 11:51:23 -07:00
William Shepherd a0e25e0c95
Merge pull request #5710 from rahulpnath/patch-1 
Merging now since this is a doc update
 2018-09-21 15:57:15 -05:00
William Shepherd c8749d5b5e
Spelling is a skill 2018-09-21 15:33:32 -05:00
Rahul P Nath 7663110af0
Include link to packaging in Readme 2018-09-22 06:26:32 +10:00
William Shepherd 71cbe06c64
Merge pull request #5702 from desktop/shiftkey/packaging-docs 
Docs don't need to wait
 2018-09-21 15:12:25 -05:00
William Shepherd b7895b606c
Merge pull request #5538 from desktop/nvm-and-friends 
nvm and pyenv and docs
 2018-09-21 10:59:59 -05:00
Brendan Forster 9c5d993911
dots are important 2018-09-21 09:29:06 -03:00
Brendan Forster a0afcc52c7 some more tweaks 2018-09-21 09:09:44 -03:00
Brendan Forster 3fb3096ece one last TODO 2018-09-21 09:05:15 -03:00
Brendan Forster 764041cc20 fix typos 2018-09-21 08:49:32 -03:00
Brendan Forster d7fdba9847 documenting the details about how Desktop's source is turned into an installer 2018-09-21 08:47:03 -03:00
Brendan Forster 79cbe3375d
fixed typo 2018-09-20 09:53:54 -03:00
Brendan Forster 1bf207b2b4
tidying up 2018-09-19 17:13:31 -03:00
evelyn masso 585c905a6a rename file to be friendlier 2018-09-19 12:26:14 -07:00
evelyn masso 2408f27b8f match new structure 2018-09-19 12:24:47 -07:00
evelyn masso 245a2ec75c new nodejs setup structure 
Co-Authored-By: Brendan Forster <github@brendanforster.com>
 2018-09-19 12:09:33 -07:00
João Neto 1674a2deb1 Add support for Typora editor (#5643) 
* add Typora support for macOS

* add Typora support for Windows

* add Typora support for Llinux

* update docs

* add 32-bit Windows Typora support
 2018-09-19 09:39:20 -03:00
Billy Griffin 958aee533c
Add link to usage data page 2018-09-18 10:08:00 -06:00
evelyn masso c9970ca2b7 make it clear its optional 2018-09-14 13:22:58 -07:00
evelyn masso a9c7afd07b Revert "be less prescriptive" 
This reverts commit 8513ecc741.
 2018-09-14 13:15:53 -07:00
Brendan Forster 59dfa096fd
main-process -> main 2018-09-14 16:00:26 -03:00
Brendan Forster 986cb061d7
an addendum 2018-09-14 15:40:17 -03:00
Brendan Forster 145d3ae4eb
moar details 2018-09-14 15:26:56 -03:00
Brendan Forster a0dcac8a92 tweaks 2018-09-14 12:38:41 -03:00
Brendan Forster 114ecd01cd a first pass at the application structure 2018-09-14 12:19:45 -03:00
evelyn masso 6bdeba0770 🎨 2018-09-13 09:16:49 -07:00
evelyn masso 00016157bf move mac dependencies summary 2018-09-13 07:42:45 -07:00
João Neto 86cfaaae66
Update yarn version in setup.md 
yarn version should match #5335
 2018-09-12 23:20:01 +01:00
evelyn masso 8513ecc741 be less prescriptive 2018-09-12 14:44:45 -07:00
evelyn masso 2f14794c5d edits 2018-09-10 13:22:57 -07:00
evelyn masso 909a96b975 8.11.4 everywhere 2018-09-10 13:22:35 -07:00
Steven Yeh 1351c0d3dd
Remove 1.3 from Roadmap 2018-09-09 16:30:49 -05:00
Billy Griffin 50de4ec4ad
Add justifications 2018-09-06 15:57:12 -06:00
William Shepherd 5fa1ff0b02
Add new metrics 
Metrics added in https://github.com/desktop/desktop/pull/5550/
 2018-09-06 15:24:10 -05:00
evelyn masso 8c591bcb93
Merge pull request #5362 from desktop/metrics 
Add document for metrics we collect
 2018-09-06 12:15:00 -07:00
Billy Griffin fa913344b7
Minor wording changes and grammar 2018-09-06 10:02:23 -06:00
William Shepherd 04e6cda99e Fix grammar 2018-09-06 10:49:04 -05:00
William Shepherd 3f7a7cb212 Add a comment about the active field 
Co-Authored-By: Brendan Forster <github@brendanforster.com>
 2018-09-05 15:23:29 -05:00
William Shepherd d5ba94cbe1 More wordsmithing 
Co-Authored-By: Brendan Forster <github@brendanforster.com>
 2018-09-05 15:20:13 -05:00
William Shepherd b09f61b000 Improve accuracy of description 2018-09-05 15:16:08 -05:00
William Shepherd 324e420bf4 Wordsmithing 
Co-Authored-By: Brendan Forster <github@brendanforster.com>
 2018-09-05 15:15:41 -05:00
William Shepherd 7718832e5f Correct metric name 2018-09-05 15:13:27 -05:00
William Shepherd 4dd8121ed2 Make entries clearer 2018-09-05 15:11:54 -05:00
William Shepherd c1986acf52 Desktop is proper 2018-09-05 15:08:02 -05:00
William Shepherd 3cbde7e4a4 Fix wording 2018-09-05 15:07:57 -05:00
William Shepherd 64b60ce921 Be more specific 2018-09-05 15:04:35 -05:00
William Shepherd 71d9ba1779 nvm, lets be more general 2018-09-05 15:03:48 -05:00