From f8cdba524cfc8e2be88614a928a3de82285267c1 Mon Sep 17 00:00:00 2001 From: Rafa Bernad Date: Tue, 31 May 2016 10:05:25 +0200 Subject: [PATCH 1/5] Small changes, fix wrong link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 884d725..a0cf6bf 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ there must be some changes needed by the structure to fit your needs correctly ## Getting Started -To get you started, let's see what you need after cloning the repository and install the dependencies: +To get you started, you need to meet the prerequisites, and then follow the installation instructions. ### Prerequisites -React-Base makes use a number of NodeJS tools to initialize and test React-Base. You must have node.js and its package manager (npm) installed. You can get it from [nodejs.org][node]. +React-Base makes use a number of NodeJS tools to initialize and test React-Base. You must have node.js and its package manager (npm) installed. You can get it from [nodejs.org](node). ### Installing From a92559bb79a2fef1126b7b635065f450e428037c Mon Sep 17 00:00:00 2001 From: Rafa Bernad Date: Tue, 31 May 2016 10:08:59 +0200 Subject: [PATCH 2/5] Added environment configurations comment --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a0cf6bf..3cc8c4a 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ Run `npm test` to perform your unit testing, or `npm test:coverage` to run your **React-Base** makes use of the latest tools to improve your workflow, and enables you to create future ready applications: +- Separate build configurations depending on target environment - JSX and ES6 transpilation using [Babel](https://babeljs.io/) - Hot Reload support - [PostCSS](http://postcss.org/) processing with isomorphic support, including support for *[future CSS features](http://cssnext.io/features/)*. From 1a96a64fd476dc8f9cd2ab3367dfa89513296e2d Mon Sep 17 00:00:00 2001 From: Rafael Bernad de Castro Date: Tue, 31 May 2016 10:25:04 +0200 Subject: [PATCH 3/5] fix typos and remove duplicated information --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5264c69..c5604f8 100644 --- a/README.md +++ b/README.md @@ -67,10 +67,10 @@ Run `npm test` to perform your unit testing, or `npm test:coverage` to run your - Development & Production server using [express](https://github.com/expressjs/express) and [webpack-dev-server](https://webpack.github.io/) - JSX and ES6 transpilation using [Babel](https://babeljs.io/) - Hot Reload support -- [PostCSS](http://postcss.org/) processing with isomorphic support, including support for *[future CSS features](http://cssnext.io/features/)*. -- Css Vars using [Cssnext](http://cssnext.io/) +- [PostCSS](http://postcss.org/) processing with isomorphic support. +- CSS Vars using [Cssnext](http://cssnext.io/) - Persistent data handling using [ImmutableJS](https://facebook.github.io/immutable-js/) -- [Mocha](https://mochajs.org/) for unit testing plus +- [Mocha](https://mochajs.org/) for unit testing - [nyc](https://github.com/bcoe/nyc)) for code coverage - Code Linting using [Eslint](https://github.com/eslint/eslint) - Css Linting using [CssLint](https://github.com/stylelint/stylelint) From dc9ce7bf6c84f8386ff338a04114582d4043be13 Mon Sep 17 00:00:00 2001 From: Rafael Bernad de Castro Date: Tue, 31 May 2016 10:29:26 +0200 Subject: [PATCH 4/5] fix typos and remove duplicated information --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 777e182..c5604f8 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,7 @@ To get you started, you need to meet the prerequisites, and then follow the inst ### Prerequisites -<<<<<<< HEAD React-Base makes use a number of NodeJS tools to initialize and test React-Base. You must have node.js 5.0.0 at least, and its package manager (npm) installed. You can get it from [nodejs.org][node]. -======= -React-Base makes use a number of NodeJS tools to initialize and test React-Base. You must have node.js and its package manager (npm) installed. You can get it from [nodejs.org](node). ->>>>>>> a92559bb79a2fef1126b7b635065f450e428037c ### Installing From 3882f00362e5963a6aab1c75cadb09712a9973c1 Mon Sep 17 00:00:00 2001 From: Rafa Bernad Date: Tue, 31 May 2016 10:31:45 +0200 Subject: [PATCH 5/5] fix wrong link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5604f8..3ee2a08 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ To get you started, you need to meet the prerequisites, and then follow the inst ### Prerequisites -React-Base makes use a number of NodeJS tools to initialize and test React-Base. You must have node.js 5.0.0 at least, and its package manager (npm) installed. You can get it from [nodejs.org][node]. +React-Base makes use a number of NodeJS tools to initialize and test React-Base. You must have node.js 5.0.0 at least, and its package manager (npm) installed. You can get it from [nodejs.org](node). ### Installing