Commit Graph

2069 Commits

Author SHA1 Message Date
Sabe Jones 18822854f7 fix(static-page): remove timezone handling 2016-05-20 16:53:40 +00:00
Alys 207ed39f36 fix for maintenance window dates properly 2016-05-20 03:42:51 -04:00
Alys 6b31f2845f replace time code with fixed time text 2016-05-20 17:33:21 +10:00
Sabe Jones d221bcc84c Maintenance announcement (#7372)
* chore(news): announce downtime

* fix(news): tweaks and corrections

* fix: Update maintenance page to use dynamic date
2016-05-19 22:28:13 -05: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
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
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
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 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 f415810a0f Merge branch 'markdown_rework' into develop 2016-04-26 12:53:47 -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 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
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
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 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
Ubuntu 13edca4588 chore(news): add skill icon announcement 2016-04-13 21:25:31 +00:00
Sabe Jones 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
Angel Piscola 59749acf50 Fixed reward sound playing after gold subtracted
(cherry picked from commit 2508b5ac18)

closes #7058
fixes #6963
2016-04-12 07:36:44 -05:00
Blade Barringer ecb9e09ad8 fix: Add missing sprite class for skills icon in rewards column
closes #4276
closes #6950
2016-04-11 08:00:42 -05:00
Blade Barringer b4eb386047 chore: Change spells file name to skills 2016-04-11 08:00:10 -05:00
Blade Barringer db62d1add0 fix: correct coupon generation code 2016-04-09 08:03:32 -05:00
Blade Barringer 1bc1968f3a chore: Upgrade winston dependency and remove unused modules 2016-04-08 17:35:03 -05:00
Blade Barringer 3250d9d064 chore: Remove unused qs dependency 2016-04-08 17:35:03 -05:00
Blade Barringer 46681d9a1a chore: Update nodemailer to v1 2016-04-08 17:35:03 -05:00
Blade Barringer 2bbae8c5f5 refactor: Simplify flag_report_email load 2016-04-08 17:14:14 -05:00
Sabe Jones b7d801a603 fix(news): typo 2016-04-08 16:17:51 -05:00
Ubuntu 7118e68cf0 chore(news): Beguilement Strike Bailey 2016-04-08 19:06:09 +00:00
Blade Barringer 7e9163a17f chore: Remove apdex check from new relic monitoring 2016-04-05 20:08:44 -05:00
Blade Barringer 74dace9b5a chore: Re-enable New Relic
closes #7011
2016-04-05 20:08:31 -05:00
Blade Barringer ae14d405cb fix(css): Scope textarea z-index to just task boxes 2016-04-05 20:07:11 -05:00
Sabe Jones 1f6eef0082 Sabrecat/armoire 201604
* WIP(content): add sprites

* feat(content): Armoire and Backgrounds 2016-04
2016-04-05 15:30:01 -05:00
Blade Barringer 7425af4fb4 Merge pull request #7013 from Hus274/develop
Splitting party and boss damage notifications into two code blocks.
2016-04-05 09:01:36 -05:00
MathWhiz c7d058f2bc Add z-index to notes textarea 2016-04-04 20:48:54 -05:00