krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 44b1c8c7ba8b45cb682973fb89b70445d0f5c478
Merge: 489c15b7fd 4dadb64af0
Author: Sabe Jones <sabe@habitica.com>
Date:   Thu Feb 8 14:49:05 2024 -0600

    Merge branch 'release' into phillip/panel_profile

commit 489c15b7fd
Author: Phillip Thelen <phillip@habitica.com>
Date:   Wed Dec 14 13:29:32 2022 +0100

    allow profiles to be edited in admin panel

commit 1afaaf4089
Author: Phillip Thelen <phillip@habitica.com>
Date:   Wed Dec 14 12:50:47 2022 +0100

    include month for next hourglass date in admin panel
This commit is contained in:
Sabe Jones
2024-02-08 14:49:37 -06:00
parent 4dadb64af0
commit 2f42422d35
3 changed files with 113 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/server/controllers/api-v3/hall.js
View File

@@ -403,6 +403,7 @@ api.updateHero = {
if (updateData.flags && _.isBoolean(updateData.flags.chatShadowMuted)) {
hero.flags.chatShadowMuted = updateData.flags.chatShadowMuted;
}
if (updateData.profile) _.assign(hero.profile, updateData.profile);
if (updateData.secret) {
if (typeof updateData.secret.text !== 'undefined') {