Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

Add server version to master api

Browse Source 
Add IsEvadedOffense to EFPenalty
Fix remote log reading in not Windows
This commit is contained in:
RaidMax
2018-12-16 21:16:56 -06:00
parent b77bdbe793
commit 12cf2e8247
1676 changed files with 287228 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WebfrontCore/ViewComponents/PenaltyListViewComponent.cs
View File

@ -25,7 +25,9 @@ namespace WebfrontCore.ViewComponents
#if DEBUG
Offense = !string.IsNullOrEmpty(p.AutomatedOffense) ? p.AutomatedOffense : p.Offense,
#else
Offense = User.Identity.IsAuthenticated && !string.IsNullOrEmpty(p.AutomatedOffense) ? p.AutomatedOffense : p.Offense,
Offense = User.Identity.IsAuthenticated && !string.IsNullOrEmpty(p.AutomatedOffense) ? (p.IsEvadedOffense ?
$"({Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_EVADE"]}) " : "") + p.AutomatedOffense :
$"({Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_PENALTY_EVADE"]}) " + p.Offense,
#endif
Type = p.Type.ToString(),
TimePunished = Utilities.GetTimePassed(p.When, false),

1
WebfrontCore/wwwroot/js/profile.js
View File

@ -168,6 +168,7 @@ function shouldIncludePlural(num) {
let mostRecentDate = 0;
let currentStepAmount = 0;
let lastStep = '';
// todo: fix
function timeStep(stepDifference) {
let hours = stepDifference / (1000 * 60 * 60);
let days = stepDifference / (1000 * 60 * 60 * 24);