gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2015-09-21 17:25:56 +02:00
commit f82dc7558b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
views/bootstrap/class.Bootstrap.php
View File

@ -2122,10 +2122,10 @@ mayscript>
echo "{'start': new Date('".$item['date']."'), 'content': '".$item['msg']."'},";
}
?>
{
/* {
'start': new Date(),
'content': 'Today'
}
} */
];
// specify options

2
views/bootstrap/class.Timeline.php
View File

@ -103,7 +103,7 @@ $this->contentHeading(getMLText("timeline"));
}
$item['msg'] = $msg;
}
$this->printTimeline($data, 500);
$this->printTimeline($data, 550);
echo "</div>\n";
echo "</div>\n";