diff --git a/CHANGELOG.md b/CHANGELOG.md index 8da5993552..57fd102308 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ HabitRPG -# (2014-01-16) +# (2014-01-17) + + +## Bug Fixes + +- **#2375:** merge in @SabreCat's stats.jade changes "More elegant show/hide setup for attribute bonuses" + ([518f200a](https://github.com/habitrpg/habitrpg/commits/518f200a8fc7373b44ed7d7b5f016d921b0746bd)) + + +## Features + +- **bailey:** notif about STWC updates + scroll-purchase deadlines (@colegleason) + ([90176444](https://github.com/habitrpg/habitrpg/commits/90176444e9c7a318040829e8b71d1493b5d58e9e)) +- **challenges:** markdown in challenge-descriptions + ([41233c7b](https://github.com/habitrpg/habitrpg/commits/41233c7b167905eeccfdff5589789e002ec23f97)) ## Breaking Changes diff --git a/EXTENDEDCHANGELOG.md b/EXTENDEDCHANGELOG.md index 88cc4a2553..8f05860dfb 100644 --- a/EXTENDEDCHANGELOG.md +++ b/EXTENDEDCHANGELOG.md @@ -1,11 +1,8 @@ HabitRPG -# (2014-01-16) +# (2014-01-17) -## Chore - -- **changelog:** add commit-msg hook to verify commit messages - -## Breaking Changes - +## Bug Fixes +- **#2375:** merge in @SabreCat's stats.jade changes "More elegant show/hide setup for attribute bonuses" + ([518f200a](https://github.com/habitrpg/habitrpg/commits/518f200a8fc7373b44ed7d7b5f016d921b0746bd)) diff --git a/Gruntfile.js b/Gruntfile.js index 884aa0daf8..6967a02e6c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,7 +18,7 @@ module.exports = function(grunt) { repo_url: 'https://github.com/habitrpg/habitrpg', appName : 'HabitRPG', branch_name: 'develop', - grep_commits: '^fix|^feat|^docs|^refactor|^chore|BREAKING' + grep_commits: '^perf|^style|^fix|^feat|^docs|^refactor|^chore|BREAKING' } } },