From 57822b129073fe7836ffb85ce89d34fe8e3f12ee Mon Sep 17 00:00:00 2001 From: squidfunk Date: Thu, 6 Oct 2016 19:26:49 +0200 Subject: [PATCH] Updated changelog --- .githooks/post-merge/npm-update.sh | 2 +- CHANGELOG | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.githooks/post-merge/npm-update.sh b/.githooks/post-merge/npm-update.sh index e567174d7..4b4b1d1bd 100755 --- a/.githooks/post-merge/npm-update.sh +++ b/.githooks/post-merge/npm-update.sh @@ -27,4 +27,4 @@ CHANGED="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)" if $(echo "$CHANGED" | grep --quiet package.json); then echo "Hook[post-merge]: Updating dependencies..." npm install && npm prune -fi \ No newline at end of file +fi diff --git a/CHANGELOG b/CHANGELOG index d60445740..59933a652 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,13 +11,13 @@ mkdocs-material-1.0.0-rc.1 (2016-XX-XX) * Introduced ESLint and SassLint for code style checks * Introduced more accurate Material Design colors and shadows * Introduced modular scales for harmonic font sizing - * Introduced pre-commit hook for linting + * Introduced git-hooks for better development workflow * Rewrite of CSS using the BEM methodology and SassDoc guidelines * Rewrite of JavaScript using ES6 and Babel as a transpiler * Rewrite of Admonition, Permalinks and Codehilite integration * Rewrite of the complete typographical system * Rewrite of Gulp asset pipeline in ES6 and separation of tasks - * Removed Bower as a dependency in favor of npm + * Removed Bower as a dependency in favor of NPM * Removed custom icon build in favor of the Material Design iconset * Removed _blank targets on links due to vulnerability: http://bit.ly/1Mk2Rtw * Removed unversioned assets from build directory @@ -88,7 +88,7 @@ mkdocs-material-0.1.2 (2016-02-16) mkdocs-material-0.1.1 (2016-02-11) * Fixed #1: GitHub stars don't work if the repo_url ends with a '/' - * Updated npm and bower dependencies to most recent versions + * Updated NPM and Bower dependencies to most recent versions * Changed footer/copyright link to Material theme to GitHub pages * Made MkDocs building/serving in build process optional * Set up continuous integration with travis-ci.org