projects/fipamo
1
0
Fork 1
Code Issues 8 Pull requests Projects 1 Releases 23 Wiki Activity

include-adm-zip #37

Closed
are0h wants to merge 28 commits from refs/pull/37/head into develop
pull from: refs/pull/37/head
merge into: projects:develop
Conversation 1 Commits 28 Files changed 82 +2
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7bfb13bc1f - Show all commits

2
brain/routes/dash/settings.js
View file

@ -4,6 +4,7 @@ const router = express.Router();
const FileHound = require('filehound'); const FileHound = require('filehound');
const fs = require('fs-extra'); const fs = require('fs-extra');
const settings = new Settings(); const settings = new Settings();
const moment = require('moment');
var config = []; var config = [];
//-------------------------- //--------------------------
// SETTINGS // SETTINGS
@ -39,6 +40,7 @@ router.get('/', function (req, res) {
status: true, status: true,
themes: themes, themes: themes,
settings: config, settings: config,
last_backup: moment(config.global.last_backup).fromNow(),
member: memberInfo[0] member: memberInfo[0]
}); });
} else { } else {