sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 04:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
12369 commits 1 branch 0 tags 1.6 GiB
Commit graph

1470 commits

Author SHA1 Message Date
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
Blade Barringer
c88f2ce580 refactor: Use resized version of wheelchair for selection 2016-03-24 07:57:57 -05:00
Nick Bunn
0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Sabe Jones
be159adf77 fix(event): pastel skin, not hair 2016-03-23 15:36:24 -04:00
Sabe Jones
1286b6fbee fix(event): make spring hair/skin available server side 2016-03-23 15:36:24 -04:00
Sabe Jones
f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Blade Barringer
9b9722a7b4 chore(i18n): update locales 2016-03-22 17:40:42 -05:00
Bleu
521195ab95 fix: Unify html in translation strings 
Closes #6859
 2016-03-22 17:34:29 -05:00
Blade Barringer
92ac703ecc chore(i18n): update locales 2016-03-22 08:31:14 -05:00
Kaitlin Hipkin
9f0704aa94 modal explaining new class gear is now class-agnostic 2016-03-18 23:23:12 -04:00
Sabe Jones
8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016 
Spring Fling 2016
 2016-03-18 16:08:46 -05:00
Sabe Jones
b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Blade Barringer
cd6ab23106 Merge pull request #6900 from doyler/develop 
Note about weekly progress update (fixes #6884)
 2016-03-18 07:37:32 -05:00
Sabe Jones
10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones
4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00
Blade Barringer
c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys
9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Blade Barringer
3f16cd4fbf refactor: Adjust stat allocation modal 2016-03-16 22:07:00 -05:00