Merge pull request #501 from Martii/someDepUpdates

Some dep updates

Auto-merge

package.json

@@ -10,21 +10,21 @@
  "body-parser": "1.10.0",
  "bootstrap": "3.1.1",
  "bootstrap-markdown": "2.7.0",
- "compression": "1.2.1",
- "connect-mongo": "0.4.1",
+ "compression": "1.2.2",
+ "connect-mongo": "0.4.2",
  "cookie-parser": "1.3.3",
- "express": "4.10.4",
+ "express": "4.10.6",
  "express-minify": "0.1.1",
  "express-session": "1.9.3",
  "font-awesome": "4.2.0",
- "formidable": "1.0.15",
+ "formidable": "1.0.16",
  "github": "0.2.3",
  "highlight.js": "8.4.0",
- "jquery": "2.1.1",
+ "jquery": "2.1.3",
  "marked": "0.3.2",
  "method-override": "2.3.0",
  "moment": "2.8.4",
- "mongoose": "3.8.20",
+ "mongoose": "3.8.21",
  "morgan": "1.5.0",
  "mu2": "0.5.20",
  "octicons": "git://github.com/github/octicons.git#835ee02",
@@ -46,10 +46,10 @@
  "passport-twitter": "1.0.2",
  "passport-windowslive": "1.0.1",
  "passport-yahoo": "0.3.0",
- "request": "2.49.0",
+ "request": "2.51.0",
  "sanitize-html": "1.4.3",
  "select2": "3.5.1",
- "select2-bootstrap-css": "1.4.3",
+ "select2-bootstrap-css": "1.4.4",
  "serve-favicon": "2.1.7",
  "underscore": "1.7.0"
  },

routesStatic.js

@@ -45,7 +45,11 @@ module.exports = function (aApp) {
  serveModule('/redist/npm/', 'ace-builds/src/', 7);
 
  serveModule('/redist/npm/', 'bootstrap/', {
- 'dist/js/bootstrap.js': { maxage: day * 1 }
+ 'dist/js/bootstrap.js': { maxage: day * 1 },
+ 'dist/fonts/glyphicons-halflings-regular.eot': { maxage: day * 7 },
+ 'dist/fonts/glyphicons-halflings-regular.svg': { maxage: day * 7 },
+ 'dist/fonts/glyphicons-halflings-regular.ttf': { maxage: day * 7 },
+ 'dist/fonts/glyphicons-halflings-regular.woff': { maxage: day * 7 }
  });
 
  serveModule('/redist/npm/', 'bootstrap-markdown/', {