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

1236 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
d3520e48e4 feat(quests): lvl 15 ATOM quest drop 2014-08-12 16:18:08 -07:00
Tyler Renelle
431b1da73e Merge pull request #273 from efim/develop 
Added notification to challenge prize pop,
 2014-08-08 08:04:22 -06:00
efim
4deb824901 Added notification to challenge prize pop, for issue #2094, until gems get refunded on challenge cancelation. 2014-08-08 02:47:25 +04:00
Tyler Renelle
abdc16798d Revert "Change newPassSent to reflect 'Reset Password' not failing on non-existent email" 
This reverts commit 2d2c2d27a1.
 2014-08-07 08:32:25 -06:00
Tyler Renelle
b8fe6903b3 Merge pull request #259 from 3onyc/security/prevent-email-disclosure 
Change newPassSent to reflect 'Reset Password' not failing on non-existent email.
 2014-08-06 18:38:46 -06:00
Tyler Renelle
33b3448e1f fix(backgrounds): borders 2014-08-05 20:53:20 -06:00
Tyler Renelle
a083d4cb60 Merge pull request #271 from lemoness/develop 
Background Borders
 2014-08-05 19:24:39 -06:00
Lemoness
7fe4628f1d Background Borders 2014-08-05 18:08:44 -07:00
Tyler Renelle
b73cc259b2 feat(backgrounds): add august bgs set 2014-08-05 15:16:31 -06:00
deilann
d351f85264 Merge pull request #269 from vIiRuS/develop 
Make sleeping in Inn more obvious
 2014-08-04 16:40:08 -07:00
Matteo Pagliazzi
30dabb319c chore(i18n): update locales 2014-08-04 21:51:39 +02:00
Phillip Thelen
766f663b02 Add skin images with sleeping eyes and make ZZZ more visible 2014-08-03 20:33:21 +02:00
Matteo Pagliazzi
3356f45f50 chore(i18n): update locales 2014-08-03 15:30:06 +02:00
Alice Harris
a44272c7c8 Merge pull request #268 from Alys/defaultAvatar 
rename Head section, add title for new Hairstyle subsection
 2014-08-03 08:22:35 +10:00
Jeremy Lee
09dd0663e7 rename Head section, add title for new Hairstyle subsection https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 08:18:17 +10:00
Matteo Pagliazzi
d1860c3ffc chore(i18n): update locales 2014-08-02 10:29:09 +02:00
Alice Harris
8dafc72b7d Merge pull request #249 from Alys/questWarning 
change quest warning to match current behaviour
 2014-08-02 13:10:08 +10:00
Alice Harris
bb9899b7ce Merge pull request #266 from Alys/modsColours 
remove redundant message in Tavern now that mod names are styled
 2014-08-02 12:57:39 +10:00
Alice Harris
ba42b3e805 Merge pull request #267 from Alys/playerTiers 
add texts for new moderator/guardian level, and "staff" and "tier"
 2014-08-02 12:54:18 +10:00
Jeremy Lee
ddb669834b add texts for new mdoerator/guardian level, and related stuff 2014-08-02 10:45:16 +10:00
Jeremy Lee
1acbde6e3a remove redundant color message now that correct styling is on moderator names above Tavern chat 2014-08-02 07:29:16 +10:00
Tyler Renelle
42dc537f6d Merge pull request #258 from jobywalker/candycane-perception 
Candy Cane text boosts Perception not Strength
 2014-08-01 15:26:23 -06:00
Alice Harris
2a28b208d9 Merge pull request #254 from Alys/chillingFrostDailiesHurt 
explain that Chilling Frost does not stop dailies from hurting you - fixes https://github.com/HabitRPG/habitrpg/issues/3795
 2014-08-02 07:04:45 +10:00
deilann
0da3654bf5 Merge pull request #264 from jobywalker/fix-freeRebirth-assignment 
Fix assignment in freeRebirth test
 2014-08-01 13:28:11 -07:00
Joby Walker
aa4bd944c9 Fix assignment in freeRebirth test 2014-08-01 13:20:13 -07:00
Tyler Renelle
b3fd859cad chore(npcs): back to normal npcs 2014-08-01 14:07:01 -06:00
deilann
326952538d Merge pull request #263 from jobywalker/fix-no-value-quest-ok 
Fix: OK for unpurchaseable quest to have no value
 2014-08-01 13:00:58 -07:00
deilann
a590969078 Merge pull request #262 from jobywalker/fix-freeRebirth 
Fix freeRebirth flag
 2014-08-01 13:00:39 -07:00
Joby Walker
a2d851db23 Fix: OK for unpurchaseable quest to have no value 
Changing test to only check that a quest has value if it is "canBuy=true".
This (with PR#262) should fix the last test error on habitrpg-shared.
 2014-08-01 10:19:19 -07:00
Joby Walker
24e0f705b2 Fix freeRebirth flag 
Coffee is assuming the negation (!) applies to the AND of the two tests
should be just !user.flags.freeRebirth = true.  Fixes 4 test errors.
 2014-08-01 01:35:07 -07:00
Alice Harris
4d6562b86b Merge pull request #261 from Alys/modsColours 
change description of colors used for moderators and staff
 2014-08-01 18:16:39 +10:00
Alice Harris
095472fb92 change description of colors used for moderators and staff 2014-08-01 18:13:27 +10:00
Tyler Renelle
3d440fac8f Merge pull request #260 from jobywalker/fix-user-reset 
Fix User Reset
 2014-07-31 22:27:46 -06:00
Joby Walker
6a4897b27f Fix User Reset 
5cd0039 added regression where reset on new user would fail because user.items.gear.owned is undefined
This patch allows tests to get *much* further than before
 2014-07-31 20:56:00 -07:00
Tyler Renelle
050b6fc1f4 chore(spritesmith): bump sheets from 4 to 6, fixes for android 2.3 - may 
for other users too
 2014-07-31 20:27:04 -06:00
Tyler Renelle
0bd3743392 feat(box): 2014-07-31 17:39:19 -06:00
Tyler Renelle
ec39634458 fix(spritesmith): split spritesheets in to multiple files to remove the 
blurry iOS issue. Fixes
https://github.com/HabitRPG/habitrpg/issues/2510, see
http://goo.gl/IwxdI4 . Note, this commit isn't smart/dynamic, there's
commented-out code for handling dynamic splitting, but I couldn't get it
working - static 4 sheets for now
 2014-07-31 15:44:22 -06:00
3onyc
2d2c2d27a1 Change newPassSent to reflect 'Reset Password' not failing on non-existent email 2014-07-31 22:38:31 +02:00
Joby Walker
28838d6a1c Candy Cane text boosts Perception not Strength 2014-07-31 13:11:35 -07:00
Tyler Renelle
da87767c48 grunt(store-icons): re: #257 (before I forget) 2014-07-29 15:31:28 -06:00
Tyler Renelle
8381ebb5e5 Merge pull request #257 from lemoness/develop 
Summer Outfit Icons
 2014-07-29 15:26:46 -06:00
Lemoness
92396ca1b9 Summer Outfit Icons 
Creates uniform 2px icons for Summer Event Outfits
 2014-07-29 14:23:01 -07:00
Tyler Renelle
603da697c1 Merge pull request #256 from lemoness/develop 
Snowball and June Item Icons
 2014-07-29 14:40:39 -06:00
Lemoness
982b29b443 Snowball and June Item Icon 
Changes to a consistent 2x to avoid resizing issues
 2014-07-29 13:36:24 -07:00
Alice Harris
c8f45b8be6 explains that Chilling Frost does not stop dailies from hurting you 2014-07-29 13:01:17 +10:00
Tyler Renelle
2fb4d2652d Merge pull request #253 from lemoness/develop 
gaymerx helm icon 2x
 2014-07-28 16:06:04 -06:00
Lemoness
dfacae9b3f gaymerx helm icon 2x 
gaymerx helm icon 2x
 2014-07-28 15:04:49 -07:00
Tyler Renelle
8f6673a19b Merge pull request #252 from lemoness/develop 
test - icon gaymerx armor
 2014-07-28 16:02:58 -06:00
Lemoness
0711b2ee85 test - icon gaymerx armor 
test - icon gaymerx armor
 2014-07-28 15:00:00 -07:00
Matteo Pagliazzi
4f5f479dc8 chore(i18n): update locales 2014-07-28 16:03:15 +02:00