590e185ecd
fix spelling mistake: reseting to resetting
2016-04-29 18:44:49 -04:00
1787342951
chore(news): Last Chance Bailey 201604
2016-04-29 22:16:36 +00:00
2aa3a3175f
Merge branch 'develop' into kelsin-develop
2016-04-27 19:11:56 -05:00
7bc89aa55c
fix(sprites): updateabee
2016-04-27 17:14:49 +00:00
bf7ce46ea4
chore(news): Be-Wilder conclusion
2016-04-27 04:16:35 +00:00
a326873935
chore: Add emoji lib back in
...
The 3rd party chat extension was breaking because this library was
missing. Remove this after the chat extension is updated
https://github.com/Horacious/HabitRPG-Chat-Extension/pull/40
2016-04-26 23:07:15 -05:00
ebe3eefcc5
chore: reorganize quest sprites
2016-04-26 21:13:06 -05:00
0d4532c12e
fix(elastic-beanstalk): extend connection timeout for ELB
2016-04-26 19:09:36 +00:00
ee3aa056f9
feat: Add eb extension to increase deploy timeout to 30 minutes ( #7049 )
2016-04-26 14:07:28 -05:00
f415810a0f
Merge branch 'markdown_rework' into develop
2016-04-26 12:53:47 -05:00
b5de787c4d
refactor: Remove uneeded emoji images
2016-04-26 12:53:18 -05:00
e88d0ff450
feat: switch to version number for habitica-markdown
2016-04-26 12:52:59 -05:00
4f1a4393e1
fix: Adjust spacing of emoji in tags
2016-04-26 12:50:37 -05:00
e7315253dd
feat: Switch out js-emoji for habtiica-markdown
2016-04-26 08:19:47 -05:00
d96b13ed43
chore(news): Floral Potions Bailey
2016-04-25 21:20:21 +00:00
974896ce7b
feat(events): April Mystery and Floral Potions ( #7107 )
...
* feat(events): April Mystery and Floral Potions
Also reorganizes the spritesmith folders for mounts so that head, body, and icon sprites are in separate folders.
2016-04-25 14:17:31 -05:00
b86348dd0e
refactor: Remove MOBILE_APP logic
2016-04-25 07:44:05 -05:00
ad57dedecb
refactor: Swap out remarkable for habitica flavored markdown-it
2016-04-25 07:36:02 -05:00
8355dbe63f
chore(news): Bewildered Bailey
2016-04-23 04:00:30 +00:00
2cdb30bd5b
fix(NR): remove metric check that crashed
2016-04-21 22:47:04 +00:00
867146dc19
fix(xss): Update site to use remarkable instead of marked
...
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
2016-04-21 13:23:53 -05:00
43f8e943f6
Merge pull request #7097 from vIiRuS/patch-7
...
Fix timezone issue with iOS app
2016-04-21 12:54:44 -05:00
a5fbc08016
Set timezoneOffset to 0 as default
...
Fixes an issue with the iOS app not setting the offset, when no initial value exists.
2016-04-21 19:41:39 +02:00
5c1d86c513
Merge branch 'develop' into MathWhiz-mount-images
2016-04-21 07:52:21 -05:00
45bc69308c
mounts
2016-04-20 23:52:26 +00:00
823f51e727
revert npm 3 to npm 2 for vagrant installs; adjust instructions so novice users don't try to run commands before doing 'vagrant ssh'
2016-04-20 09:25:05 +10:00
cdf4a384d6
fix(sprites): add Bee mount icon
2016-04-19 21:07:03 +00:00
ea9900d27f
Fix installation of test dependencies in vagrant provisioning ( #7069 )
...
* Fix #7054 installation test dependencies in vagrant provisioning
* Fix small typo in output during vagrant provisioning
2016-04-19 17:28:17 +10:00
5d040ac442
change habitrpg.com to habitica.com in new profile edit message
2016-04-19 10:39:04 +10:00
ed49a377e1
add community guidelines info to profile editing ( #7086 )
...
* add community guidelines info to profile editing
* Update profile.jade
2016-04-19 10:15:21 +10:00
f1788080da
Add list of Featured third-party Apps ( #7046 )
...
* add list of featured third-party apps
* Add comma
* add descriptions
* add description to other
* add table
* add description to other
Conflicts:
common/locales/en/settings.json
website/views/options/settings.jade
* Update settings.json
* Sort extensions by name
2016-04-19 08:21:07 +10:00
62f44771af
fix(stable): rename Bumblebees throughout code
2016-04-18 21:02:24 +00:00
881cf0292d
chore(news): mobile and Beguilement Bailey
2016-04-15 18:46:02 +00:00
c608ac9ecc
fix(news): Erratum
2016-04-15 11:53:58 -05:00
227797a393
Merge pull request #7079 from crookedneighbor/eslint-config
...
chore: Switch to custom eslint-config
2016-04-15 09:15:39 -05:00
10936d9a4d
chore: Switch to custom eslint-config
2016-04-15 09:03:59 -05:00
ffb3ed0aa4
chore(news): annouce Android update
2016-04-14 23:48:45 +00:00
e70add1ac4
chore: lint files
2016-04-13 20:11:07 -05:00
13edca4588
chore(news): add skill icon announcement
2016-04-13 21:25:31 +00:00
7bb6f968b4
feat(content): Pet Quest 2016-04 ( #7071 )
...
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
2016-04-13 12:15:38 -05:00
59749acf50
Fixed reward sound playing after gold subtracted
...
(cherry picked from commit 2508b5ac18closes #7058
fixes #6963
2016-04-12 07:36:44 -05:00
ecb9e09ad8
fix: Add missing sprite class for skills icon in rewards column
...
closes #4276
closes #6950
2016-04-11 08:00:42 -05:00
b4eb386047
chore: Change spells file name to skills
2016-04-11 08:00:10 -05:00
2f715c4530
chore: Compile skill icon sprites
2016-04-11 07:59:53 -05:00
5b110159a1
Add spell images
2016-04-11 07:59:39 -05:00
80c115940e
fix: Correct southpole background
...
closes #7039
closes #7041
2016-04-09 09:31:18 -05:00
8ba150074a
chore(i18n): update locales
2016-04-09 09:27:04 -05:00
db62d1add0
fix: correct coupon generation code
2016-04-09 08:03:32 -05:00
1bc1968f3a
chore: Upgrade winston dependency and remove unused modules
2016-04-08 17:35:03 -05:00
3a63896e40
chore: Upgrade dependencies to v3 versions
2016-04-08 17:35:03 -05:00
Alys