Skip to content

Commit

Permalink
EasyMDE
Browse files Browse the repository at this point in the history 
Settings View Revamp
Updated packages
  • Loading branch information
@polonel
polonel committed Aug 30, 2018
1 parent 0d91a70 commit d0f5a49
Show file tree
Hide file tree
Showing 60 changed files with 23,604 additions and 2,188 deletions.
3 changes: 2 additions & 1 deletion gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ module.exports = function(grunt) {
'src/public/js/vendor/shepherd/css/shepherd-theme-arrows.css',
'src/public/js/vendor/shepherd/css/shepherd-theme-arrows-fix.css',
'src/public/js/vendor/shepherd/css/shepherd-theme-square.css',
'src/public/js/vendor/shepherd/css/shepherd-theme-square-dark.css'
'src/public/js/vendor/shepherd/css/shepherd-theme-square-dark.css',
'src/public/js/vendor/easymde/dist/easymde.min.css'
]
}
},
Expand Down
101 changes: 51 additions & 50 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "Trudesk",
"version": "1.0.0",
"version": "0.1.11",
"private": true,
"engines": {
"node": ">=6.0.0"
"node": ">=9.10.0"
},
"scripts": {
"start": "node ./app",
Expand All @@ -18,99 +18,100 @@
"snyk-protect": "snyk protect"
},
"dependencies": {
"ansi_up": "2.0.2",
"async": "2.6.0",
"bcrypt": "2.0.1",
"body-parser": "1.18.2",
"ansi_up": "3.0.0",
"async": "2.6.1",
"bcrypt": "3.0.0",
"body-parser": "1.18.3",
"busboy": "0.2.14",
"chance": "1.0.13",
"clone": "2.1.1",
"chance": "1.0.16",
"clone": "2.1.2",
"connect-flash": "0.1.1",
"connect-mongo": "1.3.2",
"connect-mongo": "2.0.1",
"cookie": "0.3.1",
"cookie-parser": "1.4.3",
"css-loader": "0.28.9",
"csv": "2.0.0",
"csv": "3.1.0",
"dive": "0.5.0",
"email-templates": "3.3.4",
"email-templates": "4.0.3",
"exports-loader": "0.7.0",
"expose-loader": "0.7.4",
"express": "4.16.2",
"expose-loader": "0.7.5",
"express": "4.16.3",
"express-hbs": "1.0.4",
"express-session": "1.15.6",
"extract-text-webpack-plugin": "3.0.2",
"fast-csv": "2.4.1",
"file-tail": "0.3.0",
"grunt": "1.0.2",
"grunt": "1.0.3",
"grunt-contrib-cssmin": "2.2.1",
"grunt-contrib-uglify": "3.3.0",
"grunt-sass": "2.1.0",
"grunt-contrib-uglify": "3.4.0",
"grunt-sass": "3.0.1",
"grunt-shell": "2.1.0",
"handlebars": "4.0.11",
"imap": "0.8.19",
"imports-loader": "0.7.1",
"imports-loader": "0.8.0",
"ip-address": "5.8.9",
"js-string-escape": "1.0.1",
"ldapjs": "1.0.2",
"lodash": "4.17.5",
"mailparser": "2.2.0",
"marked": "0.3.17",
"lodash": "4.17.10",
"mailparser": "2.3.3",
"marked": "0.5.0",
"matchdep": "2.0.0",
"mkdirp": "0.5.1",
"moment": "2.20.1",
"mongoose": "5.0.6",
"moment": "2.22.2",
"moment-duration-format": "2.2.2",
"mongoose": "5.2.8",
"nconf": "0.10.0",
"netmask": "1.0.6",
"node-cache": "4.1.1",
"node-sass": "4.7.2",
"nodemailer": "4.4.2",
"node-cache": "4.2.0",
"node-sass": "4.9.3",
"nodemailer": "4.6.8",
"notp": "2.0.3",
"object-hash": "1.2.0",
"object-hash": "1.3.0",
"passport": "0.4.0",
"passport-http": "0.3.0",
"passport-local": "1.0.0",
"passport-totp": "0.0.2",
"passport.socketio": "3.7.0",
"pm2": "2.10.0",
"pm2": "3.0.3",
"prompt": "1.0.0",
"redis": "2.8.0",
"request": "2.83.0",
"request": "2.88.0",
"rimraf": "2.6.2",
"sanitize-html": "1.17.0",
"sass-loader": "6.0.6",
"sanitize-html": "1.18.4",
"sass-loader": "7.1.0",
"script-loader": "0.7.2",
"serve-favicon": "2.4.5",
"snyk": "^1.69.7",
"socket.io": "2.0.4",
"socket.io-client": "2.0.4",
"style-loader": "0.20.2",
"serve-favicon": "2.5.0",
"snyk": "^1.92.6",
"socket.io": "2.1.1",
"socket.io-client": "2.1.1",
"style-loader": "0.22.1",
"svg-captcha": "1.3.11",
"tar": "4.3.3",
"tar": "4.4.6",
"thirty-two": "1.0.2",
"uglify-js": "3.3.11",
"uglify-js": "3.4.7",
"unzip": "0.1.11",
"util": "0.10.3",
"util": "0.11.0",
"webpack": "3.11.0",
"winston": "2.4.0"
"winston": "2.4.4"
},
"devDependencies": {
"chai": "*",
"codacy-coverage": "^2.0.3",
"cross-env": "^5.1.3",
"eslint": "4.18.0",
"codacy-coverage": "^3.0.0",
"cross-env": "^5.2.0",
"eslint": "5.4.0",
"eslint-config-angular": "0.5.0",
"eslint-plugin-angular": "3.2.0",
"eslint-plugin-node": "6.0.0",
"grunt-contrib-watch": "1.0.0",
"grunt-express-server": "0.5.3",
"eslint-plugin-angular": "3.3.0",
"eslint-plugin-node": "7.0.1",
"grunt-contrib-watch": "1.1.0",
"grunt-express-server": "0.5.4",
"grunt-htmlhint": "0.9.13",
"grunt-parallel": "0.5.1",
"istanbul": "0.4.5",
"lorem-ipsum": "1.0.4",
"mocha": "5.0.1",
"lorem-ipsum": "1.0.5",
"mocha": "5.2.0",
"mocha-lcov-reporter": "1.3.0",
"superagent": "3.8.2",
"supertest": "3.0.0"
"superagent": "3.8.3",
"supertest": "3.1.0"
},
"config": {
"blanket": {
Expand Down
2 changes: 1 addition & 1 deletion public/css/plugins.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/plugins.min.css
View file

Large diffs are not rendered by default.

Binary file added public/img/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/controllers/accounts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ var accountsController = {};
accountsController.content = {};

accountsController.signup = function(req, res) {
var marked = require('marked');
var settings = require(RELPATH + 'models/setting');
settings.getSettingByName('allowUserRegistration:enable', function(err, setting) {
if (err) return handleError(res, err);
Expand All @@ -42,7 +43,7 @@ accountsController.signup = function(req, res) {
if (privacyPolicy === null || _.isUndefined(privacyPolicy.value))
content.data.privacyPolicy = 'No Privacy Policy has been set.';
else
content.data.privacyPolicy = privacyPolicy.value;
content.data.privacyPolicy = marked(privacyPolicy.value);

return res.render('pub_signup', content);
});
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/api/v1/reports.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ function processReportData(tickets) {
var t = [];
t.push(ticket.uid);
t.push(ticket.type.name);
t.push(ticket.priorityFormatted);
t.push(ticket.priority.name);
t.push(ticket.statusFormatted);
t.push(moment(ticket.date).format('MMM DD, YY HH:mm:ss'));
t.push(ticket.subject);
Expand Down
9 changes: 6 additions & 3 deletions src/controllers/api/v1/tickets.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,10 @@ api_tickets.postComment = function(req, res) {
if (_.isUndefined(comment)) return res.status(400).json({success: false, error: "Invalid Post Data"});

var marked = require('marked');
comment = comment.replace(/(\r\n|\n\r|\r|\n)/g, "<br>");
marked.setOptions({
breaks: true
});
// comment = comment.replace(/(\r\n|\n\r|\r|\n)/g, "<br>");
var Comment = {
owner: owner,
date: new Date(),
Expand Down Expand Up @@ -749,11 +752,11 @@ api_tickets.postInternalNote = function(req, res) {
if (_.isUndefined(payload.note)) return res.status(400).json({success: false, error: 'Invalid Post Data'});

var marked = require('marked');
var note = payload.note.replace(/(\r\n|\n\r|\r|\n)/g, "<br>");
// var note = payload.note.replace(/(\r\n|\n\r|\r|\n)/g, "<br>");
var Note = {
owner: payload.owner,
date: new Date(),
note: marked(note)
note: marked(payload.note)
};

ticket.updated = Date.now();
Expand Down
3 changes: 2 additions & 1 deletion src/controllers/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ mainController.index = function(req, res) {

mainController.about = function(req, res) {
var pkg = require('../../package.json');
var marked = require('marked');
var settings = require('../models/setting');
settings.getSettingByName('legal:privacypolicy', function(err, privacyPolicy) {
var content = {};
Expand All @@ -65,7 +66,7 @@ mainController.about = function(req, res) {
if (privacyPolicy == null || _.isUndefined(privacyPolicy.value))
content.data.privacyPolicy = 'No Privacy Policy has been set.';
else
content.data.privacyPolicy = privacyPolicy.value;
content.data.privacyPolicy = marked(privacyPolicy.value);

return res.render('about', content);
});
Expand Down
7 changes: 6 additions & 1 deletion src/controllers/reports.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@ reportsController.generate = function(req, res) {
content.data.user = req.user;
content.data.common = req.viewdata;

return res.render('subviews/reports/generate', content);
var prioritySchema = require('../models/ticketpriority');
prioritySchema.getPriorities(function(err, priorities) {
content.data.priorities = priorities;

return res.render('subviews/reports/generate', content);
});
};

reportsController.breakdownGroup = function(req, res) {
Expand Down
Loading

0 comments on commit d0f5a49

Please sign in to comment.