Skip to content

Commit f59cd34

Browse files
author
Ben Grynhaus
committed
Merge branch 'master' into bugfix/inner-react-render-props-not-render
# Conflicts: # libs/fabric/package.json # libs/fabric/src/lib/components/command-bar/command-bar.component.ts
2 parents edabdec + 6b91617 commit f59cd34

24 files changed

+92
-319
lines changed

LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
MIT License
2+
3+
Copyright (c) Microsoft Corporation. All rights reserved.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE
22+

README.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Use of Angular-React allows consuming any React elements, but specifically Offic
1010
[@angular-react/fabric](https://www.npmjs.com/package/@angular-react/fabric) |
1111
[Documentation, quick start, and guides][ard] |
1212
[Demo][ard-demo] |
13-
[Contributing](https://github.com/benfeely/angular-react/blob/master/CONTRIBUTING.md) |
13+
[Contributing](https://github.com/microsoft/angular-react/blob/master/CONTRIBUTING.md) |
1414
[StackBlitz Template](https://stackblitz.com/edit/angular-react) |
1515
[Office UI Fabric](https://developer.microsoft.com/en-us/fabric)
1616

@@ -26,11 +26,25 @@ if you're building your first project with Angular-React.
2626
If you'd like to contribute, you must follow our [contributing guidelines](https://github.com/angular/material2/blob/master/CONTRIBUTING.md).
2727
You can look through the issues (which should be up-to-date on who is working on which features and which pieces are blocked) and make a comment.
2828

29-
[ard]: https://benfeely.github.io/angular-react
30-
[ard-demo]: https://benfeely.github.io/angular-react/demo
31-
[getting-started]: https://benfeely.github.io/angular-react/docs/getting-started
29+
[ard]: https://microsoft.github.io/angular-react
30+
[ard-demo]: https://microsoft.github.io/angular-react/demo
31+
[getting-started]: https://microsoft.github.io/angular-react/docs/getting-started
3232
[fab]: https://developer.microsoft.com/en-us/fabric
3333

34+
## Contributing
35+
36+
This project welcomes contributions and suggestions. Most contributions require you to agree to a
37+
Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
38+
the rights to use your contribution. For details, visit https://cla.microsoft.com.
39+
40+
When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
41+
a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
42+
provided by the bot. You will only need to do this once across all repos using our CLA.
43+
44+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
45+
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
46+
contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
47+
3448
### Pull Requests
3549
See: https://gist.github.com/piscisaureus/3342247
3650
Locate the section for your github remote in the `.git/config` file. It looks like this:
@@ -75,7 +89,7 @@ To get latest changes to the PR:
7589
```
7690
$ git checkout pr/1000
7791
$ git pull --tags origin refs/pull/1000/head
78-
From https://github.com/benfeely/angular-react
92+
From https://github.com/microsoft/angular-react
7993
* branch refs/pull/1000/head -> FETCH_HEAD
8094
Updating aab92e2..2896b73
8195
Fast-forward

apps/demo/src/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</script>
1212

1313
<!-- Immediately redirect to the base URL so we can use the SPA routing. -->
14-
<meta http-equiv="refresh" content="0;URL='https://benfeely.github.io/angular-react/demo/'"></meta>
14+
<meta http-equiv="refresh" content="0;URL='https://microsoft.github.io/angular-react/demo/'"></meta>
1515
</head>
1616

1717
<body>

apps/docs/src/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</script>
1212

1313
<!-- Immediately redirect to the base URL so we can use the SPA routing. -->
14-
<meta http-equiv="refresh" content="0;URL='https://benfeely.github.io/angular-react/'"></meta>
14+
<meta http-equiv="refresh" content="0;URL='https://microsoft.github.io/angular-react/'"></meta>
1515
</head>
1616

1717
<body>

apps/docs/src/app/components/navbar/navbar.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<a mat-tab-link routerLink="components" routerLinkActive #rla2="routerLinkActive" [active]="rla2.isActive" [routerLinkActiveOptions]="{ exact: false }"><div>Components</div></a>
1919
<a mat-tab-link routerLink="docs" routerLinkActive #rla3="routerLinkActive" [active]="rla3.isActive" [routerLinkActiveOptions]="{ exact: false }"><div>Docs</div></a>
2020
<div class="spacer"></div>
21-
<a mat-button href="https://github.com/benfeely/angular-react">
21+
<a mat-button href="https://github.com/microsoft/angular-react">
2222
<mat-icon>
2323
<svg xmlns="http://www.w3.org/2000/svg" aria-labelledby="simpleicons-github-icon" role="img" viewBox="0 0 24 24">
2424
<title id="simpleicons-github-icon">GitHub icon</title>

docs/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</script>
1212

1313
<!-- Immediately redirect to the base URL so we can use the SPA routing. -->
14-
<meta http-equiv="refresh" content="0;URL='https://benfeely.github.io/angular-react/'"></meta>
14+
<meta http-equiv="refresh" content="0;URL='https://microsoft.github.io/angular-react/'"></meta>
1515
</head>
1616

1717
<body>

docs/demo/3rdpartylicenses.txt

Lines changed: 0 additions & 233 deletions
This file was deleted.

docs/demo/404.html

Lines changed: 0 additions & 27 deletions
This file was deleted.
-80.4 KB
Binary file not shown.

docs/demo/favicon.ico

-5.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)