Skip to content

Commit

Permalink
Merge pull request #9 from anis-campos/feature/v2.x
Browse files Browse the repository at this point in the history
v2.x
  • Loading branch information
anis-campos authored Apr 25, 2019
2 parents d4a02b6 + 6462808 commit d71754d
Show file tree
Hide file tree
Showing 4 changed files with 157 additions and 42 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ deploy:
api_key:
secure: dRSFP0kgfpY2q1U7QXfmSN4CKejSVqcndCcHZv2c185VupUmRT6ANDiDztGeLytwP+b1ixKeOLJKyEj/ltsDMaoQr9r+qTeU6ftYwGWgwmQnONHNpxAKIGpOh69a7gF2OgCl45UsX0eJIqkA52bpu81hqfQCz4GJJUJkaQoSjyCZmpBfQ64+kPQpFCHUQ5AKppJi/O+wvbn8A4/DNr/kYQO+pypwj7ZuJVrZUgwx625LGq2dbYCG1WFAGgOsPJKIR5r7Ms3Qq6jUfQmziy59pvLzpO2kT8CC9p4i2bP1m6VyzsgCK9vL1pG7sLu0lOcnlEVA68JKMWuFDtLBaNYvCkRBzDHylv153b+zG8dG+KjP9oukUKFaVGsDwb8ugh4DdhvbPu5ijYl0t3ZpYB2Pi1wnH5ExFcFpHfs2+KCRyZBD62irLf+XCIcr7jrgtB3YcTMEkYz8IQIvAwqDjgngZqxYi2BX/HQraHeNUkyLgDcFNBOcu0KGDcYA+di/cfbXFFY7p/DULe9r1PXxju2HnKBSXTSJpGXBME507Uk3MLypnzcddBWau3Xi74/r2+sRfNs7fNiIdGz1Zha4ySxTgmb95ERufpfibVJmyspIwKhRCRgBI3auQRJftuVhpwoZ0nAo3qibR/ZpJCuD20SvW+BMXIlu3vdImeVAawrfOQI=
on:
branch: master
tags: true
repo: anis-campos/redux-reactstrap-modal
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,21 @@ Work in progress

## Change Log

#### **v1.14**
#### **v2**
*What's new:*
- SSR is supported
- Latest version of react, redux and reactstrap ( may 2019 )

*Fixes*
- Fix [issue 5](https://github.com/anis-campos/redux-reactstrap-modal/issues/5) : Incompatible with SSR
- replacing `store` by `connect`
- fixing travis CI
-
- migrating from Karma to Jest

#### **v1.13**
#### **v1.1.3**
- Fix [issue 6](https://github.com/anis-campos/redux-reactstrap-modal/issues/6) : Incompatible with react-redux > 6
- need to pass `store` to create the redux wrapper

#### **v1.12**
#### **v1.1.2**
- Fix [issue 4](https://github.com/anis-campos/redux-reactstrap-modal/issues/4) : Uncaught TypeError: state.merge is not a function


164 changes: 137 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "redux-reactstrap-modal",
"version": "1.1.3",
"version": "2.0.0",
"description": "A Higher Order Component using react-redux to keep modal state in a Redux store",
"keywords": [
"bootstrap",
Expand Down Expand Up @@ -28,15 +28,15 @@
"test": "jest --coverage"
},
"dependencies": {
"bootstrap": "^4.1.3",
"normalizr": "^3.2.4",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-redux": "^6.0.0",
"react-transition-group": "^2.2.1",
"reactstrap": "^6.4.0",
"redux": "^4.0.0",
"seamless-immutable": "^7.1.2"
"bootstrap": "^4.3.1",
"normalizr": "^3.3.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-redux": "^7.0.2",
"react-transition-group": "^4.0.0",
"reactstrap": "^8.0.0",
"redux": "^4.0.1",
"seamless-immutable": "^7.1.4"
},
"devDependencies": {
"@babel/core": "^7.0.0",
Expand Down

0 comments on commit d71754d

Please sign in to comment.