Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New security #460

Merged
merged 21 commits into from
Apr 11, 2019
2 changes: 1 addition & 1 deletion src/components/Aside/Aside.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class Aside extends Component {
)
case 'system':
return(
<div className={notification.status===1?"list-group-item b-new-notif pointer":"list-group-item pointer"} key={index}>
<div className={notification.status===1?"list-group-item b-new-notif pointer":"list-group-item"} key={index}>
{notification.info && <p><i className="fas fa-exclamation-circle text-warning mr-2"/>{notification.info.description}</p>}
<p>{convertNotificationTime(notification.createDate)}</p>
</div>
Expand Down
442 changes: 225 additions & 217 deletions src/i18n/i18n-ita.js

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions src/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ const routes = {
'/private/widget' : 'Widget',
'/private/charts' : 'Crea Widget',
'/private/search': 'Ricerca',
'/private/messages': 'Messaggi',
'/private/editTTL' : 'Gestione TTL'
'/private/messages': 'Messaggi di sistema',
'/private/editTTL' : 'Gestione TTL',
'/private/editTTL' : 'Validità Notifiche'
};
export default routes;
5 changes: 3 additions & 2 deletions src/views/Login/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,14 @@ class Login extends Component {
console.log('Get Autentication Token json: ' + JSON.stringify(json))
})
this.setState({
loginMessage: 'Errore durante il login. Si prega di riprovare più tardi.',
loginMessage: 'Nome utente o password non corretto.',
uploading: false
})
}
}).catch((error) => {
console.log('Get Autentication error: ' + error)
this.setState({
loginMessage: 'Nome utente o password non corretto.',
loginMessage: 'Errore durante il login. Si prega di riprovare più tardi.',
uploading: false
})
})
Expand Down
Loading