Merge branch 'develop' into TheHollidayInn-challenges-owner-filter

.gitignore

@@ -23,7 +23,8 @@ test/*.js
 test/*.map
 website/public/docs
 *.sublime-workspace
+coverage
 coverage.html
 common/dist/scripts/habitrpg-shared.js
 
-test/spec/translations.js
+test/spec/mocks/translations.js

.jshintrc

@@ -5,6 +5,7 @@
 
 	"browser": true,
 	"node": true,
+  "mocha": true,
 
 	"asi": true,
 	"boss": true,

.travis.yml

@@ -11,3 +11,5 @@ before_script:
   - cp config.json.example config.json
   - "until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done"
   - "export DISPLAY=:99"
+after_script:
+  - "./node_modules/.bin/lcov-result-merger 'coverage/**/*.info' | ./node_modules/coveralls/bin/coveralls.js"

CHANGELOG.md

@@ -1,3 +0,0 @@
-<a name="">My app - Changelog</a>
-#  (2015-03-28)
-

Gruntfile.js

@@ -31,7 +31,7 @@ module.exports = function(grunt) {
         // For hair, skins, beards, etc. we want to output a '.customize-options.WHATEVER' class, which works as a
         // 60x60 image pointing at the proper part of the 90x90 sprite.
         // We set up the custom info here, and the template makes use of it.
-        if (sprite.name.match(/hair|skin|beard|mustach|shirt|flower/) || sprite.name=='head_0') {
+        if (sprite.name.match(/hair|skin|beard|mustach|shirt|flower|^headAccessory_special_\w+Ears/) || sprite.name=='head_0') {
           sprite.custom = {
             px: {
               offset_x: "-" + (sprite.x + 25) + "px",
@@ -57,25 +57,6 @@ module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
-    git_changelog: {
-        minimal: {
-            options: {
-                repo_url: 'https://github.com/habitrpg/habitrpg',
-                appName : 'HabitRPG',
-                branch_name: 'develop'
-            }
-        },
-        extended: {
-            options: {
-                file: 'EXTENDEDCHANGELOG.md',
-                repo_url: 'https://github.com/habitrpg/habitrpg',
-                appName : 'HabitRPG',
-                branch_name: 'develop',
-                grep_commits: '^perf|^style|^fix|^feat|^docs|^refactor|^chore|BREAKING'
-            }
-        }
-    },
-
     karma: {
       unit: {
         configFile: 'karma.conf.js'
@@ -174,7 +155,7 @@ module.exports = function(grunt) {
 
     watch: {
       dev: {
-        files: ['website/public/**/*.styl'], // 'public/**/*.js' Not needed because not in production
+        files: ['website/public/**/*.styl', 'common/script/**/*.coffee'], // 'public/**/*.js' Not needed because not in production
         tasks:  [ 'build:dev' ],
         options: {
           nospawn: true
@@ -239,7 +220,7 @@ module.exports = function(grunt) {
     require('coffee-script');
     var i18n  = require('./website/src/i18n'),
         fs    = require('fs');
-    fs.writeFileSync('test/spec/translations.js',
+    fs.writeFileSync('test/spec/mocks/translations.js',
       "if(!window.env) window.env = {};\n" +
       "window.env.translations = " + JSON.stringify(i18n.translations['en']) + ';');
   });
@@ -271,6 +252,5 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-spritesmith');
   grunt.loadNpmTasks('grunt-hashres');
   grunt.loadNpmTasks('grunt-karma');
-  grunt.loadNpmTasks('git-changelog');
 
 };

README.md

@@ -1,4 +1,4 @@
-HabitRPG [![Build Status](https://travis-ci.org/HabitRPG/habitrpg.png?branch=develop)](https://travis-ci.org/HabitRPG/habitrpg) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.png)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE) [![Dependency Status](https://gemnasium.com/HabitRPG/habitrpg.svg)](https://gemnasium.com/HabitRPG/habitrpg)
+HabitRPG [![Build Status](https://travis-ci.org/HabitRPG/habitrpg.png?branch=develop)](https://travis-ci.org/HabitRPG/habitrpg) [![Code Climate](https://codeclimate.com/github/HabitRPG/habitrpg.png)](https://codeclimate.com/github/HabitRPG/habitrpg) [![Coverage Status](https://coveralls.io/repos/HabitRPG/habitrpg/badge.svg?branch=develop)](https://coveralls.io/r/HabitRPG/habitrpg?branch=develop) [![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=68393)](https://www.bountysource.com/trackers/68393-habitrpg?utm_source=68393&utm_medium=shield&utm_campaign=TRACKER_BADGE) [![Dependency Status](https://gemnasium.com/HabitRPG/habitrpg.svg)](https://gemnasium.com/HabitRPG/habitrpg)
 ===============
 
 [HabitRPG](https://habitrpg.com) is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.

archive/CHANGELOG_ARCHIVED.md

@@ -0,0 +1,34 @@
+<a name="">My app - Changelog</a>
+#  (2015-05-08)
+
+## Bug Fixes
+
+- **Spring:** WHO IS LESLIE
+  ([6685e935](watch/commits/6685e93554a1274dedb55dae054e787fb80eb440))
+- **invite-friends:** text should be valid for both parties and guilds
+  ([54e82a14](watch/commits/54e82a14a252c3b9923449a7ef7cee6033a5d160))
+- **mystery:** It's 2015 now, Sabe
+  ([00252f20](watch/commits/00252f200481f06de9bccd1e55275d5366b03919))
+- **scoring:** move gainMP into score
+  ([2fc0cb8f](watch/commits/2fc0cb8fa1b3b5975c16653cb110be2f03b5427e))
+- **slimes:** Tweaks and missing sprite
+  ([7d1a58ca](watch/commits/7d1a58ca002af9dac19aba65d6465bd23b28d649))
+
+
+## Features
+
+- **Spring:** Flung
+  ([d50d4ad8](watch/commits/d50d4ad8bb0f89e39ceb6562e0f8f392f94b5444))
+- **emails:** add support for weekly recap emails
+  ([37f7db3c](watch/commits/37f7db3c4e3859d03fd55a44e63819e273a06442))
+- **i18n:** upload japanese, serbian and chinese (taiwan)
+  ([ee7ba19e](watch/commits/ee7ba19ed17e72b33cbef8a324266617d384f852))
+- **mystery:** April Subscribee Items
+  ([7a7fc968](watch/commits/7a7fc96818ffd7f92738e8c6cc8a59e48d60597d))
+- **pets:** Slime Quest
+  ([f13c6cba](watch/commits/f13c6cba0026c645b19a0b1355ba2c5b27f80878))
+- **quests:** Boss damage from Habits
+  ([43dcded0](watch/commits/43dcded051b602d8a4efc30eef45365abfd238b4))
+- **scoring:** MP gain from Habits and Dailies
+  ([7b22244f](watch/commits/7b22244f0123cf649c9f2aada0811f35a565688d))
+

bower.json

@@ -33,7 +33,7 @@
     "Angular-At-Directive": "git://github.com/snicker/Angular-At-Directive#master",
     "js-emoji": "git://github.com/snicker/js-emoji#master",
     "sticky": "*",
-    "swagger-ui": "git://github.com/wordnik/swagger-ui.git",
+    "swagger-ui": "git://github.com/wordnik/swagger-ui.git#v2.0.24",
     "ngInfiniteScroll": "1.0.0",
     "jquery-colorbox": "~1.4.36",
     "pnotify": "~1.3.1",

common/css/index.css

@@ -3,11 +3,11 @@
 }*/
 
 /* Comment out for holiday events */
-/* .npc_ian {
+.npc_ian {
   background: url("/common/img/sprites/npc_ian.gif") no-repeat;
   width: 78px;
   height: 135px;
-} */
+}
 
 .Gems {
   display:inline-block;
@@ -37,6 +37,12 @@
   margin-right: 10px;
 }
 
+.multi-achievement {
+  margin: auto;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+}
+
 [class*="Mount_Head_"], [class*="Mount_Body_"]{
   margin-top:18px; /* Sprite accommodates 105x123 box */
 }