From ae943dc93bc73ff4ff50c1817afd08de1ceaa495 Mon Sep 17 00:00:00 2001 From: "Marcus R. Brown" Date: Fri, 24 Jun 2016 14:36:45 -0700 Subject: [PATCH 1/3] Add a note to README.md and DIVERGENCE.md to note differences from upsgtream. --- DIVERGENCE.md | 5 +++++ README.md | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 DIVERGENCE.md diff --git a/DIVERGENCE.md b/DIVERGENCE.md new file mode 100644 index 00000000..611a065e --- /dev/null +++ b/DIVERGENCE.md @@ -0,0 +1,5 @@ +## Differences from upstream [react-templates](https://github.com/wix/react-templates) + +* Upgrade to [React](https://github.com/facebook/react/releases/tag/v15.1.0) v15.1.0. + +Based off of this [pull request](nippur72/react-templates#5), and I also updated the react and react-dom versions in package.json. diff --git a/README.md b/README.md index 4e7d07ec..0381bab9 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,9 @@ [![build status][travis-image]][travis-url] [![Coverage Status][coveralls-image]][coveralls-url] +NOTE :warning: | This is a fork of the original (upstream) [react-templates](https://github.com/wix/react-templates) repository with additional changes and PRs merged. Please see the file [DIVERGENCE.md](DIVERGENCE.md) for a list of the changes from upstream. +---------------|- + # React Templates Lightweight templates for [React](http://facebook.github.io/react/index.html). From 0dae0f2781a37b1f8942d73b4807db94e81fe1e8 Mon Sep 17 00:00:00 2001 From: "Marcus R. Brown" Date: Fri, 24 Jun 2016 14:46:25 -0700 Subject: [PATCH 2/3] Point the Travis CI badge to my fork. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0381bab9..1bc2b532 100644 --- a/README.md +++ b/README.md @@ -635,8 +635,8 @@ Copyright (c) 2015 Wix. Licensed under the MIT license. [npm-image]: https://img.shields.io/npm/v/react-templates.svg?style=flat-square [npm-url]: https://npmjs.org/package/react-templates -[travis-image]: https://img.shields.io/travis/wix/react-templates/gh-pages.svg?style=flat-square -[travis-url]: https://travis-ci.org/wix/react-templates +[travis-image]: https://img.shields.io/travis/igetgames/react-templates/gh-pages.svg?style=flat-square +[travis-url]: https://travis-ci.org/igetgames/react-templates [coveralls-image]: https://img.shields.io/coveralls/wix/react-templates/gh-pages.svg?style=flat-square [coveralls-url]: https://coveralls.io/r/wix/react-templates?branch=gh-pages [downloads-image]: http://img.shields.io/npm/dm/react-templates.svg?style=flat-square From 412f4ac802df687d0db06f14ffe72d1ceeb97de9 Mon Sep 17 00:00:00 2001 From: "Marcus R. Brown" Date: Fri, 24 Jun 2016 14:52:56 -0700 Subject: [PATCH 3/3] Update DIVERGENCE.md. --- DIVERGENCE.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DIVERGENCE.md b/DIVERGENCE.md index 611a065e..39e76b03 100644 --- a/DIVERGENCE.md +++ b/DIVERGENCE.md @@ -1,5 +1,10 @@ ## Differences from upstream [react-templates](https://github.com/wix/react-templates) -* Upgrade to [React](https://github.com/facebook/react/releases/tag/v15.1.0) v15.1.0. +* [[PR]](igetgames/react-templates#1) Upgrade to React [v15.1.0](https://github.com/facebook/react/releases/tag/v15.1.0) Based off of this [pull request](nippur72/react-templates#5), and I also updated the react and react-dom versions in package.json. + +* [[PR]](igetgames/react-templates#2) Update README.md for fork + +I changed the Travis CI badge in README.md to point to my fork, to better test changes not present in upstream. +I also added this document to note all of my changes.