Timezone always comes last

Start 1.1.3 development
Update the NEWS file and set the version number
2011-05-26 10:46:12 +02:00 · 2011-05-26 10:46:00 +02:00 · 2011-05-26 09:57:05 +02:00 · 2011-05-26 09:56:25 +02:00 · 2011-05-26 09:56:04 +02:00 · 2011-05-04 11:24:05 +02:00
172 changed files with 1096 additions and 3162 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,3 @@ indefero-*.zip
 src/IDF/conf/path.php
 .tx/config
 src/IDF/locale/idf.pot.bak
-test/test.db
-test/tmp
-test/config.php
--- a/1
+++ b/1
@@ -31,7 +31,6 @@ Much appreciated contributors (in alphabetical order):
    Raphaël Emourgeon <raphael>
    Samuel Suther <info@suther.de>                  - German translation
    Sindre R. Myren <sindrero@stud.ntnu.no>
-    Stewart Platt <stew@futurete.ch>
    Thomas Keller <me@thomaskeller.biz>             - Monotone support
    Vladimir Solomatin <slash>
    William Martin <william.martin@lcpc.fr>
--- a/INSTALL.mdtext
+++ b/INSTALL.mdtext
@@ -4,12 +4,6 @@ The installation of InDefero is composed of 2 parts, first the
 installation of the [Pluf framework](http://www.pluf.org) and second,
 the installation of InDefero by itself.

-## PHP modules for indefero
-
-Indefero need the GD module for PHP. It's named "php5-gd" in debian.
-
-    $ apt-get install php5-gd
-
 ## Recommended Layout of the Files

 If your server document root is in `/var/www` a good thing is to keep
@@ -132,7 +126,6 @@ The documentation is available in the `doc` folder.
 * Subversion: `doc/syncsvn.mdtext`.
 * Mercurial: `doc/syncmercurial.mdtext`.
 * Git: `doc/syncgit.mdtext`.
-* Monotone: `doc/syncmonotone.mdtext`

 ## For the Apache Webserver Users

--- a/NEWS.mdtext
+++ b/NEWS.mdtext
@@ -1,17 +1,17 @@
-# InDefero 1.2 - xxx xxx xx xx:xx 2011 UTC
+# InDefero 1.1.2 - Thu May 26 07:42:25 2011 UTC

-## New Features
+## Bugfixes

-## Bugfixes 
-
- monotone zip archive entries now all carry the revision date as mtime (issue 645)
- Timeline only displays filter options for items a user has actually access to (issue 655)
- Fix the self-link of the RSS feed (issue 666)
-
-## Documentation
+- Fix tags extraction from git repository (issue 675)
+- Fix SSH validation method (issue 671)
+- Fix malformed URL in the RSS (issue 666)
+- Fix validateRevision call for Mercurial Scm (issue 657)

 ## Translations

+- Missing word in French translation (issue 672)
+- Update Spanish translation
+
 # InDefero 1.1.1 - Mon Mar 28 15:52 2011 UTC

 ## Bugfixes
--- a/logo/no_logo.svg
+++ b/logo/no_logo.svg
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="no_logo.svg"
-   inkscape:version="0.47 r22583"
-   id="svg2985"
-   height="32"
-   width="32"
-   version="1.1"
-   inkscape:export-filename="/Users/tommyd/Entwicklung/indefero/www/media/idf/img/no_logo.png"
-   inkscape:export-xdpi="89.989998"
-   inkscape:export-ydpi="89.989998">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1440"
-     inkscape:window-height="852"
-     id="namedview9"
-     showgrid="false"
-     inkscape:zoom="16.0625"
-     inkscape:cx="8.5507561"
-     inkscape:cy="16.122403"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g2847"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="1,0"
-       position="16,25.836575"
-       id="guide3752" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="-18.677042,16"
-       id="guide3754" />
-  </sodipodi:namedview>
-  <defs
-     id="defs2987">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective13" />
-    <inkscape:perspective
-       id="perspective2863"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3676"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3717"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter3816"
-       x="-0.14434362"
-       width="1.2886872"
-       y="-0.11562817"
-       height="1.2312563">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.1799243"
-         id="feGaussianBlur3818" />
-    </filter>
-  </defs>
-  <metadata
-     id="metadata2990">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="shadow"
-     style="display:inline"
-     sodipodi:insensitive="true">
-    <g
-       transform="translate(0.44042901,0.78704792)"
-       id="g2847-8"
-       style="opacity:0.79710143;fill:#000000;stroke:#000000;stroke-opacity:1;filter:url(#filter3816)">
-      <g
-         id="g3838-0"
-         style="fill:#000000;stroke:#000000;stroke-opacity:1" />
-      <g
-         id="g2401-2"
-         transform="matrix(0.21219597,0,0,0.21219597,-70.751966,-27.73328)"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:export-filename="/home/loa/Projects/indefero/logo/powered-by-indefero.png"
-         inkscape:export-xdpi="12.330909"
-         inkscape:export-ydpi="12.330909">
-        <path
-           id="path2383-4"
-           d="m 396.19089,173.14471 c -7.67621,0.80661 -14.40195,5.39406 -19.58101,10.89131 -7.23597,7.88004 -11.69742,18.07908 -13.32198,28.60362 -1.7236,11.28173 -0.25925,23.20635 5.07686,33.37271 3.78607,7.24384 9.53161,13.92339 17.29701,16.96772 3.86478,1.53937 8.98362,1.03284 11.67912,-2.41036 2.64357,-3.5671 2.69463,-8.234 2.85756,-12.48867 0.045,-7.61054 -0.54749,-15.25544 0.45618,-22.83193 0.87131,-9.50623 4.03944,-18.56751 6.71612,-27.66851 1.16242,-4.44333 2.25094,-9.02808 1.97499,-13.64988 -0.48817,-4.62476 -3.58059,-9.31042 -8.2964,-10.4067 -1.57489,-0.44882 -3.23412,-0.48948 -4.85845,-0.37931 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path2391-8"
-           d="m 433.14691,149.28687 c 7.2059,2.76589 12.51512,8.93778 16.09494,15.58815 4.94991,9.48434 6.61962,20.49058 5.46486,31.07695 -1.25505,11.34342 -5.75582,22.48271 -13.54134,30.92159 -5.53192,6.01709 -12.81048,10.98198 -21.09918,11.91276 -4.13154,0.4866 -8.94486,-1.32748 -10.65734,-5.35104 -1.63027,-4.12976 -0.4717,-8.65084 0.47212,-12.80269 1.92628,-7.36287 4.47721,-14.59393 5.4687,-22.17201 1.61875,-9.40784 0.90381,-18.98034 0.67386,-28.46402 0.0272,-4.59278 0.1624,-9.30303 1.62515,-13.69592 1.66851,-4.34082 5.86829,-8.06645 10.70716,-7.90484 1.63738,-0.0259 3.25061,0.36424 4.79107,0.89107 z"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="logo"
-     style="display:inline">
-    <g
-       id="layer1"
-       transform="translate(-0.06540759,0.09444087)">
-      <g
-         id="g2847">
-        <g
-           id="g3838" />
-        <g
-           id="g2401"
-           transform="matrix(0.21219597,0,0,0.21219597,-70.751966,-27.73328)"
-           style="fill:#e6e6e6;fill-opacity:1;stroke:#a0a0a0;stroke-width:2.4000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           inkscape:export-filename="/home/loa/Projects/indefero/logo/powered-by-indefero.png"
-           inkscape:export-xdpi="12.330909"
-           inkscape:export-ydpi="12.330909">
-          <path
-             id="path2383"
-             d="m 396.19089,173.14471 c -7.67621,0.80661 -14.40195,5.39406 -19.58101,10.89131 -7.23597,7.88004 -11.69742,18.07908 -13.32198,28.60362 -1.7236,11.28173 -0.25925,23.20635 5.07686,33.37271 3.78607,7.24384 9.53161,13.92339 17.29701,16.96772 3.86478,1.53937 8.98362,1.03284 11.67912,-2.41036 2.64357,-3.5671 2.69463,-8.234 2.85756,-12.48867 0.045,-7.61054 -0.54749,-15.25544 0.45618,-22.83193 0.87131,-9.50623 4.03944,-18.56751 6.71612,-27.66851 1.16242,-4.44333 2.25094,-9.02808 1.97499,-13.64988 -0.48817,-4.62476 -3.58059,-9.31042 -8.2964,-10.4067 -1.57489,-0.44882 -3.23412,-0.48948 -4.85845,-0.37931 z"
-             style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-             inkscape:connector-curvature="0" />
-          <path
-             id="path2391"
-             d="m 433.14691,149.28687 c 7.2059,2.76589 12.51512,8.93778 16.09494,15.58815 4.94991,9.48434 6.61962,20.49058 5.46486,31.07695 -1.25505,11.34342 -5.75582,22.48271 -13.54134,30.92159 -5.53192,6.01709 -12.81048,10.98198 -21.09918,11.91276 -4.13154,0.4866 -8.94486,-1.32748 -10.65734,-5.35104 -1.63027,-4.12976 -0.4717,-8.65084 0.47212,-12.80269 1.92628,-7.36287 4.47721,-14.59393 5.4687,-22.17201 1.61875,-9.40784 0.90381,-18.98034 0.67386,-28.46402 0.0272,-4.59278 0.1624,-9.30303 1.62515,-13.69592 1.66851,-4.34082 5.86829,-8.06645 10.70716,-7.90484 1.63738,-0.0259 3.25061,0.36424 4.79107,0.89107 z"
-             style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -12,16 +12,4 @@
            <directory>test/IDF/</directory>
        </testsuite>
    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/IDF</directory>
-            <exclude>
-                <directory suffix=".php">src/IDF/Tests</directory>
-                <directory suffix=".php">src/IDF/conf</directory>
-                <file>src/IDF/version.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
 </phpunit>
-
--- a/14
+++ b/14
@@ -1,14 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-$xmlfile = dirname(__FILE__) .'/test/report.xml';
-passthru('phpunit --coverage-clover='.$xmlfile);
-$xml = simplexml_load_string(file_get_contents($xmlfile));
-unlink($xmlfile);
-printf(
-   '>>> code coverage %s/%s (%s%%)'."\n",
-   $xml->project->metrics['coveredstatements'],
-   $xml->project->metrics['statements'],
-   round(($xml->project->metrics['coveredstatements']/(float)$xml->project->metrics['statements']) * 100.0, 2)
-);
-
--- a/scripts/gitcron.php
+++ b/scripts/gitcron.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/scripts/gitpostupdate.php
+++ b/scripts/gitpostupdate.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008-2010 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/scripts/gitserve.php
+++ b/scripts/gitserve.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/scripts/gitserve.py
+++ b/scripts/gitserve.py
@@ -3,7 +3,7 @@
 #
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/scripts/hgchangegroup.php
+++ b/scripts/hgchangegroup.php
@@ -4,7 +4,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008-2010 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/scripts/mtnpostpush.php
+++ b/scripts/mtnpostpush.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008-2010 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/scripts/queuecron.php
+++ b/scripts/queuecron.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/scripts/svnpostcommit.php
+++ b/scripts/svnpostcommit.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008-2010 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/scripts/svnpostrevpropchange.php
+++ b/scripts/svnpostrevpropchange.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008-2010 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Commit.php
+++ b/src/IDF/Commit.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Conf.php
+++ b/src/IDF/Conf.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Config/DataProxy.php
+++ b/src/IDF/Config/DataProxy.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Diff.php
+++ b/src/IDF/Diff.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/EmailAddress.php
+++ b/src/IDF/EmailAddress.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/FileUtil.php
+++ b/src/IDF/FileUtil.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2010 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/Admin/ProjectCreate.php
+++ b/src/IDF/Form/Admin/ProjectCreate.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -319,7 +319,6 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
                           'labels_issue_closed' => IDF_Form_IssueTrackingConf::init_closed,
                           'labels_issue_predefined' =>  IDF_Form_IssueTrackingConf::init_predefined,
                           'labels_issue_one_max' => IDF_Form_IssueTrackingConf::init_one_max,
-                           'issue_relations' => IDF_Form_IssueTrackingConf::init_relations,
                           'webhook_url' => '',
                           'downloads_access_rights' => 'all',
                           'review_access_rights' => 'all',
--- a/src/IDF/Form/Admin/ProjectDelete.php
+++ b/src/IDF/Form/Admin/ProjectDelete.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/Admin/ProjectUpdate.php
+++ b/src/IDF/Form/Admin/ProjectUpdate.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/Admin/UserCreate.php
+++ b/src/IDF/Form/Admin/UserCreate.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/Admin/UserUpdate.php
+++ b/src/IDF/Form/Admin/UserUpdate.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/Field/EmailList.php
+++ b/src/IDF/Form/Field/EmailList.php
@@ -3,19 +3,19 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2010 Céondo Ltd and contributors.
 #
-# InDefero is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# Plume Framework is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
 # (at your option) any later version.
 #
-# InDefero is distributed in the hope that it will be useful,
+# Plume Framework is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Lesser General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
--- a/src/IDF/Form/IssueCreate.php
+++ b/src/IDF/Form/IssueCreate.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -76,11 +76,11 @@ class IDF_Form_IssueCreate extends Pluf_Form
        // case of someone allowing the upload path to be accessible
        // to everybody.
        for ($i=1;$i<4;$i++) {
-            $filename = substr($md5, 0, 2).'/'.substr($md5, 2, 2).'/'.substr($md5, 4).'/%s.dummy';
+            $filename = substr($md5, 0, 2).'/'.substr($md5, 2, 2).'/'.substr($md5, 4).'/%s.dummy'; 
            $this->fields['attachment'.$i] = new Pluf_Form_Field_File(
                array('required' => false,
                      'label' => __('Attach a file'),
-                      'move_function_params' =>
+                      'move_function_params' => 
                      array('upload_path' => $upload_path,
                            'upload_path_create' => true,
                            'file_name' => $filename,
@@ -109,21 +109,6 @@ class IDF_Form_IssueCreate extends Pluf_Form
                                                                    ),
                                            ));

-            $relation_types =  $extra['project']->getRelationsFromConfig();
-            $this->fields['relation_type'] = new Pluf_Form_Field_Varchar(
-                          array('required' => false,
-                                'label' => __('This issue'),
-                                'initial' => $relation_types[0],
-                                'widget_attrs' => array('size' => 15),
-                                ));
-
-            $this->fields['relation_issue'] = new Pluf_Form_Field_Varchar(
-                          array('required' => false,
-                                'label' => null,
-                                'initial' => '',
-                                'widget_attrs' => array('size' => 10),
-                                ));
-
            /*
             * get predefined tags for issues from current project
             *
@@ -196,7 +181,7 @@ class IDF_Form_IssueCreate extends Pluf_Form
            $this->cleaned_data['label'.$i] = trim($this->cleaned_data['label'.$i]);
            if (strpos($this->cleaned_data['label'.$i], ':') !== false) {
                list($class, $name) = explode(':', $this->cleaned_data['label'.$i], 2);
-                list($class, $name) = array(mb_strtolower(trim($class)),
+                list($class, $name) = array(mb_strtolower(trim($class)), 
                                            trim($name));
            } else {
                $class = 'other';
@@ -230,10 +215,10 @@ class IDF_Form_IssueCreate extends Pluf_Form
    function clean_status()
    {
        // Check that the status is in the list of official status
-        $tags = $this->project->getTagsFromConfig('labels_issue_open',
+        $tags = $this->project->getTagsFromConfig('labels_issue_open', 
                                          IDF_Form_IssueTrackingConf::init_open,
                                          'Status');
-        $tags = array_merge($this->project->getTagsFromConfig('labels_issue_closed',
+        $tags = array_merge($this->project->getTagsFromConfig('labels_issue_closed', 
                                          IDF_Form_IssueTrackingConf::init_closed,
                                          'Status')
                            , $tags);
--- a/src/IDF/Form/IssueTrackingConf.php
+++ b/src/IDF/Form/IssueTrackingConf.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,9 +72,6 @@ Performance          = Performance issue
 Usability            = Affects program usability
 Maintainability      = Hinders future changes';
    const init_one_max = 'Type, Priority, Milestone';
-    const init_relations = 'is related to
-blocks, is blocked by
-duplicates, is duplicated by';

    public function initFields($extra=array())
    {
@@ -117,19 +114,10 @@ duplicates, is duplicated by';
        $this->fields['labels_issue_one_max'] = new Pluf_Form_Field_Varchar(
                                      array('required' => false,
                                            'label' => __('Each issue may have at most one label with each of these classes'),
-                                            'initial' => self::init_one_max,
+                                            'initial' => self::init_one_max, 
                                            'widget_attrs' => array('size' => 60),
                                            ));

-        $this->fields['issue_relations'] = new Pluf_Form_Field_Varchar(
-                                      array('required' => true,
-                                            'label' => __('Issue relations'),
-                                            'initial' => self::init_relations,
-                                            'help_text' => __('You can define bidirectional relations like "is related to" or "blocks, is blocked by".'),
-                                            'widget_attrs' => array('rows' => 7,
-                                                                    'cols' => 75),
-                                            'widget' => 'Pluf_Form_Widget_TextareaInput',
-                                            ));
    }
 }

--- a/src/IDF/Form/IssueUpdate.php
+++ b/src/IDF/Form/IssueUpdate.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/MembersConf.php
+++ b/src/IDF/Form/MembersConf.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/Password.php
+++ b/src/IDF/Form/Password.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/PasswordInputKey.php
+++ b/src/IDF/Form/PasswordInputKey.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/PasswordReset.php
+++ b/src/IDF/Form/PasswordReset.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/ProjectConf.php
+++ b/src/IDF/Form/ProjectConf.php
@@ -1,140 +0,0 @@
-<?php
-/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
-# ***** BEGIN LICENSE BLOCK *****
-# This file is part of InDefero, an open source project management application.
-# Copyright(C) 2008-2011 Céondo Ltd and contributors.
-#
-# InDefero is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-#(at your option) any later version.
-#
-# InDefero is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# ***** END LICENSE BLOCK ***** */
-
-
-/**
- * Configuration of the project.
- */
-class IDF_Form_ProjectConf extends Pluf_Form
-{
-    public $project = null;
-
-    public function initFields($extra=array())
-    {
-        $this->project = $extra['project'];
-
-        // Basic part
-        $this->fields['name'] = new Pluf_Form_Field_Varchar(array('required' => true,
-                                                                  'label' => __('Name'),
-                                                                  'initial' => $this->project->name,
-                                                                 ));
-        $this->fields['shortdesc'] = new Pluf_Form_Field_Varchar(array('required' => true,
-                                                                       'label' => __('Short Description'),
-                                                                       'initial' => $this->project->shortdesc,
-                                                                       'widget_attrs' => array('size' => '68'),
-                                                                      ));
-        $this->fields['description'] = new Pluf_Form_Field_Varchar(array('required' => true,
-                                                                         'label' => __('Description'),
-                                                                         'initial' => $this->project->description,
-                                                                         'widget_attrs' => array('cols' => 68,
-                                                                                                 'rows' => 26,
-                                                                                                ),
-                                                                         'widget' => 'Pluf_Form_Widget_TextareaInput',
-                                                                        ));
-
-        // Logo part
-        $upload_path = Pluf::f('upload_path', false);
-        if (false === $upload_path) {
-            throw new Pluf_Exception_SettingError(__('The "upload_path" configuration variable was not set.'));
-        }
-        $upload_path .= '/' . $this->project->shortname;
-        $filename = '/%s';
-        $this->fields['logo'] = new Pluf_Form_Field_File(array('required' => false,
-                                                         'label' => __('Update the logo'),
-                                                         'initial' => '',
-                                                         'help_text' => __('The logo must be a picture with a size of 32 by 32.'),
-                                                         'max_size' => Pluf::f('max_upload_size', 5 * 1024),
-                                                         'move_function_params' =>
-                                                         array('upload_path' => $upload_path,
-                                                               'upload_path_create' => true,
-                                                               'file_name' => $filename,
-                                                               )
-                                                         ));
-
-        $this->fields['logo_remove'] = new Pluf_Form_Field_Boolean(array('required' => false,
-                                                                         'label' => __('Remove the current logo'),
-                                                                         'initial' => false,
-                                                                         'widget' => 'Pluf_Form_Widget_CheckboxInput',
-                                                                         ));
-    }
-
-    /**
-     * If we have uploaded a file, but the form failed remove it.
-     *
-     */
-    function failed()
-    {
-        if (!empty($this->cleaned_data['logo'])
-            && file_exists(Pluf::f('upload_path').'/'.$this->cleaned_data['logo'])) {
-            unlink(Pluf::f('upload_path').'/'.$this->cleaned_data['logo']);
-        }
-    }
-
-    public function clean()
-    {
-        if (!isset($this->cleaned_data['logo_remove'])) {
-            $this->cleaned_data['logo_remove'] = false;
-        }
-
-        return $this->cleaned_data;
-    }
-
-    public function clean_logo()
-    {
-        if (empty($this->cleaned_data['logo'])) {
-            return '';
-        }
-
-        $meta = getimagesize(Pluf::f('upload_path') . '/' . $this->project->shortname . $this->cleaned_data['logo']);
-
-        if ($meta === false) {
-            throw new Pluf_Form_Invalid(__('Could not determine the size of the uploaded picture.'));
-        }
-
-        if ($meta[0] !== 32 || $meta[1] !== 32) {
-            throw new Pluf_Form_Invalid(__('The picture must have a size of 32 by 32.'));
-        }
-
-        return $this->cleaned_data['logo'];
-    }
-
-    public function save($commit=true)
-    {
-        $conf = $this->project->getConf();
-
-        // Basic part
-        $this->project->name = $this->cleaned_data['name'];
-        $this->project->shortdesc = $this->cleaned_data['shortdesc'];
-        $this->project->description = $this->cleaned_data['description'];
-        $this->project->update();
-
-        // Logo part
-        if ($this->cleaned_data['logo'] !== "") {
-            $conf->setVal('logo', $this->cleaned_data['logo']);
-        }
-        if ($this->cleaned_data['logo_remove'] === true) {
-            @unlink(Pluf::f('upload_path') . '/' . $this->project->shortname . $conf->getVal('logo'));
-            $conf->delVal('logo');
-        }
-    }
-}
--- a/src/IDF/Form/Register.php
+++ b/src/IDF/Form/Register.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/RegisterConfirmation.php
+++ b/src/IDF/Form/RegisterConfirmation.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/RegisterInputKey.php
+++ b/src/IDF/Form/RegisterInputKey.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/ReviewCreate.php
+++ b/src/IDF/Form/ReviewCreate.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/ReviewFileComment.php
+++ b/src/IDF/Form/ReviewFileComment.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ class IDF_Form_ReviewFileComment extends Pluf_Form
                                            ));
        }
        $this->fields['content'] = new Pluf_Form_Field_Varchar(
-                                      array('required' => false,
+                                      array('required' => true,
                                            'label' => __('General comment'),
                                            'initial' => '',
                                            'widget' => 'Pluf_Form_Widget_TextareaInput',
@@ -96,40 +96,24 @@ class IDF_Form_ReviewFileComment extends Pluf_Form
     */
    public function clean()
    {
-        $isOk = false;
-        
-        foreach($this->files as $filename => $def) {
-            $this->cleaned_data[md5($filename)] = trim($this->cleaned_data[md5($filename)]);
-            if(!empty($this->cleaned_data[md5($filename)])) {
-                $isOk = true;
+        foreach ($this->files as $filename => $def) {
+            if (!empty($this->cleaned_data[md5($filename)])) {
+                return $this->cleaned_data;
            }
        }
-        
-        if(!empty($this->cleaned_data['content'])) {
-            $isOk = true;
-        }
-        
-        if (!$isOk) {
-            throw new Pluf_Form_Invalid(__('You need to provide your general comment about the proposal, or comments on at least one file.'));
-        }
-        
-        return $this->cleaned_data;
+        throw new Pluf_Form_Invalid(__('You need to provide comments on at least one file.'));
    }

    function clean_content()
    {
        $content = trim($this->cleaned_data['content']);
-        if(empty($content)) {
-            if ($this->fields['status']->initial != $this->fields['status']->value) {
-                return __('The status have been updated.');
-            }
-        } else {
-            return $content;
+        if (!$this->show_full and strlen($content) == 0) {
+            throw new Pluf_Form_Invalid(__('You need to provide your general comment about the proposal.'));
        }
-        
-        throw new Pluf_Form_Invalid(__('This field is required.'));
+        return $content;
    }

+
    /**
     * Save the model in the database.
     *
--- a/src/IDF/Form/SourceConf.php
+++ b/src/IDF/Form/SourceConf.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/TabsConf.php
+++ b/src/IDF/Form/TabsConf.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/UpdateUpload.php
+++ b/src/IDF/Form/UpdateUpload.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/Upload.php
+++ b/src/IDF/Form/Upload.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/UploadConf.php
+++ b/src/IDF/Form/UploadConf.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/UserAccount.php
+++ b/src/IDF/Form/UserAccount.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/UserChangeEmail.php
+++ b/src/IDF/Form/UserChangeEmail.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/WikiConf.php
+++ b/src/IDF/Form/WikiConf.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/WikiCreate.php
+++ b/src/IDF/Form/WikiCreate.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/WikiDelete.php
+++ b/src/IDF/Form/WikiDelete.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Form/WikiUpdate.php
+++ b/src/IDF/Form/WikiUpdate.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Gconf.php
+++ b/src/IDF/Gconf.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Issue.php
+++ b/src/IDF/Issue.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/IssueComment.php
+++ b/src/IDF/IssueComment.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/IssueFile.php
+++ b/src/IDF/IssueFile.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Key.php
+++ b/src/IDF/Key.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Middleware.php
+++ b/src/IDF/Middleware.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/10SshKey.php
+++ b/src/IDF/Migrations/10SshKey.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/11GitCache.php
+++ b/src/IDF/Migrations/11GitCache.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/12DownloadDesc.php
+++ b/src/IDF/Migrations/12DownloadDesc.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/13NewReview.php
+++ b/src/IDF/Migrations/13NewReview.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/14Queue.php
+++ b/src/IDF/Migrations/14Queue.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/15AddGconf.php
+++ b/src/IDF/Migrations/15AddGconf.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/16AddUserMail.php
+++ b/src/IDF/Migrations/16AddUserMail.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/1Download.php
+++ b/src/IDF/Migrations/1Download.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/2Search.php
+++ b/src/IDF/Migrations/2Search.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/3Attachments.php
+++ b/src/IDF/Migrations/3Attachments.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/4Timeline.php
+++ b/src/IDF/Migrations/4Timeline.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/5DescToText.php
+++ b/src/IDF/Migrations/5DescToText.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/6PrivateProject.php
+++ b/src/IDF/Migrations/6PrivateProject.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/7Wiki.php
+++ b/src/IDF/Migrations/7Wiki.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/8CodeReview.php
+++ b/src/IDF/Migrations/8CodeReview.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/9ShortDescription.php
+++ b/src/IDF/Migrations/9ShortDescription.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/Backup.php
+++ b/src/IDF/Migrations/Backup.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Migrations/Install.php
+++ b/src/IDF/Migrations/Install.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Plugin/SyncGit.php
+++ b/src/IDF/Plugin/SyncGit.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Plugin/SyncGit/Cron.php
+++ b/src/IDF/Plugin/SyncGit/Cron.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Plugin/SyncGit/Serve.php
+++ b/src/IDF/Plugin/SyncGit/Serve.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Plugin/SyncMercurial.php
+++ b/src/IDF/Plugin/SyncMercurial.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Plugin/SyncMonotone.php
+++ b/src/IDF/Plugin/SyncMonotone.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2010 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Plugin/SyncMonotone/hooks.d/indefero_authorize_remote_automate.lua
+++ b/src/IDF/Plugin/SyncMonotone/hooks.d/indefero_authorize_remote_automate.lua
@@ -1,6 +1,6 @@
 -- ***** BEGIN LICENSE BLOCK *****
 -- This file is part of InDefero, an open source project management application.
-- Copyright (C) 2008-2011 Céondo Ltd and contributors.
+-- Copyright (C) 2011 Céondo Ltd and contributors.
 -- Copyright (C) 2010 Thomas Keller <me@thomaskeller.biz>
 --                    Richard Levitte <richard@levitte.org>
 --
--- a/src/IDF/Plugin/SyncMonotone/hooks.d/indefero_post_push.lua
+++ b/src/IDF/Plugin/SyncMonotone/hooks.d/indefero_post_push.lua
@@ -1,6 +1,6 @@
 -- ***** BEGIN LICENSE BLOCK *****
 -- This file is part of InDefero, an open source project management application.
-- Copyright (C) 2008-2011 Céondo Ltd and contributors.
+-- Copyright (C) 2011 Céondo Ltd and contributors.
 --
 -- InDefero is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- a/src/IDF/Plugin/SyncMonotone/monotonerc.in
+++ b/src/IDF/Plugin/SyncMonotone/monotonerc.in
@@ -1,6 +1,6 @@
 -- ***** BEGIN LICENSE BLOCK *****
 -- This file is part of InDefero, an open source project management application.
-- Copyright (C) 2008-2011 Céondo Ltd and contributors.
+-- Copyright (C) 2011 Céondo Ltd and contributors.
 --
 -- InDefero is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
--- a/src/IDF/Plugin/SyncSvn.php
+++ b/src/IDF/Plugin/SyncSvn.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Precondition.php
+++ b/src/IDF/Precondition.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Project.php
+++ b/src/IDF/Project.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -233,22 +233,6 @@ class IDF_Project extends Pluf_Model
        return $tags;
    }

-    /**
-     * Returns a list of relations which are available in this project
-     *
-     * @return array List of relation names
-     */
-    public function getRelationsFromConfig()
-    {
-        $conf = $this->getConf();
-        $rel = $conf->getVal('issue_relations', IDF_Form_IssueTrackingConf::init_relations);
-        $relations = array();
-        foreach (preg_split("/\015\012|\015|\012/", $rel, -1, PREG_SPLIT_NO_EMPTY) as $s) {
-            $relations = array_merge($relations, preg_split("/\s*,\s*/", $s, 2));
-        }
-        return $relations;
-    }
-
    /**
     * Return membership data.
     *
--- a/src/IDF/Queue.php
+++ b/src/IDF/Queue.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Review.php
+++ b/src/IDF/Review.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Review/Comment.php
+++ b/src/IDF/Review/Comment.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Review/FileComment.php
+++ b/src/IDF/Review/FileComment.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Review/Patch.php
+++ b/src/IDF/Review/Patch.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Scm.php
+++ b/src/IDF/Scm.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Scm/Cache/Git.php
+++ b/src/IDF/Scm/Cache/Git.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Scm/Exception.php
+++ b/src/IDF/Scm/Exception.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Scm/Git.php
+++ b/src/IDF/Scm/Git.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -209,7 +209,7 @@ class IDF_Scm_Git extends IDF_Scm
            return $this->cache['tags'];
        }
        $cmd = Pluf::f('idf_exec_cmd_prefix', '')
-            .sprintf('GIT_DIR=%s %s for-each-ref --format="%%(taggerdate:iso)%%(committerdate:iso) %%(objectname) %%(refname)" refs/tags',
+            .sprintf('GIT_DIR=%s %s for-each-ref --format="%%(objectname) %%(refname)" refs/tags',
                     escapeshellarg($this->repo),
                     Pluf::f('git_path', 'git'));
        self::exec('IDF_Scm_Git::getTags', $cmd, $out, $return);
@@ -221,15 +221,12 @@ class IDF_Scm_Git extends IDF_Scm
        rsort($out);
        $res = array();
        foreach ($out as $b) {
-            $elts = explode(' ', $b, 5);
-            $tag = substr(trim($elts[4]), 10);
-            if (false !== strpos($tag, '/')) {
-                $res[$elts[3]] = $b;
-            } else {
-                $res[$tag] = '';
-            }
+            $elts = explode(' ', $b, 2);
+            $tag = substr(trim($elts[1]), 10);  // Remove refs/tags/ prefix
+            $res[$tag] = '';
        }
        $this->cache['tags'] = $res;
+        
        return $res;
    }

--- a/src/IDF/Scm/Mercurial.php
+++ b/src/IDF/Scm/Mercurial.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2008 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/src/IDF/Scm/Monotone.php
+++ b/src/IDF/Scm/Monotone.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2010 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,19 +29,19 @@
 class IDF_Scm_Monotone extends IDF_Scm
 {
    /** the minimum supported interface version */
-    public static $MIN_INTERFACE_VERSION = 13.0;
+    public static $MIN_INTERFACE_VERSION = 12.0;

    private $stdio;

    private static $instances = array();

    /**
-     * Constructor
+     * @see IDF_Scm::__construct()
     */
-    public function __construct(IDF_Project $project, IDF_Scm_Monotone_IStdio $stdio)
+    public function __construct($project)
    {
        $this->project = $project;
-        $this->stdio = $stdio;
+        $this->stdio = new IDF_Scm_Monotone_Stdio($project);
    }

    /**
@@ -135,13 +135,13 @@ class IDF_Scm_Monotone extends IDF_Scm
    /**
     * @see IDF_Scm::getArchiveStream
     */
-    public function getArchiveStream($commit, $prefix = null)
+    public function getArchiveStream($commit, $prefix='repository/')
    {
        $revs = $this->_resolveSelector($commit);
        // sanity: this should actually not happen, because the
        // revision is validated before already
        if (count($revs) == 0) {
-            throw new IDF_Scm_Exception("$commit is not a valid revision");
+            return new Pluf_HTTP_Response_NotFound();
        }
        return new IDF_Scm_Monotone_ZipRender($this->stdio, $revs[0]);
    }
@@ -458,9 +458,8 @@ class IDF_Scm_Monotone extends IDF_Scm
    public static function factory($project)
    {
        if (!array_key_exists($project->shortname, self::$instances)) {
-            $stdio = new IDF_Scm_Monotone_Stdio($project);
            self::$instances[$project->shortname] =
-                new IDF_Scm_Monotone($project, $stdio);
+                new IDF_Scm_Monotone($project);
        }
        return self::$instances[$project->shortname];
    }
@@ -536,6 +535,9 @@ class IDF_Scm_Monotone extends IDF_Scm
        $stanzas = IDF_Scm_Monotone_BasicIO::parse($out);

        foreach ($stanzas as $stanza) {
+            if ($stanza[0]['key'] == 'format_version')
+                continue;
+
            if ($stanza[0]['values'][0] != $file)
                continue;

@@ -599,7 +601,7 @@ class IDF_Scm_Monotone extends IDF_Scm
    {
        $revs = $this->_resolveSelector($commit);
        if (count($revs) == 0)
-            return false;
+            return null;

        $revision = $revs[0];
        $out = $this->stdio->exec(array('get_revision', $revision));
@@ -668,15 +670,14 @@ class IDF_Scm_Monotone extends IDF_Scm
    {
        $revs = $this->_resolveSelector($commit);
        if (count($revs) == 0)
-            return false;
+            return array();

        $res = array();

        $parents = $this->stdio->exec(array('parents', $revs[0]));
        $res['parents'] = preg_split("/\n/", $parents, -1, PREG_SPLIT_NO_EMPTY);
-
-        $certs = $this->_getCerts($revs[0]);
-
+        
+        $certs = $this->_getCerts($revs[0]);        
        // FIXME: this assumes that author, date and changelog are always given
        $res['author'] = implode(', ', $certs['author']);

--- a/src/IDF/Scm/Monotone/BasicIO.php
+++ b/src/IDF/Scm/Monotone/BasicIO.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+# Copyright (C) 2010 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,8 +21,6 @@
 #
 # ***** END LICENSE BLOCK ***** */

-require_once 'IDF/Scm/Exception.php';
-
 /**
 * Utility class to parse and compile basic_io stanzas
 *
@@ -33,11 +31,6 @@ class IDF_Scm_Monotone_BasicIO
    /**
     * Parses monotone's basic_io format
     *
-     * Known quirks:
-     * - does not handle multi-values starting with a hash '[]' (no known output)
-     * - does not validate hashes (should be /[0-9a-f]{40}/i)
-     * - does not handle forbidden \0
-     *
     * @param string $in
     * @return array of arrays
     */
@@ -61,56 +54,50 @@ class IDF_Scm_Monotone_BasicIO
                    $stanzaLine['key'] .= $ch;
                }

-                // ensure we don't look at a symbol w/o a value list
-                if ($pos >= $length || $in[$pos] == "\n") {
+                // symbol w/o a value list
+                if ($pos >= $length || $in[$pos] == "\n") break;
+ 
+                if ($in[$pos] == '[') {
                    unset($stanzaLine['values']);
-                    unset($stanzaLine['hash']);
+                    ++$pos; // opening square bracket
+                    $stanzaLine['hash'] = substr($in, $pos, 40);
+                    $pos += 40;
+                    ++$pos; // closing square bracket
                }
-                else {
-                    if ($in[$pos] == '[') {
-                        unset($stanzaLine['values']);
-                        ++$pos; // opening square bracket
-                        while ($pos < $length && $in[$pos] != ']') {
-                            $stanzaLine['hash'] .= $in[$pos];
+                else
+                {
+                    unset($stanzaLine['hash']);
+                    $valCount = 0;
+                    // if hashs and plain values are encountered in the same
+                    // value list, we add the hash values as simple values as well
+                    while ($in[$pos] == '"' || $in[$pos] == '[') {
+                        $isHashValue = $in[$pos] == '[';
+                        ++$pos; // opening quote / bracket
+                        $stanzaLine['values'][$valCount] = '';
+                        while ($pos < $length) {
+                            $ch = $in[$pos]; $pr = $in[$pos-1];
+                            if (($isHashValue && $ch == ']')
+                                ||(!$isHashValue && $ch == '"' && $pr != '\\'))
+                                 break;
                            ++$pos;
+                            $stanzaLine['values'][$valCount] .= $ch;
                        }
-                        ++$pos; // closing square bracket
-                    }
-                    else
-                    {
-                        unset($stanzaLine['hash']);
-                        $valCount = 0;
-                        // if hashs and plain values are encountered in the same
-                        // value list, we add the hash values as simple values as well
-                        while ($in[$pos] == '"' || $in[$pos] == '[') {
-                            $isHashValue = $in[$pos] == '[';
-                            ++$pos; // opening quote / bracket
-                            $stanzaLine['values'][$valCount] = '';
-                            while ($pos < $length) {
-                                $ch = $in[$pos]; $pr = $in[$pos-1];
-                                if (($isHashValue && $ch == ']')
-                                    ||(!$isHashValue && $ch == '"' && $pr != '\\'))
-                                     break;
-                                ++$pos;
-                                $stanzaLine['values'][$valCount] .= $ch;
-                            }
-                            ++$pos; // closing quote
+                        ++$pos; // closing quote

-                            if (!$isHashValue) {
-                                $stanzaLine['values'][$valCount] = str_replace(
-                                    array("\\\\", "\\\""),
-                                    array("\\", "\""),
-                                    $stanzaLine['values'][$valCount]
-                                );
-                            }
+                        if (!$isHashValue) {
+                            $stanzaLine['values'][$valCount] = str_replace(
+                                array("\\\\", "\\\""),
+                                array("\\", "\""),
+                                $stanzaLine['values'][$valCount]
+                            );
+                        }

-                            if ($pos >= $length)
-                                break;
+                        if ($pos >= $length)
+                            break;

-                            if ($in[$pos] == ' ') {
-                                ++$pos; // space
-                                ++$valCount;
-                            }
+                        if ($in[$pos] == ' ') {
+                            ++$pos; // space
+                            ++$valCount;
                        }
                    }
                }
@@ -127,12 +114,6 @@ class IDF_Scm_Monotone_BasicIO
    /**
     * Compiles monotone's basicio format
     *
-     * Known quirks:
-     * - does not validate keys for /[a-z_]+/
-     * - does not validate hashes (should be /[0-9a-f]{40}/i)
-     * - does not support intermixed value / hash formats
-     * - does not handle forbidden \0
-     *
     * @param array $in Array of arrays
     * @return string
     */
@@ -148,7 +129,7 @@ class IDF_Scm_Monotone_BasicIO

            $maxkeylength = 0;
            foreach ((array)$stanza as $lx => $line) {
-                if (!array_key_exists('key', $line) || empty($line['key'])) {
+                if (!array_key_exists('key', $line)) {
                    throw new IDF_Scm_Exception(
                        '"key" not found in basicio stanza '.$sx.', line '.$lx
                    );
@@ -176,6 +157,13 @@ class IDF_Scm_Monotone_BasicIO
                             $value).'"';
                    }
                }
+                else
+                {
+                    throw new IDF_Scm_Exception(
+                        'neither "hash" nor "values" found in basicio '.
+                        'stanza '.$sx.', line '.$lx
+                    );
+                }

                $out .= "\n";
            }
--- a/src/IDF/Scm/Monotone/IStdio.php
+++ b/src/IDF/Scm/Monotone/IStdio.php
@@ -1,66 +0,0 @@
-<?php
-/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
-# ***** BEGIN LICENSE BLOCK *****
-# This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2011 Céondo Ltd and contributors.
-#
-# InDefero is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# InDefero is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# ***** END LICENSE BLOCK ***** */
-
-/**
- * Monotone stdio interface
- *
- * @author Thomas Keller <me@thomaskeller.biz>
- */
-interface IDF_Scm_Monotone_IStdio
-{
-    /**
-     * Constructor
-     */
-    public function __construct(IDF_Project $project);
-
-    /**
-     * Starts the stdio process and resets the command counter
-     */
-    public function start();
-
-    /**
-     * Stops the stdio process and closes all pipes
-     */
-    public function stop();
-
-    /**
-     * Executes a command over stdio and returns its result
-     *
-     * @param array Array of arguments
-     * @param array Array of options as key-value pairs. Multiple options
-     *              can be defined in sub-arrays, like
-     *              "r" => array("123...", "456...")
-     * @return string
-     */
-    public function exec(array $args, array $options = array());
-
-    /**
-     * Returns the last out-of-band output for a previously executed
-     * command as associative array with 'e' (error), 'w' (warning),
-     * 'p' (progress) and 't' (ticker, unparsed) as keys
-     *
-     * @return array
-     */
-    public function getLastOutOfBandOutput();
-}
-
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Keller	8987ca7db6	Timezone always comes last	2011-05-26 10:46:12 +02:00
Thomas Keller	8066fd8982	Start 1.1.3 development	2011-05-26 10:46:00 +02:00
William MARTIN	a96d8c05a7	Update the NEWS file and set the version number	2011-05-26 09:57:05 +02:00
William MARTIN	4238a5dd50	Update PO file from transifex	2011-05-26 09:56:25 +02:00
William MARTIN	94da55d15e	Fix tags extraction from git repository (issue 675)	2011-05-26 09:56:04 +02:00
William MARTIN	bbf1a1882a	Fix issue 671 : Update the SSH Key preg pattern	2011-05-04 11:24:05 +02:00
Thomas Keller	5322cdf609	Fix an URL in the RSS feed	2011-04-27 15:25:18 +02:00