public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into access

Browse source 
Conflicts:
	config/default.toml
This commit is contained in:
Tomas Bures 2017-05-27 10:43:31 +02:00
commit 115d254baf
33 changed files with 2331 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app.js
View file

@ -184,6 +184,12 @@ app.use((req, res, next) => {
res.locals.customStyles = config.customstyles || [];
res.locals.customScripts = config.customscripts || [];
let bodyClasses = [];
if (req.user) {
bodyClasses.push('logged-in user-' + req.user.username);
}
res.locals.bodyClass = bodyClasses.join(' ');
settingsModel.list(['ua_code', 'shoutout'], (err, configItems) => {
if (err) {
return next(err);