Start with issue 638 (issue links); nothing workable yet.

Mark two strings for translation.
Merge branch 'develop' of projects.ceondo.com:indefero into develop
2011-05-09 13:52:09 +02:00 · 2011-05-06 14:04:08 +02:00 · 2011-05-04 11:22:50 +02:00 · 2011-05-04 11:22:24 +02:00 · 2011-04-28 23:53:15 +02:00 · 2011-04-28 15:43:09 +02:00
157 changed files with 1623 additions and 481 deletions
--- a/NEWS.mdtext
+++ b/NEWS.mdtext
@@ -6,6 +6,7 @@

 - 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

--- 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 Céondo Ltd and contributors.
+# 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
--- 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-2010 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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-2010 Céondo Ltd and contributors.
+# 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
--- 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-2010 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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-2010 Céondo Ltd and contributors.
+# 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
--- 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-2010 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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) 2010 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
@@ -319,6 +319,7 @@ 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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) 2010 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
-# 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
+# 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.
 #
-# Plume Framework is distributed in the hope that it will be useful,
+# 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 Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
+# 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
 #
--- 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 Céondo Ltd and contributors.
+# 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
@@ -109,6 +109,21 @@ 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
             *
--- 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 Céondo Ltd and contributors.
+# 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
@@ -72,6 +72,9 @@ 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())
    {
@@ -118,6 +121,15 @@ Maintainability      = Hinders future changes';
                                            '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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- a/src/IDF/Form/ProjectConf.php
+++ b/src/IDF/Form/ProjectConf.php
@@ -108,11 +108,11 @@ class IDF_Form_ProjectConf extends Pluf_Form
        $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.");
+            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.");
+            throw new Pluf_Form_Invalid(__('The picture must have a size of 32 by 32.'));
        }

        return $this->cleaned_data['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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
@@ -52,7 +52,7 @@ class IDF_Form_ReviewFileComment extends Pluf_Form
                                            ));
        }
        $this->fields['content'] = new Pluf_Form_Field_Varchar(
-                                      array('required' => true,
+                                      array('required' => false,
                                            'label' => __('General comment'),
                                            'initial' => '',
                                            'widget' => 'Pluf_Form_Widget_TextareaInput',
@@ -96,23 +96,39 @@ class IDF_Form_ReviewFileComment extends Pluf_Form
     */
    public function clean()
    {
-        foreach ($this->files as $filename => $def) {
-            if (!empty($this->cleaned_data[md5($filename)])) {
+        $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;
+            }
+        }
+        
+        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 (!$this->show_full and strlen($content) == 0) {
-            throw new Pluf_Form_Invalid(__('You need to provide your general comment about the proposal.'));
+        if(empty($content)) {
+            if ($this->fields['status']->initial != $this->fields['status']->value) {
+                return __('The status have been updated.');
            }
+        } else {
            return $content;
        }
        
+        throw new Pluf_Form_Invalid(__('This field is required.'));
+    }

    /**
     * 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
@@ -80,7 +80,10 @@ class IDF_Key extends Pluf_Model
        if (preg_match('#^\[pubkey ([^\]]+)\]\s*(\S+)\s*\[end\]$#', $this->content, $m)) {
            return array('mtn', $m[1], $m[2]);
        }
-        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S+))?$#', $this->content, $m)) {
+        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S*))?$#', $this->content, $m)) {
+            if (!isset($m[2])) {
+                $m[2] = "";
+            }
            return array('ssh', $m[2], $m[1]);
        }

--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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) 2010 Céondo Ltd and contributors.
+# 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
--- 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) 2011 Céondo Ltd and contributors.
+-- Copyright (C) 2008-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) 2011 Céondo Ltd and contributors.
+-- 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
--- 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) 2011 Céondo Ltd and contributors.
+-- 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
@@ -233,6 +233,22 @@ 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
--- 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 Céondo Ltd and contributors.
+# 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
@@ -94,7 +94,7 @@ class IDF_Scm_Mercurial extends IDF_Scm
                       escapeshellarg($this->repo),
                       escapeshellarg($rev));
        $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;
-        self::exec('IDF_Scm_Mercurial::isValidRevision', $cmd, $out, $ret);
+        self::exec('IDF_Scm_Mercurial::validateRevision', $cmd, $out, $ret);

        // FIXME: apparently a given hg revision can also be ambigious -
        //        handle this case here sometime
@@ -336,7 +336,7 @@ class IDF_Scm_Mercurial extends IDF_Scm
     */
    public function getCommit($commit, $getdiff=false)
    {
-        if (!$this->isValidRevision($commit)) {
+        if ($this->validateRevision($commit) != IDF_Scm::REVISION_VALID) {
            return false;
        }
        $tmpl = ($getdiff)
--- 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) 2010 Céondo Ltd and contributors.
+# 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
@@ -29,7 +29,7 @@
 class IDF_Scm_Monotone extends IDF_Scm
 {
    /** the minimum supported interface version */
-    public static $MIN_INTERFACE_VERSION = 12.0;
+    public static $MIN_INTERFACE_VERSION = 13.0;

    private $stdio;

@@ -135,13 +135,13 @@ class IDF_Scm_Monotone extends IDF_Scm
    /**
     * @see IDF_Scm::getArchiveStream
     */
-    public function getArchiveStream($commit, $prefix='repository/')
+    public function getArchiveStream($commit, $prefix = null)
    {
        $revs = $this->_resolveSelector($commit);
        // sanity: this should actually not happen, because the
        // revision is validated before already
        if (count($revs) == 0) {
-            return new Pluf_HTTP_Response_NotFound();
+            throw new IDF_Scm_Exception("$commit is not a valid revision");
        }
        return new IDF_Scm_Monotone_ZipRender($this->stdio, $revs[0]);
    }
@@ -536,9 +536,6 @@ 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;

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

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

        $res = array();

@@ -679,6 +676,7 @@ class IDF_Scm_Monotone extends IDF_Scm
        $res['parents'] = preg_split("/\n/", $parents, -1, PREG_SPLIT_NO_EMPTY);

        $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) 2010 Céondo Ltd and contributors.
+# 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
--- a/src/IDF/Scm/Monotone/IStdio.php
+++ b/src/IDF/Scm/Monotone/IStdio.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2011 Céondo Ltd and contributors.
+# 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
--- a/src/IDF/Scm/Monotone/Stdio.php
+++ b/src/IDF/Scm/Monotone/Stdio.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2010 Céondo Ltd and contributors.
+# 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
--- a/src/IDF/Scm/Monotone/Usher.php
+++ b/src/IDF/Scm/Monotone/Usher.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2010 Céondo Ltd and contributors.
+# 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
--- a/src/IDF/Scm/Monotone/ZipRender.php
+++ b/src/IDF/Scm/Monotone/ZipRender.php
@@ -3,19 +3,19 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2010 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
-# 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
+# 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.
 #
-# Plume Framework is distributed in the hope that it will be useful,
+# 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 Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
+# 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
 #
--- a/src/IDF/Scm/Svn.php
+++ b/src/IDF/Scm/Svn.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# 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
--- a/src/IDF/Search.php
+++ b/src/IDF/Search.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# 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
--- a/src/IDF/Search/Occ.php
+++ b/src/IDF/Search/Occ.php
@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# 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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Keller	9171bfd1ab	Start with issue 638 (issue links); nothing workable yet.	2011-05-09 13:52:09 +02:00
Thomas Keller	be4774c95c	Mark two strings for translation.	2011-05-06 14:04:08 +02:00
William MARTIN	9644784a79	Merge branch 'develop' of projects.ceondo.com:indefero into develop	2011-05-04 11:22:50 +02:00
William MARTIN	1940d5c0b5	Fix issue 671 : Update the SSH Key preg pattern	2011-05-04 11:22:24 +02:00
Thomas Keller	7c7e3cd1f1	Rework idf.php-dist a bit more: - move "Binary section" into "Path section" - make individual sections more prominent and therefor easier to grasp / scan for - fix the language and expand the explanations for a couple of items - remove the 'debug_scm' configuration variable (it is used nowhere in the source and just confuses people) - update the copyright	2011-04-28 23:53:15 +02:00
William MARTIN	3e2f95a152	Break too long line Add space between section	2011-04-28 15:43:09 +02:00
William MARTIN	92de88ba13	Rewrite of the idf.php-dist file - Add example for each mail and cache backend - Add major part of option use in each Scm backend with description	2011-04-28 15:12:00 +02:00
William MARTIN	02d0f0923e	Update the NEWS files	2011-04-27 15:09:04 +02:00
Thomas Keller	765a86ba90	Fix an URL in the RSS feed	2011-04-27 15:01:34 +02:00
William MARTIN	34309e34c3	Enhancement visibility of the RSS feed in the timeline view	2011-04-27 14:39:39 +02:00
Thomas Keller	2176d1cde2	Merge branch 'develop' of projects.ceondo.com:indefero into develop	2011-04-27 00:08:10 +02:00
Thomas Keller	45d53e8d21	Merge branch 'feature.better-home' into develop	2011-04-27 00:07:40 +02:00
Thomas Keller	801af66a4e	Apparently header() does kind of work for php-cli, but of course breaks horribly. Luckily Pluf has a little knob (IN_UNIT_TESTS) that can prevent this breakage.	2011-04-19 11:07:58 +02:00
Thomas Keller	df6ffdf420	Three more test cases for the mtn interface added - add tests for getTree(), getChanges() and isCommitLarge() - anonymize the test data somewhat - return false instead of null for unknown revisions given to getChanges()	2011-04-15 00:54:11 +02:00
Thomas Keller	b3368071ac	Continue with the mtn interface tests - test getRepositorySize() with a test file - implement tests for inTags(), inBranches(), getFile(), getCommit() and getExtraProperties() - mark the static methods as untestable	2011-04-14 00:48:36 +02:00
Thomas Keller	67b80ee11c	Continue with the mtn interface tests - getPathInfo(), disambiguateRevision() and validateRevision() are done - we no longer need to check / skip a format_version stanza for the extended manifest (there is no such stanza outputted)	2011-04-12 23:47:44 +02:00
William MARTIN	0afa07b2bd	Merge branch 'develop' of projects.ceondo.com:indefero into develop	2011-04-06 12:01:04 +02:00
William MARTIN	4ee3d471fe	Update the form validation of IDF_Form_ReviewFileComment. Now we can add a general comment without per file comment.	2011-04-06 12:00:55 +02:00
Thomas Keller	29c7fed81b	Merge branch 'develop' of git://projects.ceondo.com/indefero into develop	2011-04-06 03:01:40 +02:00
Thomas Keller	fb62061e5a	Started with a unit test for the monotone interface. Main test infrastructure is there, still lots of functionality left for testing. Fixed a possible bug in the SCM interface already: Pluf_HTTP_Response_NotFound needs a request instance as ctor argument, which we don't have at this point, therefor we just throw an exception.	2011-04-06 02:59:26 +02:00
William MARTIN	9b92b7139f	Fix copyright	2011-04-05 13:20:55 +02:00
William MARTIN	5ea4b02205	Update copyrigt	2011-04-02 21:37:07 +02:00
Thomas Keller	12d3eef3d1	monotone actually requires interface_version 13.0 or higher because of the extended manifest usage	2011-04-02 15:40:18 +02:00
Thomas Keller	ecef510f78	Merge branch 'develop' of projects.ceondo.com:indefero into develop	2011-04-01 11:18:01 +02:00
Thomas Keller	4976c20935	Its validateRevision, not isValidRevision, here as well	2011-04-01 11:17:21 +02:00
Thomas Keller	5553c37ccd	Merge branch 'release-1.1' into develop	2011-04-01 11:17:06 +02:00
Thomas Keller	346b2c6cf8	Call validateRevision(), not isValidRevision(), fixes issue 657	2011-04-01 11:15:13 +02:00