diff --git a/CHANGELOG.md b/CHANGELOG.md index 748a8ca1..2767d612 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # CHANGELOG +## 1.0.1 - 2018-09-02 + +#### Added + +* *Nothing* + +#### Changed + +* *Nothing* + +#### Deprecated + +* *Nothing* + +#### Removed + +* *Nothing* + +#### Fixed + +* [#42](https://github.com/shlinkio/shlink-web-client/issues/42) Fixed selected tags lost when navigating between pages in short URLs list. +* [#43](https://github.com/shlinkio/shlink-web-client/issues/43) Fixed "List short URLs" menu item only selected when in first page. + + ## 1.0.0 - 2018-08-26 #### Added diff --git a/package.json b/package.json index 7d495c1f..9280a206 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "dotenv-expand": "4.2.0", "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.1.1", - "eslint": "^5.4.0", + "eslint": "^4.19.0", "eslint-config-adidas-babel": "^1.0.1", "eslint-config-adidas-env": "^1.0.1", "eslint-config-adidas-es6": "^1.0.1", diff --git a/src/common/AsideMenu.js b/src/common/AsideMenu.js index ace7c5c0..339496fd 100644 --- a/src/common/AsideMenu.js +++ b/src/common/AsideMenu.js @@ -25,6 +25,7 @@ export default function AsideMenu({ selectedServer, className, showOnMobile }) { const asideClass = classnames('aside-menu', className, { 'aside-menu--hidden': !showOnMobile, }); + const shortUrlsIsActive = (match, location) => location.pathname.match('/list-short-urls'); return (