Merge branch 'master' into i18n

2018-10-30 13:07:54 +07:00
parent 9863c1f1ac 30f3eb446c
commit 21b8b233f8
16 changed files with 254 additions and 124 deletions
--- a/client/src/components/Dashboard/Clients.js
+++ b/client/src/components/Dashboard/Clients.js
@@ -24,6 +24,7 @@ class Clients extends Component {
        Header: 'IP',
        accessor: 'ip',
        Cell: ({ value }) => (<div className="logs__row logs__row--overflow"><span className="logs__text" title={value}>{value}</span></div>),
+        sortMethod: (a, b) => parseInt(a.replace(/\./g, ''), 10) - parseInt(b.replace(/\./g, ''), 10),
    }, {
        Header: <Trans>Requests count</Trans>,
        accessor: 'count',