Blade Barringer
18a3024aea
fix: Correct hourglass test
2016-05-18 10:33:05 -05:00
Blade Barringer
7c96d45e86
feat: Add v3 strings to develop for translating ( #7354 )
2016-05-18 17:25:35 +02:00
Sabe Jones
0d69a504d2
chore(news): Challenge Spotlight
2016-05-17 18:53:58 +00:00
Sabe Jones
beb4a0d8bb
feat(content): May 2016 pet quest ( #7310 )
2016-05-16 15:18:51 -05:00
Sabe Jones
6ceea9346f
chore(news): misc announcements
2016-05-14 20:56:22 +00:00
Lucas Torroba (@zesme)
2a8f24697f
chore(typo): Fix typos in ISSUE_TEMPLATE.md
...
Closes #7202
2016-05-13 12:50:09 -05:00
Sabe Jones
0eb7bc537d
fix(contact): add clear subscription trouble email
2016-05-11 18:43:59 +00:00
Sabe Jones
7f11e766c3
Sabrecat/glasses chairs ( #7182 )
...
* feat(customization): new chairs, eyeglass sprites
* feat(avatar): finish glasses implementation
* fix(test): include glasses in base equipment
2016-05-10 16:07:46 -05:00
Sphinx
7bfd9b0fd9
shieldSpecialSpring2015RogueNotes typo ( #7144 )
2016-05-05 19:55:02 +10:00
Sabe Jones
d5b3bbfaad
Sabrecat/armoire 201605 ( #7142 )
...
* feat(content): May BGs and Armoire
* chore(news): Bailey 20160503
2016-05-03 15:20:00 -05:00
Sabe Jones
166a37d53f
chore(event): end Spring Fling 2016
2016-05-02 01:36:03 +00:00
Matteo Pagliazzi
a0e63c0eb2
use uuid module for uuids
2016-05-01 15:01:00 +02:00
Alys
590e185ecd
fix spelling mistake: reseting to resetting
2016-04-29 18:44:49 -04:00
Sabe Jones
1787342951
chore(news): Last Chance Bailey 201604
2016-04-29 22:16:36 +00:00
Blade Barringer
2aa3a3175f
Merge branch 'develop' into kelsin-develop
2016-04-27 19:11:56 -05:00
Sabe Jones
7bc89aa55c
fix(sprites): updateabee
2016-04-27 17:14:49 +00:00
Sabe Jones
bf7ce46ea4
chore(news): Be-Wilder conclusion
2016-04-27 04:16:35 +00:00
Blade Barringer
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
Blade Barringer
ebe3eefcc5
chore: reorganize quest sprites
2016-04-26 21:13:06 -05:00
Sabe Jones
0d4532c12e
fix(elastic-beanstalk): extend connection timeout for ELB
2016-04-26 19:09:36 +00:00
Blade Barringer
ee3aa056f9
feat: Add eb extension to increase deploy timeout to 30 minutes ( #7049 )
2016-04-26 14:07:28 -05:00
Blade Barringer
f415810a0f
Merge branch 'markdown_rework' into develop
2016-04-26 12:53:47 -05:00
Blade Barringer
b5de787c4d
refactor: Remove uneeded emoji images
2016-04-26 12:53:18 -05:00
Blade Barringer
e88d0ff450
feat: switch to version number for habitica-markdown
2016-04-26 12:52:59 -05:00
Blade Barringer
4f1a4393e1
fix: Adjust spacing of emoji in tags
2016-04-26 12:50:37 -05:00
Blade Barringer
e7315253dd
feat: Switch out js-emoji for habtiica-markdown
2016-04-26 08:19:47 -05:00
Sabe Jones
d96b13ed43
chore(news): Floral Potions Bailey
2016-04-25 21:20:21 +00:00
Sabe Jones
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
Blade Barringer
b86348dd0e
refactor: Remove MOBILE_APP logic
2016-04-25 07:44:05 -05:00
Blade Barringer
ad57dedecb
refactor: Swap out remarkable for habitica flavored markdown-it
2016-04-25 07:36:02 -05:00
Sabe Jones
8355dbe63f
chore(news): Bewildered Bailey
2016-04-23 04:00:30 +00:00
Sabe Jones
2cdb30bd5b
fix(NR): remove metric check that crashed
2016-04-21 22:47:04 +00:00
Sabe Jones
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
Sabe Jones
43f8e943f6
Merge pull request #7097 from vIiRuS/patch-7
...
Fix timezone issue with iOS app
2016-04-21 12:54:44 -05:00
Phillip Thelen
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
Blade Barringer
5c1d86c513
Merge branch 'develop' into MathWhiz-mount-images
2016-04-21 07:52:21 -05:00
mathwhiz
45bc69308c
mounts
2016-04-20 23:52:26 +00:00
Alys
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
Sabe Jones
cdf4a384d6
fix(sprites): add Bee mount icon
2016-04-19 21:07:03 +00:00
lucubro
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
Alys
5d040ac442
change habitrpg.com to habitica.com in new profile edit message
2016-04-19 10:39:04 +10:00
MathWhiz
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
MathWhiz
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
Sabe Jones
62f44771af
fix(stable): rename Bumblebees throughout code
2016-04-18 21:02:24 +00:00
Sabe Jones
881cf0292d
chore(news): mobile and Beguilement Bailey
2016-04-15 18:46:02 +00:00
Sabe Jones
c608ac9ecc
fix(news): Erratum
2016-04-15 11:53:58 -05:00
Blade Barringer
227797a393
Merge pull request #7079 from crookedneighbor/eslint-config
...
chore: Switch to custom eslint-config
2016-04-15 09:15:39 -05:00
Blade Barringer
10936d9a4d
chore: Switch to custom eslint-config
2016-04-15 09:03:59 -05:00
Sabe Jones
ffb3ed0aa4
chore(news): annouce Android update
2016-04-14 23:48:45 +00:00
Blade Barringer
e70add1ac4
chore: lint files
2016-04-13 20:11:07 -05:00
