Commit Graph

35 Commits

Author SHA1 Message Date
dotnet-maestro-bot c206ea612a [automated] Merge branch 'release/2.2' => 'master' (#3278)
I detected changes in the release/2.2 branch which have not been merged yet to master. I'm a robot and am configured to help you automatically keep master up to date, so I've opened this PR.

This PR merges commits made on release/2.2 by the following committers:

* @anurse

## Instructions for merging

This PR will not be auto-merged. When pull request checks pass, please complete this PR by creating a merge commit, *not* a squash or rebase commit.

<img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" />

You can also do this on command line:

```
git checkout -b merge/release/2.2-to-master master
git pull https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
git checkout master
git merge --no-ff merge/release/2.2-to-master
git push origin master
```

## Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli].

[resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/
[resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/

## Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.2-to-master'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

```
git checkout -b merge/release/2.2-to-master master
git pull https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/SignalR merge/release/2.2-to-master
```

Please contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.
2018-11-07 15:27:19 -08:00
Brady Gaster 0aab8e5dd0
added maven badge to readme.md (#3201)
* added lines to the sample code that result in it working with copy/paste

* removed readme.md change

* added maven badge to readme.md
2018-10-25 12:38:05 -07:00
Mikael Mengistu 7eb5afd141
Update Build Badges (#3184) 2018-10-24 11:03:10 -07:00
Artur Dryomov 596f8acce1 Refine documentation formatting (#3080)
* Fix installation command formatting in the readme.

* Add more syntax highlighting to JS test docs.

* Add syntax highlighting to transport docs.
2018-10-07 17:27:46 -07:00
Andrew Stanton-Nurse 2db0c086b2
fix #2853 by adding blurb to readme (#2854) 2018-08-23 09:00:51 -07:00
Mikael Mengistu a2942ce885
Update Intro Video Link (#2637) 2018-07-16 11:38:09 -07:00
Mikael Mengistu adc07e74a9
Update Intro Video (#2490) 2018-06-14 10:09:40 -07:00
Mikael Mengistu b86f31d58c
Remove AppVeyor Badge (#2435) 2018-06-06 20:50:45 -07:00
The Gitter Badger d8020e34b5 Add Gitter badge (#2174) 2018-04-30 23:22:46 -07:00
David Fowler a3337eb6bd
Remove traces of ASP.NET Core Sockets (#1899) 2018-04-07 17:51:12 -07:00
BrennanConroy 6d642ea5ce
Move Typescript client folder (#1692) 2018-03-22 15:47:08 -07:00
Andrew Stanton-Nurse 1f94925afa
Add note about required NPM version (#1462) 2018-02-16 09:59:08 -08:00
Tony Compton 78612fc4b0 Getting Started/Build Documentation (#1311)
* Added getting-started documentation.

- High-level getting started docs.
- Troubleshooting the build docs.
- Build details docs.
2018-02-15 09:21:00 -08:00
Andrew Stanton-Nurse f58ea8133b
fix #1387 by removing our hacky EventSource typings (#1393) 2018-02-01 14:13:08 -08:00
Andrew Stanton-Nurse 2d5ab4d741
Add note about using latest tsc version to README (#1390) 2018-02-01 08:25:24 -08:00
Andrew Stanton-Nurse f3e7b801bc
Clarify version alignment of client and server in README (#1371) 2018-01-30 08:49:03 -08:00
Andrew Stanton-Nurse 243025488a
Update README.md (#1364) 2018-01-29 13:09:14 -08:00
Andrew Stanton-Nurse 33d391349a
Add some docs for using the packages from browsers (#1355) 2018-01-25 14:53:54 -08:00
BrennanConroy dd7cfdc58d
Update README.md (#1337) 2018-01-23 20:00:34 -08:00
Matt Jeanes 1a842e92ec Fix dotnet myget npm registry link (#1223)
Fixes #1221
2017-12-18 08:18:52 -08:00
Nate McMaster e15a38a14c Pin package and tool versions to make build more repeatable 2017-11-01 16:40:51 -07:00
Nate McMaster 8a7f495141
Specify NodeJS as a required toolset to build this repo (#1065) 2017-10-31 14:18:19 -07:00
Pawel Kadluczka ac36121f26 Update README
Adding information about requirements for building the repo. Fixes: https://github.com/aspnet/SignalR/issues/906
2017-09-19 15:13:18 -07:00
Pawel Kadluczka 2919c26dd4 Update README.md 2017-09-15 08:16:35 -07:00
Nate McMaster d3ae3abe2a Use PackageLineup to manage PackageReference versions 2017-09-01 16:34:32 -07:00
David Pendray e8d3587f9f Update README.md
Fix typo
2017-08-31 09:10:31 -07:00
Pawel Kadluczka ea78ad402a Really fix this typo 2017-08-30 09:29:37 -07:00
Pawel Kadluczka 528ec95f08 Update README.md 2017-08-30 09:29:37 -07:00
Pawel Kadluczka 144e15751c Update README.md 2017-08-30 09:29:37 -07:00
Pawel Kadluczka 76ea3cf24c Update README.md 2017-08-23 14:13:03 -07:00
Pawel Kadluczka 61ebf10ea9 Update README.md (#315) 2017-03-17 11:12:53 -07:00
mkosieradzki 9a4009ff8b Added link to the NDC video. 2017-02-28 17:30:09 -08:00
BrennanConroy 0f1f6273e7 Add AppVeyor and Travis tags 2016-12-19 10:57:42 -08:00
James Chambers 5e2b267d9f Adding tsc note to readme 2016-11-15 14:37:22 -08:00
BrennanConroy 1bb9a61d7a README, LICENSE, and CONTRIBUTING files 2016-10-17 10:19:50 -07:00