timeline: imported uncommitted changes for timeline.php and tlcacher.php
This commit is contained in:
parent
4be05e5d7c
commit
9501cfe406
@ -4,10 +4,9 @@ require_once('DB.php');
|
||||
Markup("timeline", "directives", "/\\(:timeline(\\s+.*)?\\s*:\\)/e",
|
||||
"'<:block>'.GetEvents()");
|
||||
|
||||
|
||||
function GetEvents() {
|
||||
|
||||
$days = 30;
|
||||
$days = 14;
|
||||
if (isset($_POST['days'])) {
|
||||
$days = intval($_POST['days']);
|
||||
}
|
||||
@ -17,11 +16,10 @@ $db =& DB::connect($dsn);
|
||||
if (DB::isError($db)) die("Cannot connect to database");
|
||||
$db->setFetchMode(DB_FETCHMODE_ASSOC);
|
||||
$from = time() - ($days * 24 * 60 * 60);
|
||||
$sql = "select * from events where event_tstamp >= $from order by event_tstamp desc";
|
||||
$sql = "select distinct event_date, event_description, event_notes, event_type, event_time from events where event_tstamp >= $from order by event_tstamp desc";
|
||||
$res =& $db->Query($sql);
|
||||
if (DB::isError($res)) die("Query error");
|
||||
|
||||
|
||||
$timeline .= '<table cellspacing="0" border="0" cellpadding="0">'."\n";
|
||||
$currdate = "noway";
|
||||
while ($evt =& $res->fetchRow()) {
|
||||
|
@ -14,12 +14,12 @@ require_once('DB.php');
|
||||
require_once("tlcacher_config.php");
|
||||
|
||||
// Url of the detailed task
|
||||
$task_url="https://crux.nu/bugs/?do=details&id=%s";
|
||||
$task_url="http://crux.nu/bugs/?do=details&task_id=%s";
|
||||
|
||||
// Gitweb url for commits
|
||||
$git_url = "http://crux.nu/gitweb/?p=%s.git;a=commitdiff;h=%s";
|
||||
// append ":branch" to the repo name to restrict logs to 'branch'
|
||||
$git_repos = array("ports/core:2.2","ports/opt:2.2","tools/pkgutils", "tools/prt-get");
|
||||
$git_repos = array("ports/core:2.7","ports/opt:2.7","ports/xorg:2.7","ports/xfce:2.7","tools/pkgutils","tools/prt-get","system/iso:2.7");
|
||||
$git_root = "/home/crux/scm";
|
||||
|
||||
// Map git authors to wiki profiles
|
||||
@ -35,6 +35,12 @@ $git_username_map = array(
|
||||
"Simon Gloßner" => "SimonGloßner",
|
||||
"Nick Steeves" => "NickSteeves",
|
||||
"Antti Nykänen" => "AnttiNykänen",
|
||||
"Antti Nykanen" => "AnttiNykänen",
|
||||
"Jose V Beneyto" => "JoseVBeneyto",
|
||||
"JoseVBeneyto" => "JoseVBeneyto",
|
||||
"Lucas Hazel" => "LucasHazel",
|
||||
"Thomas Penteker" => "ThomasPenteker",
|
||||
"Fredrik Rinnestam" => "FredrikRinnestam",
|
||||
);
|
||||
|
||||
// Path of the recent changes pmwiki file
|
||||
|
Loading…
x
Reference in New Issue
Block a user