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
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 2508b5ac1808d1f097a5c06d94a1151437fa76c6)
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
2f715c4530
chore: Compile skill icon sprites
2016-04-11 07:59:53 -05:00
mathwhiz
5b110159a1
Add spell images
2016-04-11 07:59:39 -05:00
Blade Barringer
80c115940e
fix: Correct southpole background
...
closes #7039
closes #7041
2016-04-09 09:31:18 -05:00
Blade Barringer
8ba150074a
chore(i18n): update locales
2016-04-09 09:27:04 -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
3a63896e40
chore: Upgrade dependencies to v3 versions
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
e6b5a6820f
Merge pull request #7044 from HabitRPG/flag_email_refactor
...
refactor: Simplify flag_report_email load
2016-04-08 17:31:13 -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
Blade Barringer
7d17921621
Merge pull request #7020 from MathWhiz/patch-2
...
fix: Allow task notes textarea to rest above other elements when expanded
2016-04-05 08:56:39 -05:00
MathWhiz
c7d058f2bc
Add z-index to notes textarea
2016-04-04 20:48:54 -05:00
Husman
bb373ed93a
Splitting party and boss damage notifications into two code blocks.
...
Splitting the party and boss damage notifications into two code blocks will allow the page to push them to newlines if needed instead of added a scroll bar and making the user scroll to see the entire message.
Related issue: https://github.com/HabitRPG/habitrpg/issues/3453
2016-04-03 10:42:15 -07:00
Alys
0ba47de43d
adjust cron so that it prevents a double cron when timezone decreases (timezoneOffset increases)
...
* start to fix cron for when timezones change
* add some incomplete code
* change cron to identify when timezone changes and run only if both zones agree it should run - BAD - does cron an hour early one day later
* change timezone offset variable names
* improve handling of each individual timezone change possibility
* remove unnecessary casting to number
* remove duplicated code
* finish code for dangerous timezone change
* fix linting errors
* remove console.log lines and other testing code
* add a TODO comment for further actions for timezone changes in the "safe" direction
2016-04-02 11:42:15 +10:00
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
