Merge branch 'release/0.2.7'

Author: igorprado

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.2.7 - Nov 20, 2015
+
+**React 15 support:**
+
+* Version 0.2.x now supports React 15 too.
+
+
 ## 0.2.6 - Nov 20, 2015
 
 **Bugfix from PR:**

README.md

@@ -18,7 +18,7 @@ npm install react-notification-system
 
 ### Important
 
-For **React 0.14.x**, use version 0.2.x:
+For **React ^0.14.x** or **React ^15.x.x**, use version 0.2.x:
 
 ```
 npm install [email protected]
@@ -36,7 +36,7 @@ npm install [email protected]
 
 For optimal appearance, this component **must be rendered on a top level HTML element** in your application to avoid position conflicts.
 
-Here is a basic example. For a more advanced usage, please see the [example code](https://github.com/igorprado/react-notification-system/blob/master/example/src/app.js).
+Here is a basic example. For a more advanced usage, please see the [example code](https://github.com/igorprado/react-notification-system/blob/master/example/src/scripts/App.jsx).
 
 ```js
 var React = require('react');

example/build/app.css

@@ -24,7 +24,7 @@ NotificationSystemExample = React.createClass({
   _notificationsShowCase: [
     {
       title: 'Hey, it\'s good to see you!',
-      message: 'Now you can how ease is to use notifications in React!',
+      message: 'Now you can see how easy it is to use notifications in React!',
       level: 'success',
       position: 'tr',
       action: {
@@ -35,15 +35,15 @@ NotificationSystemExample = React.createClass({
       }
     },
     {
-      title: 'I\'ll be here for ever!',
-      message: 'Just kidding you can click me.',
+      title: 'I\'ll be here forever!',
+      message: 'Just kidding, you can click me.',
       level: 'success',
       position: 'tr',
       autoDismiss: 0
     },
     {
-      title: 'Bad things can happer too!',
-      message: 'It\'s four type of levels: `success`, `error`, `warning` and `info`',
+      title: 'Bad things can happen too!',
+      message: 'Four notification types: `success`, `error`, `warning` and `info`',
       level: 'error',
       position: 'tl'
     },
@@ -55,7 +55,7 @@ NotificationSystemExample = React.createClass({
     },
     {
       title: 'Warning!',
-      message: 'It\'s not a good idea show all this notifications at the same time!',
+      message: 'It\'s not a good idea show all these notifications at the same time!',
       level: 'warning',
       position: 'bc',
       action: {
@@ -119,7 +119,7 @@ NotificationSystemExample = React.createClass({
           <div className="content">
             <h1 className="title">React Notification System</h1>
             <h2 className="subtitle">A complete and totally customizable component for notifications in React.</h2>
-            <h3 className="versions">(For React 0.14 and 0.13)</h3>
+            <h3 className="versions">(For React 15, 0.14 and 0.13)</h3>
 
             <div className="btn-show-magic-holder">
               <button className="btn btn-outline btn-show-magic" onClick={ this._showTheMagic }>

example/build/app.js

@@ -1,6 +1,6 @@
 {
   "name": "react-notification-system",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "A React Notification System fully customized",
   "main": "dist/NotificationSystem.js",
   "scripts": {
@@ -36,8 +36,8 @@
     "object-assign": "^4.0.1"
   },
   "peerDependencies": {
-    "react": "^0.14.0",
-    "react-dom": "^0.14.0"
+    "react": "0.14.x || ^15.0.0",
+    "react-dom": "0.14.x || ^15.0.0"
   },
   "devDependencies": {
     "autoprefixer-loader": "^3.1.0",
@@ -69,9 +69,9 @@
     "mocha": "^2.3.3",
     "node-sass": "^3.3.3",
     "npm": "^3.3.6",
-    "react": "^0.14.0",
-    "react-addons-test-utils": "^0.14.0",
-    "react-dom": "^0.14.0",
+    "react": "^15.0.0",
+    "react-addons-test-utils": "^15.0.0",
+    "react-dom": "^15.0.0",
     "react-tools": "^0.13.2",
     "react-transform-catch-errors": "^1.0.0",
     "react-transform-hmr": "^1.0.1",