Merge pull request #354 from idleberg/2.3-dev

2.3 dev

.gitignore

@@ -4,10 +4,9 @@ bower_components/
 build/
 generators/
 node_modules/
-npm-debug.log
+npm-debug.log*
 src/l10n/ja_JA/
 src/parsedown
 tasks/swatch4.js
 todo.md
-vendor/
-yarn.lock
+vendor/

.travis.yml

@@ -1,11 +1,17 @@
 sudo: false
 language: node_js
 node_js:
-  - "6"
+  - "7"
+git:
+  depth: 1
+branches:
+  only:
+  - master
 cache:
   timeout: 1800
+  yarn: true
   directories:
-  - node_modules
+    - node_modules
 env:
   - CXX=g++-4.8
 addons:

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2016 Jan T. Sott
+Copyright (c) 2014-2017 Jan T. Sott
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -46,7 +46,7 @@ Deploy `build/` to your server. All files that should be accessible in the brows
 
 You can configure a number of settings in the file `config.json`:
 
-* Optional columns for size, modified date, permissions
+* Optional columns for size and modified date
 * Document icons
 * File viewer for images, videos, audio, source code, PDF and HTML
 * Search box to filter results

package.json

@@ -17,29 +17,29 @@
     "babel-cli": "^6.18.0",
     "babel-preset-latest": "^6.16.0",
     "better-console": "^0.2.4",
-    "bower": "^1.7.9",
+    "bower": "^1.8.0",
     "del": "^2.2.2",
     "gulp": "^3.9.1",
-    "gulp-cached": "^1.1.0",
-    "gulp-concat": "^2.6.0",
+    "gulp-cached": "^1.1.1",
+    "gulp-concat": "^2.6.1",
     "gulp-concat-css": "^2.3.0",
     "gulp-cssmin": "^0.1.7",
     "gulp-debug": "^3.0.0",
-    "gulp-jshint": "^2.0.2",
+    "gulp-jshint": "^2.0.4",
     "gulp-json-editor": "^2.2.1",
     "gulp-json-lint": "^0.1.0",
     "gulp-order": "^1.1.1",
     "gulp-prompt": "^0.2.0",
-    "gulp-sass": "^3.0.0",
+    "gulp-sass": "^3.1.0",
     "gulp-scss-lint": "^0.4.0",
     "gulp-uglify": "^2.0.0",
-    "gulp-util": "^3.0.7",
-    "gulp-watch": "^4.3.9",
+    "gulp-util": "^3.0.8",
+    "gulp-watch": "^4.3.11",
     "jshint": "^2.9.4",
     "phplint": "^1.7.1",
     "run-sequence": "^1.2.2",
     "streamqueue": "^1.1.1",
-    "yargs": "^6.3.0"
+    "yargs": "^6.6.0"
   },
   "scripts": {
     "test": "gulp travis",