diff --git a/CHANGELOG.md b/CHANGELOG.md index 57fd102308..3442f3253f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,3 @@ - **challenges:** markdown in challenge-descriptions ([41233c7b](https://github.com/habitrpg/habitrpg/commits/41233c7b167905eeccfdff5589789e002ec23f97)) - -## Breaking Changes - - diff --git a/EXTENDEDCHANGELOG.md b/EXTENDEDCHANGELOG.md index 8f05860dfb..96315f83d1 100644 --- a/EXTENDEDCHANGELOG.md +++ b/EXTENDEDCHANGELOG.md @@ -6,3 +6,21 @@ - **#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)) + + +## Chore + +- **archived tests:** Moving unused tests, casper stuff, and api.mocha.coffee into archive directory. we could depend on git history, but I want to keep them publicly visible to developers for now since they may contain valuable test worth porting to our new setup. +- **changelog:** + - update CHANGELOG, Grunt changelog task + - add git-changelog config and sample CHANGELOG.md + - add commit-msg hook to verify commit messages +