Commit Graph

12348 Commits

Author SHA1 Message Date
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 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 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
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