Sabe Jones
|
41b3ee1df0
|
fix(world-boss): Correct generic Tavern text
|
2016-03-31 23:45:34 -05:00 |
|
Sabe Jones
|
a90562e3ad
|
Merge pull request #6992 from HabitRPG/sabrecat/spring-boss
Spring Fling 2016 World Boss
|
2016-03-31 21:51:10 -05:00 |
|
Sabe Jones
|
3281894d83
|
chore(news): World Boss Bailey
|
2016-03-31 19:54:13 -04:00 |
|
Sabe Jones
|
7aa668be4e
|
chore(gulp): compile sprites
|
2016-03-31 18:41:10 -05:00 |
|
Sabe Jones
|
a07aed331c
|
fix(world-boss): add chat message, Bailey handling, animation
|
2016-03-31 19:38:43 -04:00 |
|
Sabe Jones
|
def6b6cd5c
|
chore(gulp): compile sprites
|
2016-03-31 17:20:30 -05:00 |
|
Sabe Jones
|
f51653b7a5
|
WIP(world-boss): partial build
|
2016-03-31 17:29:21 -04:00 |
|
Sabe Jones
|
4fa8c6dfbd
|
chore(news): Bailey 2016-03-30
|
2016-03-30 15:39:12 -04:00 |
|
Sabe Jones
|
95fa91522a
|
Merge pull request #6955 from HabitRPG/wheelchair
Wheelchair
|
2016-03-30 14:25:12 -05:00 |
|
Blade Barringer
|
5c34f7586d
|
Merge pull request #6984 from lbraun/develop
Remove extra 'it' from spec description
|
2016-03-29 23:29:12 -04:00 |
|
Lucas Braun
|
ee9dc7c196
|
Remove extra 'it' from spec description
|
2016-03-29 22:11:36 -04:00 |
|
Alys
|
9a1e7a0ad7
|
Merge pull request #6981 from Alys/develop
cron timezone fix (stage 1): cron records current timezone in preferences.timezoneOffsetAtLastCron
|
2016-03-29 23:05:50 +10:00 |
|
Alys
|
ae9e6fbe30
|
allow cron to record user's current timezone offset in preferences.timezoneOffsetAtLastCron (initial stage of cron timezone fix for https://github.com/HabitRPG/habitrpg/issues/3806 )
|
2016-03-29 22:34:23 +10:00 |
|
Blade Barringer
|
a9d227b490
|
Merge branch 'develop' into wheelchair
|
2016-03-28 21:12:52 -05:00 |
|
Blade Barringer
|
f4b43f55f0
|
refactor: Remove express-csv dependency
|
2016-03-28 10:24:29 -05:00 |
|
Blade Barringer
|
cb5a79b1bf
|
chore: Set express session options
|
2016-03-28 10:24:01 -05:00 |
|
Blade Barringer
|
b1c3b8e7e7
|
chore: Update res.json(code, json) to res.status(code).json(json)
|
2016-03-28 10:24:00 -05:00 |
|
Blade Barringer
|
cf8153fd93
|
chore: Update res.send(code) to res.sendStatus(code)
|
2016-03-28 10:24:00 -05:00 |
|
Blade Barringer
|
2477507b2e
|
chore: Set extended option for bodyParser
See
3f1b022477/lib/types/urlencoded.js (L41-L44)
|
2016-03-28 10:24:00 -05:00 |
|
Blade Barringer
|
41b961004a
|
chore: upgrade express to version 4
|
2016-03-28 10:24:00 -05:00 |
|
Blade Barringer
|
6552f04b0c
|
chore(i18n): update locales
|
2016-03-28 09:58:32 -05:00 |
|
Blade Barringer
|
cd6adf2421
|
fix: correct wheelchair spelling
|
2016-03-24 21:31:20 -05:00 |
|
Sabe Jones
|
2652de88ae
|
Merge pull request #6940 from HabitRPG/sabrecat/mystery-201603
Subscriber items 2016-03
|
2016-03-24 12:33:06 -05:00 |
|
Blade Barringer
|
2d55a2a31d
|
chore: compile sprites
|
2016-03-24 07:57:57 -05:00 |
|
Blade Barringer
|
c88f2ce580
|
refactor: Use resized version of wheelchair for selection
|
2016-03-24 07:57:57 -05:00 |
|
Blade Barringer
|
f33469609c
|
Adjust sprite task to not include wheelchair images in the customize-option handling
|
2016-03-24 07:57:50 -05:00 |
|
Nick Bunn
|
0f9cf57613
|
feat: Add wheelchair to avatar customization
|
2016-03-24 07:57:13 -05:00 |
|
Blade Barringer
|
01a7132b0b
|
refactor: Extract play reward sound logic into function
|
2016-03-23 17:55:44 -05:00 |
|
Kenny Carlsen
|
7b708f51ba
|
Proposed bug fix, issue #6668 - erroneous reward purchase sound
|
2016-03-23 17:55:41 -05:00 |
|
Sabe Jones
|
17b02f2867
|
fix(news): missing promo
|
2016-03-23 15:47:22 -04:00 |
|
Sabe Jones
|
ba1cc67654
|
chore(news): fill out remaining Bailey
|
2016-03-23 15:36:24 -04:00 |
|
Sabe Jones
|
be159adf77
|
fix(event): pastel skin, not hair
|
2016-03-23 15:36:24 -04:00 |
|
Sabe Jones
|
1286b6fbee
|
fix(event): make spring hair/skin available server side
|
2016-03-23 15:36:24 -04:00 |
|
Sabe Jones
|
f7027b5cf3
|
feat(event): subscriber items 2016-03
|
2016-03-23 15:36:24 -04:00 |
|
Blade Barringer
|
2a4a8466ca
|
Merge pull request #6948 from MathWhiz/patch-1
Fix ISSUE_TEMPLATE.md
|
2016-03-23 11:48:13 -05:00 |
|
MathWhiz
|
802b8bed0a
|
Fix ISSUE_TEMPLATE.md
Added parentheses around two of the comments to hide them.
|
2016-03-23 09:11:08 -05:00 |
|
Blade Barringer
|
a958fefa6b
|
Merge pull request #6946 from HabitRPG/update_pageres
Update pageres
|
2016-03-23 08:36:52 -05:00 |
|
Blade Barringer
|
ef2a1f5929
|
chore: Update pageres
Removes dependency on memoize-async, which was unpublished:
https://medium.com/@azerbike/i-ve-just-liberated-my-modules-9045c06be67c#.tlcdr5ieg
|
2016-03-23 08:16:39 -05:00 |
|
Blade Barringer
|
fd10422e0c
|
tests: Add preliminary tests around send message and send gift
|
2016-03-22 21:49:27 -05:00 |
|
Blade Barringer
|
f5d4eba292
|
fix: Default message to '' when not passed in sendGift route
|
2016-03-22 21:49:27 -05:00 |
|
Brian Murray
|
eaea55687b
|
Make change regarding pluralization of gem gift message easier to read and not one long line
|
2016-03-22 21:49:27 -05:00 |
|
Brian Murray
|
369386e370
|
Only add an 's' to months of subscription or gems given if they are not 1.
|
2016-03-22 21:49:22 -05:00 |
|
Blade Barringer
|
9b9722a7b4
|
chore(i18n): update locales
|
2016-03-22 17:40:42 -05:00 |
|
Bleu
|
521195ab95
|
fix: Unify html in translation strings
Closes #6859
|
2016-03-22 17:34:29 -05:00 |
|
MathWhiz
|
86516b5e20
|
Update presskit
|
2016-03-22 08:41:02 -05:00 |
|
Blade Barringer
|
92ac703ecc
|
chore(i18n): update locales
|
2016-03-22 08:31:14 -05:00 |
|
Blade Barringer
|
3add287a85
|
Merge branch 'khipkin-fix_class_change_gear_modal' into develop
|
2016-03-22 08:10:55 -05:00 |
|
MathWhiz
|
c70b40e0a3
|
Add pull request instructions to CONTRIBUTING.MD
|
2016-03-22 07:59:13 -05:00 |
|
Blade Barringer
|
bbcef441bf
|
Adjust template instructions
|
2016-03-22 07:59:13 -05:00 |
|
mathwhiz
|
a5b7066358
|
Add templates for issues and pull requests
|
2016-03-22 07:59:06 -05:00 |
|