Commit 81a5e3d5 authored by katjaq's avatar katjaq
Browse files

Merge branch 'master' into sound

parents 9104ceff 58e899ff
......@@ -43,8 +43,8 @@ app.set('view engine', 'mustache');
app.use(favicon(dirname + '/public/favicon.png'));
app.set('trust proxy', 'loopback');
app.use(logger(':remote-addr :method :url :status :response-time ms - :res[content-length]'));//app.use(logger('dev'));
app.use(bodyParser.urlencoded({ extended: false }));
app.use(bodyParser.json({limit: '50mb'}));
app.use(bodyParser.urlencoded({limit: '50mb', extended: true}));
app.use(express.static(path.join(dirname, 'public')));
......@@ -465,7 +465,7 @@
//TODO implement the placeholder for the select tags in the anotation table
//TODO find a way for the user to give a set of values for the annotations and make it obvious that it works this way
var projectInfo='{{{projectInfo}}}';
var projectInfo={{{projectInfo}}};
// for the access widget
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment