diff options
| author | Jose V Beneyto <sepen@crux.nu> | 2010-12-20 09:00:05 +0100 |
|---|---|---|
| committer | Jose V Beneyto <sepen@crux.nu> | 2010-12-20 09:00:05 +0100 |
| commit | 9501cfe406b934abd5d5cc9be872810813a28d9d (patch) | |
| tree | 5d8cef8bcb4fb2c8135ef0472d148b0c8f9aa833 | |
| parent | 4be05e5d7cf8f9f9d0af5d1ca666209285ddc187 (diff) | |
| download | webtools-9501cfe406b934abd5d5cc9be872810813a28d9d.tar.gz webtools-9501cfe406b934abd5d5cc9be872810813a28d9d.tar.xz | |
timeline: imported uncommitted changes for timeline.php and tlcacher.php
| -rw-r--r-- | timeline/timeline.php | 6 | ||||
| -rwxr-xr-x | timeline/tlcacher.php | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/timeline/timeline.php b/timeline/timeline.php index c9e8c67..2499ecf 100644 --- a/timeline/timeline.php +++ b/timeline/timeline.php @@ -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()) { diff --git a/timeline/tlcacher.php b/timeline/tlcacher.php index 63340a0..c6e37af 100755 --- a/timeline/tlcacher.php +++ b/timeline/tlcacher.php @@ -14,17 +14,17 @@ 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 $git_username_map = array( - "Per Lidén" => "PerLiden", + "Per Lidén" => "PerLiden", "Matt Housh" => "jaeger", "Juergen Daubert" => "JuergenDaubert", "Johannes Winkelmann" => "JohannesWinkelmann", @@ -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 |