Commit graph

1487 commits

Author SHA1 Message Date
Blade Barringer
ef3a2fc286 chore(i18n): update locales 2016-05-21 09:14:25 -05:00
Blade Barringer
25c69afb5f chore: Update i18n locales 2016-05-20 06:55:50 -05:00
Alys
207ed39f36 fix for maintenance window dates properly 2016-05-20 03:42:51 -04:00
Sabe Jones
908e80d2ca fix(announcement): upcoming features wording 2016-05-19 22:30:31 -05: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
Blade Barringer
7c96d45e86 feat: Add v3 strings to develop for translating (#7354) 2016-05-18 17:25:35 +02: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
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
7bc89aa55c fix(sprites): updateabee 2016-04-27 17:14:49 +00:00
Blade Barringer
ebe3eefcc5 chore: reorganize quest sprites 2016-04-26 21:13:06 -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
e7315253dd feat: Switch out js-emoji for habtiica-markdown 2016-04-26 08:19:47 -05: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
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
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
Sabe Jones
cdf4a384d6 fix(sprites): add Bee mount icon 2016-04-19 21:07:03 +00: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
Blade Barringer
10936d9a4d chore: Switch to custom eslint-config 2016-04-15 09:03:59 -05: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
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
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
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
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
95fa91522a Merge pull request #6955 from HabitRPG/wheelchair
Wheelchair
2016-03-30 14:25:12 -05: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
6552f04b0c chore(i18n): update locales 2016-03-28 09:58:32 -05:00
Blade Barringer
cd6adf2421 fix: correct wheelchair spelling 2016-03-24 21:31:20 -05:00
Blade Barringer
2d55a2a31d chore: compile sprites 2016-03-24 07:57:57 -05:00