- task->statusList, $task->status);?>
task->estimate;?> estimate . $lang->workingHour;?>
task->consumed;?> consumed, 2) . $lang->workingHour;?>
task->left;?> left . $lang->workingHour;?>
From 6f5e5b2c13b6f86471b019fe71d6c9c4da229394 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 3 Jun 2019 13:56:12 +0800
Subject: [PATCH 2/9] * Finish task #5729.
---
module/sso/lang/en.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/module/sso/lang/en.php b/module/sso/lang/en.php
index a7acedae9f..67eb18421e 100644
--- a/module/sso/lang/en.php
+++ b/module/sso/lang/en.php
@@ -11,8 +11,8 @@
*/
$lang->sso = new stdclass();
$lang->sso->settings = 'Settings';
-$lang->sso->turnon = 'On';
-$lang->sso->redirect = 'Auto Jump to Zdoo';
+$lang->sso->turnon = 'Zdoo';
+$lang->sso->redirect = 'Back to Zdoo';
$lang->sso->code = 'Code';
$lang->sso->key = 'Secret Key';
$lang->sso->addr = 'Address';
From faf7a8149cee5f8f9dd194b58c646e4c7045eb08 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Mon, 3 Jun 2019 13:59:56 +0800
Subject: [PATCH 3/9] * Finish task #5735.
---
module/story/view/edit.html.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 30b605dab9..02aa3adadc 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -170,7 +170,7 @@
story->legendLifeTime;?>
| story->openedBy;?> | +story->openedBy;?> | openedBy];?> |
|---|---|---|
| story->linkStories;?> | + app->getClientLang() == 'en' ? 'w-110px': 'w-70px'?> +>story->linkStories;?> | createLink('story', 'linkStory', "storyID=$story->id&type=linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> |