sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
12103 commits 3 branches 0 tags 1.6 GiB
Commit graph

464 commits

Author SHA1 Message Date
Sabe Jones
f7c9769aab chore(event): revert Valentine's 2016-02-15 14:48:39 -05:00
Sabe Jones
e1b13db6e8 feat(quests): pets 201602 
Also enables the Valentine's Day card for selection in the Market.
 2016-02-08 16:20:05 -05:00
Sabe Jones
a3251ac9a0 fix(groups): DRY profile name logic 2016-02-05 15:26:15 -05:00
Sabe Jones
dd3918436f fix(groups): don't show HP in Guilds 2016-02-05 15:19:23 -05:00
Sabe Jones
e0effcdf5f Merge pull request #6626 from taldin/party_health 
Add HP to party page
 2016-02-04 15:56:39 -06:00
Taldin
51e579cb6a Update for cleaner code. 
Per Alys and crookedneighbor's suggestion.
 2016-02-02 10:01:08 -08:00
Sabe Jones
0fcdc49adb chore(event): end Winter Wonderland 2016-02-01 17:01:17 -05:00
Taldin
12749ba497 fixed it so infinite decimals wouldn't print 
Added .toFixed(1) call.
 2016-02-01 10:14:42 -08:00
Taldin
e08f77651b Add HP to party page 
Party page now displays each party member's health next to their name
(healers don't have to click on each party member to see their health)
 2016-01-30 16:32:10 -08:00
Shellbot
7d0ad86c43 Color code quest accepted/rejected text 2016-01-22 21:56:39 +00:00
Jason Vinson
2989057dd3 Fix for issue #5182: Allow cancel editing group infobox 2016-01-18 22:39:06 -06:00
Sabe Jones
c6b4b24052 Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks 
Text and visual tweaks for Gems
 2016-01-18 15:25:58 -06:00
Sabe Jones
23720e0a43 style(subscription): more tweaks 2016-01-15 14:10:02 -05:00
Luveluen
5315cc9055 Update character.json to separate optOut into two translation strings 
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.

Fixes #6511
Closes #6518
 2016-01-14 20:40:07 -06:00
Georgi Gardev
e761315c74 Remove tooltip for 'reverse chat messages' checkbox 
Fixes #6517
Closes #6525
 2016-01-14 20:28:08 -06:00
Sabe Jones
2db1ef0f7a style(subscriptions): Gem layout feedback 2016-01-12 15:00:07 -05:00
AnitaYCheng
bf6ebd88f6 Modifications to settings mixin and misc last changes. 2016-01-12 15:00:07 -05:00
Sabe Jones
dba620ee7a Merge pull request #6417 from GeorgeSG/reverse-chat-option 
Add option to reverse chat order
 2016-01-11 12:55:28 -06:00
Sabe Jones
1b7f17cbd2 chore(news): Bailey 2016-01-08 2016-01-08 16:28:49 -05:00
Sabe Jones
eadf967c9f Merge pull request #6409 from pnrich/flag-text 
add extra text to flagging confirmation dialog and to top of PM inbox -- Fix for issue #4648, parts 3 and 4
 2016-01-08 14:05:22 -06:00
Sabe Jones
cb984d8d22 fix(event): remove NYE card 2016-01-04 18:27:52 -05:00
Sabe Jones
cc00602112 fix(event): remove magic potions 2016-01-04 11:56:34 -05:00
Sabe Jones
6c3e8e2081 feat(event): more NYE 2015-12-30 16:58:57 -05:00
Georgi Gardev
42d09bd758 Reverse order of chat messages from chat box 2015-12-30 23:47:10 +02:00
Georgi Gardev
beaf0b83bb Add option to reverse order of chat messages 2015-12-30 23:47:03 +02:00
Blade Barringer
b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Paul Rich
c9fdff38f9 Fix for issue #4648, parts 3 and 4 2015-12-28 14:24:48 -05:00
Sabe Jones
468198b9e2 feat(mystery): subscriber items 2015-12 
Also enables the Snowball in the Seasonal Shop.
 2015-12-22 16:16:30 -05:00
Sabe Jones
6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Nathan Maton
35a921bf43 feat(content): Make mystery set strings translatable 
Squashed and cleaned up version of
https://github.com/HabitRPG/habitrpg/pull/6367
 2015-12-15 08:47:13 -06:00
Joy Clark
7628882f24 use new css class 2015-12-08 13:22:13 +01:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions 
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
 2015-12-04 17:20:33 -05:00
Alys
d63cf64944 allow Fetch Recent Messages button to appear on newly-created groups 2015-12-03 10:03:59 +10:00
Sabe Jones
78890012c1 Merge pull request #6305 from markhowson/fix_narrow_guild_desc 
Fixes #6252 - Guild description is too narrow on guild page
 2015-11-30 13:16:59 -06:00
Mark Howson
f67bd384d4 Moved guild leader message down slightly 2015-11-26 18:47:54 +00:00
Sabe Jones
ad347090c3 Merge remote-tracking branch 'origin/pr/5968' into develop 
Conflicts:
	website/views/options/social/challenge-box.jade
 2015-11-26 13:33:33 -05:00
Sabe Jones
0a90c7c66d Merge pull request #6270 from Arodang/challenge-tag-field-character-limit 
Removed Challenge Tag Maxlength
 2015-11-26 11:15:23 -06:00
Mark Howson
fa462a1829 Renamed to wide-popover as it's the only remaining use 2015-11-26 12:56:22 +00:00
Mark Howson
848a96a9fa Fix for #6252 2015-11-26 11:56:32 +00:00
Alys
5461345770 remove trailing whitespace 2015-11-26 08:49:40 +10:00
Keith Holliday
83934bf5c9 Added markdown directive to challenge titles 2015-11-26 08:49:40 +10:00
Alys
e04066e45f Merge pull request #6228 from AminArria/timezone-information 
Timezone information
 2015-11-24 21:21:10 +10:00
Arodang
0b1758f5c6 Removed col-lg-6 class from tags and prize 2015-11-20 18:17:51 -05:00
arodang
b286a93006 removed challenge tag maxlength, reduced tag and prize field size 2015-11-19 23:21:15 -05:00
Oliver Eyton-Williams
e811693752 Subscriber benefits changed to be dynamic. Fixed arithmetic of gemGoldCap. 2015-11-16 15:11:11 +01:00
Amin Arria
b87592c8a7 Changed p blocks to single line 2015-11-15 23:00:44 -04:30
Amin Arria
807726305f Added timezone form 2015-11-12 19:27:25 -04:30
Sabe Jones
eed4207c6d Merge branch 'develop' into sabrecat/more-modals 
Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json
 2015-11-09 16:24:17 -05:00
Sabe Jones
502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00
Blade Barringer
24480e5f04 Merge branch 'develop' into srrvnn-develop 2015-11-03 07:31:48 -06:00