jro_apps/redmine Commit - r5:f37089f54784

v0.2.0...

Jean-Philippe Lang -

r5:f37089f54784

parent child

Context file:

r5:f37089f54784

Expand all files

redmine/config/environments/development_oracle.rb created 644 +19 0

@@ -0,0 +1,19
	1	# Settings specified here will take precedence over those in config/environment.rb
	2
	3	# In the development environment your application's code is reloaded on
	4	# every request. This slows down response time but is perfect for development
	5	# since you don't have to restart the webserver when you make code changes.
	6	config.cache_classes = false
	7
	8	# Log error messages when you accidentally call methods on nil.
	9	config.whiny_nils = true
	10
	11	# Enable the breakpoint server that script/breakpointer connects to
	12	config.breakpoint_server = true
	13
	14	# Show full error reports and disable caching
	15	config.action_controller.consider_all_requests_local = true
	16	config.action_controller.perform_caching = false
	17
	18	# Don't care if the mailer can't send
	19	config.action_mailer.raise_delivery_errors = false

redmine/config/environments/development_sqlserver.rb created 644 +19 0

@@ -0,0 +1,19
	1	# Settings specified here will take precedence over those in config/environment.rb
	2
	3	# In the development environment your application's code is reloaded on
	4	# every request. This slows down response time but is perfect for development
	5	# since you don't have to restart the webserver when you make code changes.
	6	config.cache_classes = false
	7
	8	# Log error messages when you accidentally call methods on nil.
	9	config.whiny_nils = true
	10
	11	# Enable the breakpoint server that script/breakpointer connects to
	12	config.breakpoint_server = true
	13
	14	# Show full error reports and disable caching
	15	config.action_controller.consider_all_requests_local = true
	16	config.action_controller.perform_caching = false
	17
	18	# Don't care if the mailer can't send
	19	config.action_mailer.raise_delivery_errors = false

redmine/config/environments/test_oracle.rb created 644 +15 0

@@ -0,0 +1,15
	1	# Settings specified here will take precedence over those in config/environment.rb
	2
	3	# The test environment is used exclusively to run your application's
	4	# test suite. You never need to work with it otherwise. Remember that
	5	# your test database is "scratch space" for the test suite and is wiped
	6	# and recreated between test runs. Don't rely on the data there!
	7	config.cache_classes = true
	8
	9	# Log error messages when you accidentally call methods on nil.
	10	config.whiny_nils = true
	11
	12	# Show full error reports and disable caching
	13	config.action_controller.consider_all_requests_local = true
	14	config.action_controller.perform_caching = false
	15

redmine/config/environments/test_pgsql.rb created 644 +15 0

@@ -0,0 +1,15
	1	# Settings specified here will take precedence over those in config/environment.rb
	2
	3	# The test environment is used exclusively to run your application's
	4	# test suite. You never need to work with it otherwise. Remember that
	5	# your test database is "scratch space" for the test suite and is wiped
	6	# and recreated between test runs. Don't rely on the data there!
	7	config.cache_classes = true
	8
	9	# Log error messages when you accidentally call methods on nil.
	10	config.whiny_nils = true
	11
	12	# Show full error reports and disable caching
	13	config.action_controller.consider_all_requests_local = true
	14	config.action_controller.perform_caching = false
	15

redmine/config/environments/test_sqlserver.rb created 644 +15 0

@@ -0,0 +1,15
	1	# Settings specified here will take precedence over those in config/environment.rb
	2
	3	# The test environment is used exclusively to run your application's
	4	# test suite. You never need to work with it otherwise. Remember that
	5	# your test database is "scratch space" for the test suite and is wiped
	6	# and recreated between test runs. Don't rely on the data there!
	7	config.cache_classes = true
	8
	9	# Log error messages when you accidentally call methods on nil.
	10	config.whiny_nils = true
	11
	12	# Show full error reports and disable caching
	13	config.action_controller.consider_all_requests_local = true
	14	config.action_controller.perform_caching = false
	15

redmine/public/manual/fr/ch01.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>Chapter 1. Administration</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="index.html" title="Documentation redMine"><link rel="prev" href="index.html" title="Documentation redMine"><link rel="next" href="ch01s01.html" title="1. Utilisateurs"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. Administration</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ch01s01.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="d0e4"></a>Chapter 1. Administration</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="ch01s01.html">1. Utilisateurs</a></span></dt><dd><dl><dt><span class="section"><a href="ch01s01.html#d0e12">1.1. Liste des utilisateurs</a></span></dt><dt><span class="section"><a href="ch01s01.html#d0e26">1.2. Création ou modification d'un utilisateur</a></span></dt></dl></dd><dt><span class="section"><a href="ch01s02.html">2. Rôles et permissions</a></span></dt><dt><span class="section"><a href="ch01s03.html">3. Trackers</a></span></dt><dt><span class="section"><a href="ch01s04.html">4. Champs personnalisés</a></span></dt><dt><span class="section"><a href="ch01s05.html">5. Statut des demandes</a></span></dt><dt><span class="section"><a href="ch01s06.html">6. Workflow</a></span></dt><dt><span class="section"><a href="ch01s07.html">7. Listes de valeurs</a></span></dt><dt><span class="section"><a href="ch01s08.html">8. Notifications par mail</a></span></dt><dt><span class="section"><a href="ch01s09.html">9. Informations</a></span></dt></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ch01s01.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Documentation redMine </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 1. Utilisateurs</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch01s01.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>1. Utilisateurs</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch01.html" title="Chapter 1. Administration"><link rel="prev" href="ch01.html" title="Chapter 1. Administration"><link rel="next" href="ch01s02.html" title="2. Rôles et permissions"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">1. Utilisateurs</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01.html">Prev</a> </td><th width="60%" align="center">Chapter 1. Administration</th><td width="20%" align="right"> <a accesskey="n" href="ch01s02.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e7"></a>1. Utilisateurs</h2></div></div></div><p>Ces écrans vous permettent de gérer les utilisateurs de l'application.</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e12"></a>1.1. Liste des utilisateurs</h3></div></div></div><p></p><div class="screenshot"><div class="mediaobject"><img src="resources/users_list.png"></div></div><p>Les boutons Lock/Unlock vous permettent de vérouiller/dévérouiller les comptes utilisateurs.</p><p>Un utilisateur dont le compte est vérouillé ne peut plus s'identifier pour accéder à l'application.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e26"></a>1.2. Création ou modification d'un utilisateur</h3></div></div></div><p>En mode modification, laissez le champ Password vide pour laisser le mot de passe de l'utilisateur inchangé.</p><p>Un utilisateur déclaré comme administrateur dispose de toutes les permissions sur l'application et sur tous les projets.</p><div class="itemizedlist"><ul type="disc"><li><p><span class="guilabel">Administrateur</span>: déclare l'utilisateur comme administrateur de l'application.</p></li><li><p><span class="guilabel">Notifications par mail</span>: permet d'activer ou non l'envoi automatique de notifications par mail pour cet utilisateur</p></li><li><p><span class="guilabel">Vérouillé</span>: désactive le compte de l'utilisateur</p></li></ul></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 1. Administration </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 2. Rôles et permissions</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch01s02.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>2. Rôles et permissions</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch01.html" title="Chapter 1. Administration"><link rel="prev" href="ch01s01.html" title="1. Utilisateurs"><link rel="next" href="ch01s03.html" title="3. Trackers"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2. Rôles et permissions</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s01.html">Prev</a> </td><th width="60%" align="center">Chapter 1. Administration</th><td width="20%" align="right"> <a accesskey="n" href="ch01s03.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e49"></a>2. Rôles et permissions</h2></div></div></div><p>Les rôles permettent de définir les permissions des différents membres d'un projet. Chaque membre d'un projet dispose d'un rôle unique au sein d'un projet. Un utilisateur peut avoir différents rôles au sein de différents projets.</p><p>Sur l'écran d'édition du rôle, cochez les actions que vous souhaitez autoriser pour le rôle.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">1. Utilisateurs </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 3. Trackers</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch01s03.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>3. Trackers</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch01.html" title="Chapter 1. Administration"><link rel="prev" href="ch01s02.html" title="2. Rôles et permissions"><link rel="next" href="ch01s04.html" title="4. Champs personnalisés"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3. Trackers</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s02.html">Prev</a> </td><th width="60%" align="center">Chapter 1. Administration</th><td width="20%" align="right"> <a accesskey="n" href="ch01s04.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e56"></a>3. Trackers</h2></div></div></div><p>Les trackers permettent de typer les demandes et de définir des workflows spécifiques pour chacun de ces types.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s04.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">2. Rôles et permissions </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 4. Champs personnalisés</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch01s04.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>4. Champs personnalisés</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch01.html" title="Chapter 1. Administration"><link rel="prev" href="ch01s03.html" title="3. Trackers"><link rel="next" href="ch01s05.html" title="5. Statut des demandes"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4. Champs personnalisés</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s03.html">Prev</a> </td><th width="60%" align="center">Chapter 1. Administration</th><td width="20%" align="right"> <a accesskey="n" href="ch01s05.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e61"></a>4. Champs personnalisés</h2></div></div></div><p>Les champs personnalisés vous permettent d'ajouter des informations supplémentaires sur les demandes. Un champ personnalisé peut être de l'un des types suivants:</p><div class="itemizedlist"><ul type="disc"><li><p><span class="guilabel">Integer</span>: entier positif ou négatif</p></li><li><p><span class="guilabel">String</span>: chaîne de caractère</p></li><li><p><span class="guilabel">Date</span>: date</p></li><li><p><span class="guilabel">Boolean</span>: booléen (case à cocher)</p></li><li><p><span class="guilabel">List</span>: valeur à sélectionnée parmi une liste prédéfinie (liste déroulante)</p></li></ul></div><p>Des éléments de validation peuvent être définis:</p><div class="itemizedlist"><ul type="disc"><li><p><span class="guilabel">Obligatoire</span>: champ dont la saisie est obligatoire sur les demandes</p></li><li><p><span class="guilabel">Pour tous les projects</span>: champ automatiquement associé à l'ensemble des projets</p></li><li><p><span class="guilabel">Min - max length</span>: longueurs minimales et maximales pour les champs en saisie libre (0 signifie qu'il n'y a pas de restriction)</p></li><li><p><span class="guilabel">Expression régulière</span>: expression régulière permettant de valider la valeur saisie</p></li><li><p><span class="guilabel">Valeurs possibles</span>: valeurs possibles pour les champs de type "Liste". Les valeurs sont séparées par le caractère \|</p></li></ul></div><p>Si l'option <span class="guilabel">Pour tous les projets</span> n'est pas activée, chaque projet pourra choisir d'utiliser ou non le champ pour ses demandes.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s03.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s05.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">3. Trackers </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 5. Statut des demandes</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch01s05.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>5. Statut des demandes</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch01.html" title="Chapter 1. Administration"><link rel="prev" href="ch01s04.html" title="4. Champs personnalisés"><link rel="next" href="ch01s06.html" title="6. Workflow"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">5. Statut des demandes</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s04.html">Prev</a> </td><th width="60%" align="center">Chapter 1. Administration</th><td width="20%" align="right"> <a accesskey="n" href="ch01s06.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e125"></a>5. Statut des demandes</h2></div></div></div><p>Ces écrans vous permettent de définir les différents statuts possibles des demandes.</p><div class="itemizedlist"><ul type="disc"><li><p><span class="guilabel">Demande fermée</span>: indique que le statut correspond à une demande considérée comme fermée</p></li><li><p><span class="guilabel">Statut par défaut</span>: statut appliqué par défaut aux nouvelles demandes (seul un statut peut être déclaré comme statut par défaut)</p></li><li><p><span class="guilabel">Couleur</span>: code couleur HTML (6 caractères) représentant le statut à l'affichage</p></li></ul></div><p></p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s04.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s06.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">4. Champs personnalisés </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 6. Workflow</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch01s06.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>6. Workflow</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch01.html" title="Chapter 1. Administration"><link rel="prev" href="ch01s05.html" title="5. Statut des demandes"><link rel="next" href="ch01s07.html" title="7. Listes de valeurs"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">6. Workflow</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s05.html">Prev</a> </td><th width="60%" align="center">Chapter 1. Administration</th><td width="20%" align="right"> <a accesskey="n" href="ch01s07.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e147"></a>6. Workflow</h2></div></div></div><p>Le workflow permet de définir les changements que les différents membres d'un projet sont autorisés à effectuer sur les demandes, en fonction de leur type.</p><p>Sélectionnez le rôle et le tracker pour lesquels vous souhaitez modifier le workflow, puis cliquez sur Edit. L'écran vous permet alors de modifier, pour le rôle et le tracker choisi, les changements autorisés. Les lignes représentent les statuts initiaux des demandes. Les colonnes représentent les statuts autorisés à être appliqués.</p><p>Remarque: pour qu'un rôle puisse changer le statut des demandes, la permission doit lui être explicitement donnée indépendemment de la configuration du workflow.</p><p></p><div class="screenshot"><div class="mediaobject"><img src="resources/workflow.png"></div></div><p>Dans l'exemple ci-dessus, les demandes de type Bug au statut Nouveau pourront être passées au statut Assignée ou Résolue par le rôle Développeur. Celles au statut Assignée pourront être passées au statut Résolue. Le statut de toutes les autres demandes de type Bug ne pourra pas être modifié par le Développeur.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s05.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s07.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">5. Statut des demandes </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 7. Listes de valeurs</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch01s07.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>7. Listes de valeurs</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch01.html" title="Chapter 1. Administration"><link rel="prev" href="ch01s06.html" title="6. Workflow"><link rel="next" href="ch01s08.html" title="8. Notifications par mail"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">7. Listes de valeurs</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s06.html">Prev</a> </td><th width="60%" align="center">Chapter 1. Administration</th><td width="20%" align="right"> <a accesskey="n" href="ch01s08.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e165"></a>7. Listes de valeurs</h2></div></div></div><p>Les listes de valeurs utilisées par l'application (exemple: les priorités des demandes) peuvent être personnalisées. Cet écran vous permet de définir les valeurs possibles pour chacune des listes suivantes:</p><div class="itemizedlist"><ul type="disc"><li><p>Priorités des demandes</p></li><li><p>Catégories de documents</p></li></ul></div><p></p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s06.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s08.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">6. Workflow </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 8. Notifications par mail</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch01s08.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>8. Notifications par mail</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch01.html" title="Chapter 1. Administration"><link rel="prev" href="ch01s07.html" title="7. Listes de valeurs"><link rel="next" href="ch01s09.html" title="9. Informations"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">8. Notifications par mail</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s07.html">Prev</a> </td><th width="60%" align="center">Chapter 1. Administration</th><td width="20%" align="right"> <a accesskey="n" href="ch01s09.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e178"></a>8. Notifications par mail</h2></div></div></div><p>Cet écran vous permet de sélectionner les actions qui donneront lieu à une notification par mail aux membres du projet.</p><p>Remarque: l'envoi de mails doit être activé dans la configuration de l'application si souhaitez effectuer des notifications.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s07.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s09.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">7. Listes de valeurs </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 9. Informations</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch01s09.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>9. Informations</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch01.html" title="Chapter 1. Administration"><link rel="prev" href="ch01s08.html" title="8. Notifications par mail"><link rel="next" href="ch02.html" title="Chapter 2. Projets"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">9. Informations</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s08.html">Prev</a> </td><th width="60%" align="center">Chapter 1. Administration</th><td width="20%" align="right"> <a accesskey="n" href="ch02.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e185"></a>9. Informations</h2></div></div></div><p>Affiche des informations relatives à l'application et à son environnement.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s08.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">8. Notifications par mail </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 2. Projets</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch02.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>Chapter 2. Projets</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="index.html" title="Documentation redMine"><link rel="prev" href="ch01s09.html" title="9. Informations"><link rel="next" href="ch02s01.html" title="1. Aperçu du projet"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 2. Projets</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s09.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ch02s01.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="d0e190"></a>Chapter 2. Projets</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="ch02s01.html">1. Aperçu du projet</a></span></dt><dt><span class="section"><a href="ch02s02.html">2. Gestion des demandes</a></span></dt><dd><dl><dt><span class="section"><a href="ch02s02.html#d0e204">2.1. Liste des demandes</a></span></dt></dl></dd><dt><span class="section"><a href="ch02s03.html">3. Rapports</a></span></dt><dt><span class="section"><a href="ch02s04.html">4. Historique</a></span></dt><dt><span class="section"><a href="ch02s05.html">5. Annonces</a></span></dt><dt><span class="section"><a href="ch02s06.html">6. Documents</a></span></dt><dt><span class="section"><a href="ch02s07.html">7. Fichiers</a></span></dt><dt><span class="section"><a href="ch02s08.html">8. Configuration du projet</a></span></dt><dd><dl><dt><span class="section"><a href="ch02s08.html#d0e248">8.1. Propriétés du projet</a></span></dt><dt><span class="section"><a href="ch02s08.html#d0e264">8.2. Membres</a></span></dt><dt><span class="section"><a href="ch02s08.html#d0e269">8.3. Versions</a></span></dt><dt><span class="section"><a href="ch02s08.html#d0e274">8.4. Catégories des demandes</a></span></dt></dl></dd></dl></div><p></p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s09.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ch02s01.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">9. Informations </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 1. Aperçu du projet</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch02s01.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>1. Aperçu du projet</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch02.html" title="Chapter 2. Projets"><link rel="prev" href="ch02.html" title="Chapter 2. Projets"><link rel="next" href="ch02s02.html" title="2. Gestion des demandes"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">1. Aperçu du projet</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Projets</th><td width="20%" align="right"> <a accesskey="n" href="ch02s02.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e194"></a>1. Aperçu du projet</h2></div></div></div><p>L'aperçu vous présente les informations générales relatives au projet, les principaux membres, les dernières annonces, ainsi qu'une synthèse du nombre de demandes ouvertes par tracker.</p><p></p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 2. Projets </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 2. Gestion des demandes</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch02s02.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>2. Gestion des demandes</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch02.html" title="Chapter 2. Projets"><link rel="prev" href="ch02s01.html" title="1. Aperçu du projet"><link rel="next" href="ch02s03.html" title="3. Rapports"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2. Gestion des demandes</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s01.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Projets</th><td width="20%" align="right"> <a accesskey="n" href="ch02s03.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e200"></a>2. Gestion des demandes</h2></div></div></div><p></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e204"></a>2.1. Liste des demandes</h3></div></div></div><p>Par défaut, l'ensemble des demandes ouvertes du projet sont affichées. Différents filtres vous permettent de sélectionner les demandes à afficher. Si le projet comporte des sous-projets, vous avez la possibilité d'afficher également les demandes relatives aux sous-projets (non affichées par défaut).</p><p>Une fois appliqué, un filtre reste valable durant toute votre session. Vous pouvez le redéfinir, ou le supprimer en cliquant sur Annuler.</p><p></p><div class="screenshot"><div class="mediaobject"><img src="resources/issues_list.png"></div></div><p></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">1. Aperçu du projet </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 3. Rapports</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch02s03.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>3. Rapports</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch02.html" title="Chapter 2. Projets"><link rel="prev" href="ch02s02.html" title="2. Gestion des demandes"><link rel="next" href="ch02s04.html" title="4. Historique"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3. Rapports</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s02.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Projets</th><td width="20%" align="right"> <a accesskey="n" href="ch02s04.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e219"></a>3. Rapports</h2></div></div></div><p>Cet écran présente la synthèse du nombre de demandes par statut et selon différents critères (tracker, priorité, catégorie). Des liens directs permettent d'accéder à la liste détaillée des demandes pour chaque critère.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s04.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">2. Gestion des demandes </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 4. Historique</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch02s04.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>4. Historique</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch02.html" title="Chapter 2. Projets"><link rel="prev" href="ch02s03.html" title="3. Rapports"><link rel="next" href="ch02s05.html" title="5. Annonces"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4. Historique</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s03.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Projets</th><td width="20%" align="right"> <a accesskey="n" href="ch02s05.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e224"></a>4. Historique</h2></div></div></div><p>Cette page présente l'ensemble des demandes résolues dans chacune des versions du projet. Certains types de demande peuvent être exclus de cet affichage.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s03.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s05.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">3. Rapports </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 5. Annonces</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch02s05.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>5. Annonces</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch02.html" title="Chapter 2. Projets"><link rel="prev" href="ch02s04.html" title="4. Historique"><link rel="next" href="ch02s06.html" title="6. Documents"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">5. Annonces</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s04.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Projets</th><td width="20%" align="right"> <a accesskey="n" href="ch02s06.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e229"></a>5. Annonces</h2></div></div></div><p>Les nouvelles vous permettent d'informer les utilisateurs sur l'activité du projet.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s04.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s06.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">4. Historique </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 6. Documents</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch02s06.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>6. Documents</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch02.html" title="Chapter 2. Projets"><link rel="prev" href="ch02s05.html" title="5. Annonces"><link rel="next" href="ch02s07.html" title="7. Fichiers"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">6. Documents</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s05.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Projets</th><td width="20%" align="right"> <a accesskey="n" href="ch02s07.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e234"></a>6. Documents</h2></div></div></div><p>Les documents sont groupés par catégories (voir Listes de valeurs). Un document peut contenir plusieurs fichiers (exemple: révisions ou versions successives).</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s05.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s07.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">5. Annonces </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 7. Fichiers</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch02s07.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>7. Fichiers</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch02.html" title="Chapter 2. Projets"><link rel="prev" href="ch02s06.html" title="6. Documents"><link rel="next" href="ch02s08.html" title="8. Configuration du projet"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">7. Fichiers</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s06.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Projets</th><td width="20%" align="right"> <a accesskey="n" href="ch02s08.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e239"></a>7. Fichiers</h2></div></div></div><p>Ce module vous permet de publier les différents fichiers (sources, binaires, ...) pour chaque version de l'application.</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s06.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02s08.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">6. Documents </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> 8. Configuration du projet</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/ch02s08.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>8. Configuration du projet</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="up" href="ch02.html" title="Chapter 2. Projets"><link rel="prev" href="ch02s07.html" title="7. Fichiers"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">8. Configuration du projet</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02s07.html">Prev</a> </td><th width="60%" align="center">Chapter 2. Projets</th><td width="20%" align="right"> </td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="d0e244"></a>8. Configuration du projet</h2></div></div></div><p></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e248"></a>8.1. Propriétés du projet</h3></div></div></div><p></p><div class="itemizedlist"><ul type="disc"><li><p><span class="guilabel">Public</span>: si le projet est public, il sera visible (consultation des demandes, des documents, ...) pour l'ensemble des utilisateurs, y compris ceux qui ne sont pas membres du projet. Si le projet n'est pas public, seuls les membres du projet y ont accès, en fonction de leur rôle.</p></li><li><p><span class="guilabel">Champs personnalisés</span>: sélectionner les champs personnalisés que vous souhaitez utiliser au sein du projet. Seul l'administrateur peut ajouter de nouveaux champs personnalisés.</p></li></ul></div><p></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e264"></a>8.2. Membres</h3></div></div></div><p>Cet écran vous permet de définir les membres du projet ainsi que leurs rôles respectifs. Un utilisateur ne peut avoir qu'un rôle au sein d'un projet donné. Le rôle d'un membre détermine les permissions dont il bénéficie sur le projet.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e269"></a>8.3. Versions</h3></div></div></div><p>Les versions vous permettent de suivre les changements survenus tout au long du projet. A la fermeture d'une demande, vous pouvez par exemple indiquer quelle version la prend en compte. Vous pouvez par ailleurs publier les différentes versions de l'application (voir Fichiers).</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="d0e274"></a>8.4. Catégories des demandes</h3></div></div></div><p>Les catégories de demande vous permettent de typer les demandes. Les catégories peuvent par exemple correspondre aux différents modules du projet.</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch02s07.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch02.html">Up</a></td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">7. Fichiers </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/html.css created 644 +55 0

@@ -0,0 +1,55
	1	body {
	2	background: #FFFFFF;
	3	font: 0.8em Verdana,Tahoma,Arial,sans-serif;
	4	}
	5
	6	h1, h2, h3, h4, h5 {
	7	color: #800000;
	8	font-family: sans-serif;
	9	}
	10
	11	table {
	12	font-size: 1em;
	13	}
	14
	15	a{
	16	color:#467aa7;
	17	font-weight:bold;
	18	text-decoration:none;
	19	background-color:inherit;
	20	}
	21
	22	a:hover{
	23	color: #800000;
	24	text-decoration:underline;
	25	background-color:inherit;
	26	}
	27
	28	a img{border:none;}
	29
	30	.screenshot {
	31	text-align: center;
	32	}
	33
	34	.guilabel {
	35	font-weight: bold;
	36	}
	37
	38	span.term {
	39	font-weight: bold;
	40	}
	41
	42	div.sidebar {
	43	background: #F0F0F0;
	44	border: 1px solid gray;
	45	padding: 5px;
	46	margin: 20px;
	47	}
	48
	49	pre.programlisting {
	50	background: #F0F0F0;
	51	border: 1px solid gray;
	52	padding: 2px;
	53	font-size: 10pt;
	54	white-space: pre;
	55	}

redmine/public/manual/fr/index.html created 644 +3 0

@@ -0,0 +1,3
	1	<html><head>
	2	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
	3	<title>Documentation redMine</title><link rel="stylesheet" href="html.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.70.1"><link rel="start" href="index.html" title="Documentation redMine"><link rel="next" href="ch01.html" title="Chapter 1. Administration"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Documentation redMine</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ch01.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="d0e1"></a>Documentation redMine</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="ch01.html">1. Administration</a></span></dt><dd><dl><dt><span class="section"><a href="ch01s01.html">1. Utilisateurs</a></span></dt><dd><dl><dt><span class="section"><a href="ch01s01.html#d0e12">1.1. Liste des utilisateurs</a></span></dt><dt><span class="section"><a href="ch01s01.html#d0e26">1.2. Création ou modification d'un utilisateur</a></span></dt></dl></dd><dt><span class="section"><a href="ch01s02.html">2. Rôles et permissions</a></span></dt><dt><span class="section"><a href="ch01s03.html">3. Trackers</a></span></dt><dt><span class="section"><a href="ch01s04.html">4. Champs personnalisés</a></span></dt><dt><span class="section"><a href="ch01s05.html">5. Statut des demandes</a></span></dt><dt><span class="section"><a href="ch01s06.html">6. Workflow</a></span></dt><dt><span class="section"><a href="ch01s07.html">7. Listes de valeurs</a></span></dt><dt><span class="section"><a href="ch01s08.html">8. Notifications par mail</a></span></dt><dt><span class="section"><a href="ch01s09.html">9. Informations</a></span></dt></dl></dd><dt><span class="chapter"><a href="ch02.html">2. Projets</a></span></dt><dd><dl><dt><span class="section"><a href="ch02s01.html">1. Aperçu du projet</a></span></dt><dt><span class="section"><a href="ch02s02.html">2. Gestion des demandes</a></span></dt><dd><dl><dt><span class="section"><a href="ch02s02.html#d0e204">2.1. Liste des demandes</a></span></dt></dl></dd><dt><span class="section"><a href="ch02s03.html">3. Rapports</a></span></dt><dt><span class="section"><a href="ch02s04.html">4. Historique</a></span></dt><dt><span class="section"><a href="ch02s05.html">5. Annonces</a></span></dt><dt><span class="section"><a href="ch02s06.html">6. Documents</a></span></dt><dt><span class="section"><a href="ch02s07.html">7. Fichiers</a></span></dt><dt><span class="section"><a href="ch02s08.html">8. Configuration du projet</a></span></dt><dd><dl><dt><span class="section"><a href="ch02s08.html#d0e248">8.1. Propriétés du projet</a></span></dt><dt><span class="section"><a href="ch02s08.html#d0e264">8.2. Membres</a></span></dt><dt><span class="section"><a href="ch02s08.html#d0e269">8.3. Versions</a></span></dt><dt><span class="section"><a href="ch02s08.html#d0e274">8.4. Catégories des demandes</a></span></dt></dl></dd></dl></dd></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ch01.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> Chapter 1. Administration</td></tr></table></div></body></html> No newline at end of file

redmine/public/manual/fr/resources/issues_list.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

redmine/public/manual/fr/resources/workflow.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

redmine/test/integration/account_test.rb created 644 +76 0

@@ -0,0 +1,76
	1	# redMine - project management software
	2	# Copyright (C) 2006 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require "#{File.dirname(__FILE__)}/../test_helper"
	19
	20	class AccountTest < ActionController::IntegrationTest
	21	fixtures :users
	22
	23	# Replace this with your real tests.
	24	def test_login
	25	get "account/my_page"
	26	assert_redirected_to "account/login"
	27	log_user('plochon', 'admin')
	28
	29	get "account/my_account"
	30	assert_response :success
	31	assert_template "account/my_account"
	32	end
	33
	34	def test_change_password
	35	log_user('plochon', 'admin')
	36	get "account/my_account"
	37	assert_response :success
	38	assert_template "account/my_account"
	39
	40	post "account/change_password", :password => 'admin', :new_password => "hello", :new_password_confirmation => "hello2"
	41	assert_response :success
	42	assert_tag :tag => "div", :attributes => { :class => "errorExplanation" }
	43
	44	post "account/change_password", :password => 'admiN', :new_password => "hello", :new_password_confirmation => "hello"
	45	assert_response :success
	46	assert_equal 'Wrong password', flash[:notice]
	47
	48	post "account/change_password", :password => 'admin', :new_password => "hello", :new_password_confirmation => "hello"
	49	assert_response :success
	50	log_user('plochon', 'hello')
	51	end
	52
	53	def test_my_account
	54	log_user('plochon', 'admin')
	55	get "account/my_account"
	56	assert_response :success
	57	assert_template "account/my_account"
	58
	59	post "account/my_account", :user => {:firstname => "Joe", :login => "root", :admin => 1}
	60	assert_response :success
	61	assert_template "account/my_account"
	62	user = User.find(2)
	63	assert_equal "Joe", user.firstname
	64	assert_equal "plochon", user.login
	65	assert_equal false, user.admin?
	66
	67	log_user('plochon', 'admin')
	68	end
	69
	70	def test_my_page
	71	log_user('plochon', 'admin')
	72	get "account/my_page"
	73	assert_response :success
	74	assert_template "account/my_page"
	75	end
	76	end

redmine/test/integration/admin_test.rb created 644 +61 0

@@ -0,0 +1,61
	1	# redMine - project management software
	2	# Copyright (C) 2006 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require "#{File.dirname(__FILE__)}/../test_helper"
	19
	20	class AdminTest < ActionController::IntegrationTest
	21	fixtures :users
	22
	23	def test_add_user
	24	log_user("admin", "admin")
	25	get "/users/add"
	26	assert_response :success
	27	assert_template "users/add"
	28	post "/users/add", :user => { :login => "jsmith", :firstname => "John", :lastname => "Smith", :mail => "jsmith@somenet.foo", :language => "en" }, :password => "jsmith09", :password_confirmation => "jsmith09"
	29	assert_redirected_to "users/list"
	30
	31	user = User.find_by_login("jsmith")
	32	assert_kind_of User, user
	33	logged_user = User.try_to_login("jsmith", "jsmith09")
	34	assert_kind_of User, logged_user
	35	assert_equal "John", logged_user.firstname
	36
	37	post "users/edit", :id => user.id, :user => { :locked => 1 }
	38	assert_redirected_to "users/list"
	39	locked_user = User.try_to_login("jsmith", "jsmith09")
	40	assert_equal nil, locked_user
	41	end
	42
	43	def test_add_project
	44	log_user("admin", "admin")
	45	get "projects/add"
	46	assert_response :success
	47	assert_template "projects/add"
	48	post "projects/add", :project => { :name => "blog", :descr => "weblog", :is_public => 1}
	49	assert_redirected_to "admin/projects"
	50	assert_equal 'Project was successfully created.', flash[:notice]
	51
	52	project = Project.find_by_name("blog")
	53	assert_kind_of Project, project
	54	assert_equal "weblog", project.descr
	55	assert_equal true, project.is_public?
	56
	57	get "admin/projects"
	58	assert_response :success
	59	assert_template "admin/projects"
	60	end
	61	end

redmine/app/controllers/account_controller.rb +5 -11

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class AccountController < ApplicationController
               layout 'base'
               # prevents login action to be filtered by check_if_login_required application scope filter
               skip_before_filter :check_if_login_required, :only => :login
               before_filter :require_login, :except => [:show, :login]
               def show
                 @user = User.find(params[:id])
               end
               # Login request and validation
               def login
                 if request.get?
                   session[:user] = nil
-            			@user = User.new
                 else
-            			@user = User.new(params[:user])
+                  logged_in_user = User.try_to_login(params[:login], params[:password])
-            			logged_in_user = @user.try_to_login
                   if logged_in_user
                     session[:user] = logged_in_user
                     redirect_back_or_default :controller => 'account', :action => 'my_page'
                   else
                     flash[:notice] = _('Invalid user/password')
                   end
                 end
               end
             	# Log out current user and redirect to welcome page
             	def logout
             		session[:user] = nil
             		redirect_to(:controller => '')
             	end
             	def my_page
             		@user = session[:user]
             		@reported_issues = Issue.find(:all, :conditions => ["author_id=?", @user.id], :limit => 10, :include => [ :status, :project, :tracker ], :order => 'issues.updated_on DESC')
             		@assigned_issues = Issue.find(:all, :conditions => ["assigned_to_id=?", @user.id], :limit => 10, :include => [ :status, :project, :tracker ], :order => 'issues.updated_on DESC')
             	end
             	# Edit current user's account
             	def my_account
             		@user = User.find(session[:user].id)
             		if request.post? and @user.update_attributes(@params[:user])
             			flash[:notice] = 'Account was successfully updated.'
                   session[:user] = @user
                   set_localization
             		end
             	end
               # Change current user's password
               def change_password
                 @user = User.find(session[:user].id)
-            		if @user.check_password?(@params[:old_password])
+                if @user.check_password?(@params[:password])
-            			if @params[:new_password] == @params[:new_password_confirmation]
+                  @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-            				if @user.change_password(@params[:old_password], @params[:new_password])
+                  flash[:notice] = 'Password was successfully updated.' if @user.save
-            					flash[:notice] = 'Password was successfully updated.'
-            				end
-            			else
-            				flash[:notice] = 'Password confirmation doesn\'t match!'
-            			end
                 else
                   flash[:notice] = 'Wrong password'
                 end
                 render :action => 'my_account'
               end
             end

redmine/app/controllers/admin_controller.rb +9 -4

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class AdminController < ApplicationController
               layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               def index
               end
               def projects
-            		sort_init 'projects.name', 'asc'
+                sort_init 'name', 'asc'
                 sort_update
-                @project_pages, @projects = paginate :projects, :per_page => 15, :order => sort_clause
+                @project_count = Project.count
+                @project_pages = Paginator.new self, @project_count,
+,
+            								@params['page']
+                @projects = Project.find :all, :order => sort_clause,
+            						:limit  =>  @project_pages.items_per_page,
+            						:offset =>  @project_pages.current.offset
               end
               def mail_options
                 @actions = Permission.find(:all, :conditions => ["mail_option=?", true]) || []
                 if request.post?
                   @actions.each { |a|
-                    a.mail_enabled = params[:action_ids].include? a.id.to_s
+                    a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s
                     a.save
                   }
                   flash[:notice] = "Mail options were successfully updated."
                 end
               end
               def info
                 @adapter_name = ActiveRecord::Base.connection.adapter_name
               end
             end

redmine/app/controllers/application.rb +18 -8

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ApplicationController < ActionController::Base
               before_filter :check_if_login_required, :set_localization
               # check if login is globally required to access the application
               def check_if_login_required
                 require_login if RDM_LOGIN_REQUIRED
               end
               def set_localization
-                Localization.lang = session[:user].nil? ? RDM_DEFAULT_LANG : (session[:user].language || RDM_DEFAULT_LANG)
+                Localization.lang = begin
+                  if session[:user]
+                    session[:user].language
+                  elsif request.env['HTTP_ACCEPT_LANGUAGE']
+                    accept_lang = HTTPUtils.parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
+                    if Localization.langs.collect{ |l| l[1] }.include? accept_lang
+                      accept_lang
+                    end
+                  end
+                rescue
+                  nil
+                end || RDM_DEFAULT_LANG
               end
               def require_login
                 unless session[:user]
                   store_location
                   redirect_to(:controller => "account", :action => "login")
                 end
               end
               def require_admin
                 if session[:user].nil?
                   store_location
                   redirect_to(:controller => "account", :action => "login")
                 else
                   unless session[:user].admin?
                     flash[:notice] = "Acces not allowed"
                     redirect_to(:controller => "projects", :action => "list")
                   end
                 end
               end
               # authorizes the user for the requested action.
               def authorize
                 # check if action is allowed on public projects
-                if @project.public? and Permission.allowed_to_public "%s/%s" % [ @params[:controller], @params[:action] ]
+                if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ @params[:controller], @params[:action] ]
                   return true
                 end
-                # if user is not logged in, he is redirect to login form
+                # if user not logged in, redirect to login form
                 unless session[:user]
                   store_location
                   redirect_to(:controller => "account", :action => "login")
                   return false
                 end
-                # check if user is authorized
+                # if logged in, check if authorized
                 if session[:user].admin? or Permission.allowed_to_role( "%s/%s" % [ @params[:controller], @params[:action] ], session[:user].role_for_project(@project.id)  )
                   return true
                 end
                 flash[:notice] = "Acces denied"
                 redirect_to(:controller => "")
-                return false
+                false
               end
-            	# store current uri in  the session.
+              # store current uri in session.
-            	# we can return to this location by calling redirect_back_or_default
+              # return to this location by calling redirect_back_or_default
               def store_location
                 session[:return_to] = @request.request_uri
               end
               # move to the last store_location call or to the passed default one
               def redirect_back_or_default(default)
                 if session[:return_to].nil?
                   redirect_to default
                 else
                   redirect_to_url session[:return_to]
                   session[:return_to] = nil
                 end
               end
             end

redmine/app/controllers/help_controller.rb +10 -6

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class HelpController < ApplicationController
               skip_before_filter :check_if_login_required
               before_filter :load_help_config
+              # displays help page for the requested controller/action
               def index
-            		if @params[:ctrl] and @help_config[@params[:ctrl]]
+                # select help page to display
-            			if @params[:page] and @help_config[@params[:ctrl]][@params[:page]]
+                if @params[:ctrl] and @help_config['pages'][@params[:ctrl]]
-            				template = @help_config[@params[:ctrl]][@params[:page]]
+                  if @params[:page] and @help_config['pages'][@params[:ctrl]][@params[:page]]
+                    template = @help_config['pages'][@params[:ctrl]][@params[:page]]
                   else
-            				template = @help_config[@params[:ctrl]]['index']
+                    template = @help_config['pages'][@params[:ctrl]]['index']
                   end
                 end
+                # choose language according to available help translations
+                lang = (@help_config['langs'].include? Localization.lang) ? Localization.lang : @help_config['langs'].first
                 if template
-                  redirect_to "/manual/#{template}"
+                  redirect_to "/manual/#{lang}/#{template}"
                 else
-                  redirect_to "/manual/"
+                  redirect_to "/manual/#{lang}/"
                 end
               end
             private
               def load_help_config
                 @help_config = YAML::load(File.open("#{RAILS_ROOT}/config/help.yml"))
               end
             end

redmine/app/controllers/projects_controller.rb +11 -7

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ProjectsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :search_filter
               include SearchFilterHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list'
               end
               # Lists public projects
               def list
-            		sort_init 'projects.name', 'asc'
+                sort_init 'name', 'asc'
                 sort_update
-            		@project_count = Project.count(["public=?", true])
+                @project_count = Project.count(["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
             								@params['page']
                 @projects = Project.find :all, :order => sort_clause,
-            						:conditions => ["public=?", true],
+            						:conditions => ["is_public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
               end
               # Add a new project
               def add
                 @custom_fields = CustomField::find_all
+                @root_projects = Project::find(:all, :conditions => "parent_id is null")
                 @project = Project.new(params[:project])
                 if request.post?
                   @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   if @project.save
                     flash[:notice] = 'Project was successfully created.'
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
             	# Show @project
               def show
                 @members = @project.members.find(:all, :include => [:user, :role])
+                @subprojects = @project.children if @project.children_count > 0
+                @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
               end
               def settings
+                @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                 @custom_fields = CustomField::find_all
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @roles = Role.find_all
                 @users = User.find_all - @project.members.find(:all, :include => :user).collect{|m| m.user }
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   if @project.update_attributes(params[:project])
                     flash[:notice] = 'Project was successfully updated.'
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
             	# Delete @project
             	def destroy
                 if request.post? and params[:confirm]
                   @project.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
             	end
             	# Add a new issue category to @project
             	def add_issue_category
             		if request.post?
             			@issue_category = @project.issue_categories.build(params[:issue_category])
             			if @issue_category.save
             				redirect_to :action => 'settings', :id => @project
             			else
                     settings
                     render :action => 'settings'
             			end
             		end
             	end
             	# Add a new version to @project
             	def add_version
             		@version = @project.versions.build(params[:version])
             		if request.post? and @version.save
                   redirect_to :action => 'settings', :id => @project
             		end
             	end
             	# Add a new member to @project
             	def add_member
                 @member = @project.members.build(params[:member])
             		if request.post?
             			if @member.save
                     flash[:notice] = 'Member was successfully added.'
             				redirect_to :action => 'settings', :id => @project
             			else
                     settings
                     render :action => 'settings'
                   end
             		end
             	end
             	# Show members list of @project
             	def list_members
             		@members = @project.members
             	end
             	# Add a new document to @project
             	def add_document
             		@categories = Enumeration::get_values('DCAT')
             		@document = @project.documents.build(params[:document])
             		if request.post?
                   # Save the attachment
             			if params[:attachment][:file].size > 0
             				@attachment = @document.attachments.build(params[:attachment])
                     @attachment.author_id = session[:user].id unless session[:user].nil?
             			end
             			if @document.save
             				redirect_to :action => 'list_documents', :id => @project
             			end
             		end
             	end
             	# Show documents list of @project
             	def list_documents
             		@documents = @project.documents
             	end
             	# Add a new issue to @project
             	def add_issue
             		@trackers = Tracker.find(:all)
             		@priorities = Enumeration::get_values('IPRI')
             		if request.get?
             			@issue = @project.issues.build
             			@custom_values = @project.custom_fields_for_issues.collect { |x| CustomValue.new(:custom_field => x) }
             		else
             			# Create the issue and set the author
             			@issue = @project.issues.build(params[:issue])
                   @issue.author = session[:user] unless session[:user].nil?
             			# Create the document if a file was sent
             			if params[:attachment][:file].size > 0
             				@attachment = @issue.attachments.build(params[:attachment])
                     @attachment.author_id = session[:user].id unless session[:user].nil?
             			end
             			@custom_values = @project.custom_fields_for_issues.collect { |x| CustomValue.new(:custom_field => x, :value => params["custom_fields"][x.id.to_s]) }
             			@issue.custom_values = @custom_values
             			if @issue.save
                     flash[:notice] = "Issue was successfully added."
             				Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
             				redirect_to :action => 'list_issues', :id => @project
             			end
             		end
             	end
-              # Show issues list of @project
+              # Show filtered/sorted issues list of @project
               def list_issues
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 search_filter_update if params[:set_filter] or request.post?
-                @issue_count = Issue.count(:include => :status, :conditions => search_filter_clause)
+                @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause)
                 @issue_pages = Paginator.new self, @issue_count, 15, @params['page']
                 @issues =  Issue.find :all, :order => sort_clause,
-            						:include => [ :author, :status, :tracker ],
+            						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause,
             						:limit  =>  @issue_pages.items_per_page,
             						:offset =>  @issue_pages.current.offset
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 @issues =  Issue.find :all, :order => sort_clause,
-            						:include => [ :author, :status, :tracker ],
+            						:include => [ :author, :status, :tracker, :project ],
             						:conditions => search_filter_clause
                 export = StringIO.new
                 CSV::Writer.generate(export, ',') do |csv|
                   csv << %w(Id Status Tracker Subject Author Created Updated)
                   @issues.each do |issue|
                     csv << [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, _('(time)', issue.created_on),  _('(time)', issue.updated_on)]
                   end
                 end
                 export.rewind
                 send_data(export.read,
                   :type => 'text/csv; charset=utf-8; header=present',
                   :filename => 'export.csv')
               end
             	# Add a news to @project
             	def add_news
                 @news = @project.news.build(params[:news])
             		if request.post?
             			@news.author = session[:user] unless session[:user].nil?
             			if @news.save
             				redirect_to :action => 'list_news', :id => @project
             			end
             		end
             	end
             	# Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
               end
               def add_file
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @project.versions.find(params[:version_id]).attachments.build(params[:attachment])
                     @attachment.author_id = session[:user].id unless session[:user].nil?
                     if @attachment.save
                       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                     end
                   end
                 end
                 @versions = @project.versions
               end
               def list_files
                 @versions = @project.versions
               end
               # Show changelog of @project
               def changelog
                 @fixed_issues = @project.issues.find(:all,
                                                    :include => [ :fixed_version, :status, :tracker ],
                                                    :conditions => [ "issue_statuses.is_closed=? and trackers.is_in_chlog=? and issues.fixed_version_id is not null", true, true]
                                                   )
               end
             private
             	# Find project of id params[:id]
             	# if not found, redirect to project list
             	# used as a before_filter
             	def find_project
             		@project = Project.find(params[:id])
             		rescue
             			flash[:notice] = 'Project not found.'
             			redirect_to :action => 'list'
             	end
             end

redmine/app/controllers/roles_controller.rb +3 -3

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class RolesController < ApplicationController
             	layout 'base'
             	before_filter :require_admin
               def index
                 list
                 render :action => 'list'
               end
               def list
                 @role_pages, @roles = paginate :roles, :per_page => 10
               end
               def new
                 @role = Role.new(params[:role])
                 if request.post?
                   @role.permissions = Permission.find(@params[:permission_ids]) if @params[:permission_ids]
                   if @role.save
                     flash[:notice] = 'Role was successfully created.'
                     redirect_to :action => 'list'
                   end
                 end
                 @permissions = Permission.find(:all, :order => 'sort ASC')
               end
               def edit
                 @role = Role.find(params[:id])
                 if request.post? and @role.update_attributes(params[:role])
                   @role.permissions = Permission.find(@params[:permission_ids] || [])
                   Permission.allowed_to_role_expired
                   flash[:notice] = 'Role was successfully updated.'
                   redirect_to :action => 'list'
                 end
                 @permissions = Permission.find(:all, :order => 'sort ASC')
               end
               def destroy
                 @role = Role.find(params[:id])
                 unless @role.members.empty?
                   flash[:notice] = 'Some members have this role. Can\'t delete it.'
                 else
                   @role.destroy
                 end
                 redirect_to :action => 'list'
               end
               def workflow
-                @roles = Role.find_all
-                @trackers = Tracker.find_all
-                @statuses = IssueStatus.find_all
                 @role = Role.find_by_id(params[:role_id])
                 @tracker = Tracker.find_by_id(params[:tracker_id])
                 if request.post?
                   Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
                   (params[:issue_status] || []).each { |old, news|
                     news.each { |new|
                       @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new)
                     }
                   }
                   if @role.save
                     flash[:notice] = 'Workflow was successfully updated.'
                   end
                 end
+                @roles = Role.find_all
+                @trackers = Tracker.find_all
+                @statuses = IssueStatus.find(:all, :include => :workflows)
               end
             end

redmine/app/controllers/users_controller.rb +6 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class UsersController < ApplicationController
               layout 'base'
               before_filter :require_admin
               helper :sort
               include SortHelper
               def index
                 list
                 render :action => 'list'
               end
               def list
-            		sort_init 'users.login', 'asc'
+                sort_init 'login', 'asc'
                 sort_update
                 @user_count = User.count
                 @user_pages = Paginator.new self, @user_count,
 ,
             								@params['page']
                 @users =  User.find :all,:order => sort_clause,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
               end
               def add
                 if request.get?
                   @user = User.new
                 else
                   @user = User.new(params[:user])
-            			@user.admin = params[:user][:admin]
+                  @user.admin = params[:user][:admin] || false
+                  @user.login = params[:user][:login]
+                  @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
                     redirect_to :action => 'list'
                   end
                 end
               end
               def edit
                 @user = User.find(params[:id])
                 if request.post?
                   @user.admin = params[:user][:admin] if params[:user][:admin]
+                  @user.login = params[:user][:login] if params[:user][:login]
+                  @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty?
                   if @user.update_attributes(params[:user])
                     flash[:notice] = 'User was successfully updated.'
                     redirect_to :action => 'list'
                   end
                 end
               end
               def destroy
                 User.find(params[:id]).destroy
                 redirect_to :action => 'list'
               rescue
                 flash[:notice] = "Unable to delete user"
                 redirect_to :action => 'list'
               end
             end

redmine/app/controllers/versions_controller.rb +3 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class VersionsController < ApplicationController
             	layout 'base'
             	before_filter :find_project, :authorize
             	def edit
             		if request.post? and @version.update_attributes(params[:version])
                   flash[:notice] = 'Version was successfully updated.'
                   redirect_to :controller => 'projects', :action => 'settings', :id => @project
             		end
             	end
             	def destroy
             		@version.destroy
             		redirect_to :controller => 'projects', :action => 'settings', :id => @project
               rescue
                 flash[:notice] = "Unable to delete version"
             		redirect_to :controller => 'projects', :action => 'settings', :id => @project
             	end
               def download
                 @attachment = @version.attachments.find(params[:attachment_id])
                 @attachment.increment_download
                 send_file @attachment.diskfile, :filename => @attachment.filename
+              rescue
+                flash[:notice]="Requested file doesn't exist or has been deleted."
+                redirect_to :controller => 'projects', :action => 'list_files', :id => @project
               end
               def destroy_file
                 @version.attachments.find(params[:attachment_id]).destroy
                 redirect_to :controller => 'projects', :action => 'list_files', :id => @project
               end
             private
             	def find_project
                 @version = Version.find(params[:id])
             		@project = @version.project
             	end
             end

redmine/app/helpers/application_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module ApplicationHelper
             	def loggedin?
             		session[:user]
             	end
             	def admin_loggedin?
             		session[:user] && session[:user].admin
             	end
             	def authorize_for(controller, action)
                 # check if action is allowed on public projects
-                if @project.public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
+                if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
                   return true
                 end
                 # check if user is authorized
                 if session[:user] and (session[:user].admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], session[:user].role_for_project(@project.id)  )  )
             			return true
             		end
             		return false
             	end
             	def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
             		link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
             	end
             	# Display a link to user's account page
             	def link_to_user(user)
             		link_to user.display_name, :controller => 'account', :action => 'show', :id => user
             	end
               def format_date(date)
                 _('(date)', date) if date
               end
               def format_time(time)
                 _('(time)', time) if time
               end
               def pagination_links_full(paginator, options={}, html_options={})
                 html =''
                 html << link_to(('&#171; ' + _('Previous') ), { :page => paginator.current.previous }) + ' ' if paginator.current.previous
                 html << (pagination_links(paginator, options, html_options) || '')
                 html << ' ' + link_to((_('Next') + ' &#187;'), { :page => paginator.current.next }) if paginator.current.next
                 html
               end
             end

redmine/app/helpers/search_filter_helper.rb +32 -27

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module SearchFilterHelper
               def search_filter_criteria(name, options = {})
-                session[:search_filter] ||= {}
+                @search_filter ||= {}
-                session[:search_filter][name] ||= {}
+                @search_filter[name] ||= {}
-                unless session[:search_filter][name][:options] and session[:search_filter][name][:conditions]
+                @search_filter[name][:options] = []
-                  session[:search_filter][name][:options] = []
+                @search_filter[name][:conditions] = {}
-                  session[:search_filter][name][:conditions] = {}
                 yield.each { |c|
-                    session[:search_filter][name][:options] << [c[0], c[1].to_s]
+                  @search_filter[name][:options] << [c[0], c[1].to_s]
-                    session[:search_filter][name][:conditions].store(c[1].to_s, c[2])
+                  @search_filter[name][:conditions].store(c[1].to_s, c[2])
                 }
               end
-              end
               def search_filter_update
-                session[:search_filter].each_key {|field| session[:search_filter][field][:value] = params[field]  }
+                @search_filter.each_key {|field| session[:search_filter][field] = params[field]  }
               end
               def search_filter_clause
-                clause = ["issues.project_id=?", @project.id]
+                clause = ["1=1"]
-                session[:search_filter].each { |k, v|
+                @search_filter.each { |k, v|
-                  v[:value] ||= v[:options][0][1]
+                  filter_value = session[:search_filter][k] || v[:options][0][1]
-                  if (!v[:conditions][v[:value]][0].empty?)
+                  if v[:conditions][filter_value]
-                    clause[0] = clause[0] + " AND " + v[:conditions][v[:value]][0]
+                    clause[0] = clause[0] + " AND " + v[:conditions][filter_value].first
-                    clause << v[:conditions][v[:value]][1] if !v[:conditions][v[:value]][1].nil?
+                    clause += v[:conditions][filter_value][1..-1]
                   end
                 }
                 clause
               end
-              def search_filter_tag(criteria)
+              def search_filter_tag(criteria, options = {})
+                options[:name] = criteria
                 content_tag("select",
-            				options_for_select(session[:search_filter][criteria][:options], session[:search_filter][criteria][:value]),
+            				options_for_select(@search_filter[criteria][:options], session[:search_filter][criteria]),
-            				:name => criteria
+            				options
             				)
               end
               def search_filter_init_list_issues
             	search_filter_criteria('status_id') {
-                [ ["[Open]", "O", ["issue_statuses.is_closed=?", false]],
+                [ [_('[Open]'), "O", ["issue_statuses.is_closed=?", false]],
-                  ["[All]", "A", ["", false]]
+                  [_('[All]'), "A", nil]
                 ] + IssueStatus.find(:all).collect {|s| [s.name, s.id, ["issues.status_id=?", s.id]] }
                 }
                 search_filter_criteria('tracker_id') {
-                [ ["[All]", "A", ["", false]]
+                [ [_('[All]'), "A", nil]
                 ] + Tracker.find(:all).collect {|s| [s.name, s.id, ["issues.tracker_id=?", s.id]] }
                 }
                 search_filter_criteria('priority_id') {
-                [ ["[All]", "A", ["", false]]
+                [ [_('[All]'), "A", nil]
                 ] + Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect {|s| [s.name, s.id, ["issues.priority_id=?", s.id]] }
                 }
                 search_filter_criteria('category_id') {
-                [ ["[All]", "A", ["", false]],
+                [ [_('[All]'), "A", nil],
-                  ["[None]", "N", ["issues.category_id is null"]]
+                  [_('[None]'), "N", ["issues.category_id is null"]]
                 ] + @project.issue_categories.find(:all).collect {|s| [s.name, s.id, ["issues.category_id=?", s.id]] }
                 }
                 search_filter_criteria('assigned_to_id') {
-                [ ["[All]", "A", ["", false]],
+                [ [_('[All]'), "A", nil],
-                  ["[Nobody]", "N", ["issues.assigned_to_id is null"]]
+                  [_('[None]'), "N", ["issues.assigned_to_id is null"]]
-                ] + User.find(:all).collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] }
+                ] + @project.users.collect {|s| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] }
+                }
+                search_filter_criteria('subproject_id') {
+                [ [_('[None]'), "N", ["issues.project_id=?", @project.id]],
+                  [_('[All]'), "A", ["(issues.project_id=? or projects.parent_id=?)", @project.id, @project.id]]
+                ]
                 }
               end
             end

redmine/app/models/attachment.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require "digest/md5"
             class Attachment < ActiveRecord::Base
               belongs_to :container, :polymorphic => true
               belongs_to :author, :class_name => "User", :foreign_key => "author_id"
             	validates_presence_of :filename
             	def file=(incomming_file)
             		unless incomming_file.nil?
             			@temp_file = incomming_file
             			if @temp_file.size > 0
             				self.filename = sanitize_filename(@temp_file.original_filename)
             				self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
             				self.content_type = @temp_file.content_type
-            				self.size = @temp_file.size
+            				self.filesize = @temp_file.size
             			end
             		end
             	end
             	# Copy temp file to its final location
             	def before_save
             		if @temp_file && (@temp_file.size > 0)
             			logger.debug("saving '#{self.diskfile}'")
             			File.open(diskfile, "wb") do |f|
             				f.write(@temp_file.read)
             			end
             			self.digest = Digest::MD5.hexdigest(File.read(diskfile))
             		end
             	end
             	# Deletes file on the disk
             	def after_destroy
             		if self.filename?
             			File.delete(diskfile) if File.exist?(diskfile)
             		end
             	end
             	# Returns file's location on disk
             	def diskfile
             		"#{RDM_STORAGE_PATH}/#{self.disk_filename}"
             	end
               def increment_download
                 increment!(:downloads)
               end
             	# returns last created projects
             	def self.most_downloaded
             		find(:all, :limit => 5, :order => "downloads DESC")
             	end
             private
               def sanitize_filename(value)
                   # get only the filename, not the whole path
                   just_filename = value.gsub(/^.*(\\|\/)/, '')
                   # NOTE: File.basename doesn't work right with Windows paths on Unix
                   # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/'))
                   # Finally, replace all non alphanumeric, underscore or periods with underscore
                   @filename = just_filename.gsub(/[^\w\.\-]/,'_')
               end
             end

redmine/app/models/enumeration.rb +1 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Enumeration < ActiveRecord::Base
               before_destroy :check_integrity
             	validates_presence_of :opt, :name
+            	validates_uniqueness_of :name, :scope => [:opt]
             	OPTIONS = [
             		["Issue priorities", "IPRI"],
             		["Document categories", "DCAT"]
             	].freeze
             	def self.get_values(option)
             		find(:all, :conditions => ['opt=?', option])
             	end
               def name
                 _ self.attributes['name']
               end
             private
               def check_integrity
                 case self.opt
                 when "IPRI"
                   raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
                 when "DCAT"
                   raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
                 end
               end
             end

redmine/app/models/issue_category.rb +1 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssueCategory < ActiveRecord::Base
               before_destroy :check_integrity
               belongs_to :project
               validates_presence_of :name
+              validates_uniqueness_of :name, :scope => [:project_id]
             private
               def check_integrity
                 raise "Can't delete category" if Issue.find(:first, :conditions => ["category_id=?", self.id])
               end
             end

redmine/app/models/issue_status.rb +4 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssueStatus < ActiveRecord::Base
               before_destroy :check_integrity
               has_many :workflows, :foreign_key => "old_status_id"
               validates_presence_of :name
               validates_uniqueness_of :name
+              validates_length_of :html_color, :is=>6
+              validates_format_of :html_color, :with => /^[a-f0-9]*$/i
               # Returns the default status for new issues
               def self.default
                 find(:first, :conditions =>["is_default=?", true])
               end
               # Returns an array of all statuses the given role can switch to
               def new_statuses_allowed_to(role, tracker)
                 statuses = []
-            		for workflow in self.workflows.find(:all, :include => :new_status)
+                for workflow in self.workflows
                   statuses << workflow.new_status if workflow.role_id == role.id and workflow.tracker_id == tracker.id
-            		end unless role.nil?
+                end unless role.nil? or tracker.nil?
                 statuses
               end
               def name
                 _ self.attributes['name']
               end
             private
               def check_integrity
                 raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id]) or IssueHistory.find(:first, :conditions => ["status_id=?", self.id])
               end
             end

redmine/app/models/permission.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Permission < ActiveRecord::Base
             	has_and_belongs_to_many :roles
             	validates_presence_of :controller, :action, :descr
               GROUPS = {
 => "Project",
 => "Membres",
 => "Versions",
 => "Issue categories",
 => "Issues",
 => "News",
 => "Documents",
 => "Files",
             	}.freeze
               @@cached_perms_for_public = nil
               @@cached_perms_for_roles = nil
              	def name
             		self.controller + "/" + self.action
             	end
               def group_id
                 (self.sort / 100)*100
               end
               def self.allowed_to_public(action)
-                @@cached_perms_for_public ||= find(:all, :conditions => ["public=?", true]).collect {|p| "#{p.controller}/#{p.action}"}
+                @@cached_perms_for_public ||= find(:all, :conditions => ["is_public=?", true]).collect {|p| "#{p.controller}/#{p.action}"}
                 @@cached_perms_for_public.include? action
               end
               def self.allowed_to_role(action, role)
                 @@cached_perms_for_roles ||=
                   begin
                     perms = {}
                     find(:all, :include => :roles).each {|p| perms.store "#{p.controller}/#{p.action}", p.roles.collect {|r| r.id } }
                     perms
                   end
                 @@cached_perms_for_roles[action] and @@cached_perms_for_roles[action].include? role
               end
               def self.allowed_to_role_expired
                 @@cached_perms_for_roles = nil
               end
             end

redmine/app/models/project.rb +11 -7

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Project < ActiveRecord::Base
-            	has_many :versions, :dependent => true, :order => "versions.date DESC"
+            	has_many :versions, :dependent => true, :order => "versions.effective_date DESC"
             	has_many :members, :dependent => true
+            	has_many :users, :through => :members
             	has_many :issues, :dependent => true, :order => "issues.created_on DESC", :include => :status
             	has_many :documents, :dependent => true
-            	has_many :news, :dependent => true, :order => "news.created_on DESC", :include => :author
+            	has_many :news, :dependent => true, :include => :author
             	has_many :issue_categories, :dependent => true
             	has_and_belongs_to_many :custom_fields
+            	acts_as_tree :order => "name", :counter_cache => true
             	validates_presence_of :name, :descr
+            	validates_uniqueness_of :name
             	# returns 5 last created projects
             	def self.latest
             		find(:all, :limit => 5, :order => "created_on DESC")
             	end
-            	# Returns current version of the project
-            	def current_version
-            		versions.find(:first, :conditions => [ "date <= ?", Date.today ], :order => "date DESC, id DESC")
-            	end
             	# Returns an array of all custom fields enabled for project issues
             	# (explictly associated custom fields and custom fields enabled for all projects)
             	def custom_fields_for_issues
             		(CustomField.for_all + custom_fields).uniq
             	end
+            protected
+              def validate
+                errors.add(parent_id, " must be a root project") if parent and parent.parent
+                errors.add_to_base("A project with subprojects can't be a subproject") if parent and projects_count > 0
+              end
             end

redmine/app/models/tracker.rb +3 0

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Tracker < ActiveRecord::Base
               before_destroy :check_integrity
               has_many :issues
               has_many :workflows, :dependent => true
+              validates_presence_of :name
+              validates_uniqueness_of :name
               def name
                 _ self.attributes['name']
               end
             private
               def check_integrity
                 raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])
               end
             end

redmine/app/models/user.rb +17 -29

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require "digest/sha1"
             class User < ActiveRecord::Base
               has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => true
-            	attr_accessor :password
+              attr_accessor :password, :password_confirmation
               attr_accessor :last_before_login_on
               # Prevents unauthorized assignments
-            	attr_protected :admin
+              attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
               validates_presence_of :login, :firstname, :lastname, :mail
               validates_uniqueness_of :login, :mail
               # Login must contain lettres, numbers, underscores only
               validates_format_of :login, :with => /^[a-z0-9_]+$/i
               validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+              # Password length between 4 and 12
+              validates_length_of :password, :in => 4..12, :allow_nil => true
+              validates_confirmation_of :password, :allow_nil => true
-            	def before_create
+              def before_save
-            		self.hashed_password = User.hash_password(self.password)
+                # update hashed_password if password was set
-            	end
+                self.hashed_password = User.hash_password(self.password) if self.password
-            	def after_create
-            		@password = nil
               end
-            	# Returns the user that matches user's login and password
+              # Returns the user that matches provided login and password, or nil
-            	def try_to_login
+              def self.try_to_login(login, password)
-            		@user = User.login(self.login, self.password)
+                user = find(:first, :conditions => ["login=? and hashed_password=? and locked=?", login, User.hash_password(password), false])
-            		unless @user.nil?
+                if user
-            			@user.last_before_login_on = @user.last_login_on
+                  user.last_before_login_on = user.last_login_on
-            			@user.update_attribute(:last_login_on, DateTime.now)
+                  user.update_attribute(:last_login_on, Time.now)
                 end
-            		@user
+                user
               end
               # Return user's full name for display
               def display_name
-            		firstname + " " + lastname #+ (self.admin ? " (Admin)" : "" )
+                firstname + " " + lastname
-            	end
-            	# Returns the user that matches the given login and password
-            	def self.login(login, password)
-            		hashed_password = hash_password(password || "")
-            		find(:first,
-            			:conditions => ["login = ? and hashed_password = ? and locked = ?", login, hashed_password, false])
               end
               def check_password?(clear_password)
                 User.hash_password(clear_password) == self.hashed_password
               end
-            	def change_password(current_password, new_password)
-            		self.hashed_password = User.hash_password(new_password)
-            		save
-            	end
               def role_for_project(project_id)
                 @role_for_projects ||=
                   begin
                     roles = {}
                     self.memberships.each { |m| roles.store m.project_id, m.role_id }
                     roles
                   end
                 @role_for_projects[project_id]
               end
             private
               # Return password digest
               def self.hash_password(clear_password)
-            		Digest::SHA1.hexdigest(clear_password)
+                Digest::SHA1.hexdigest(clear_password || "")
               end
             end

redmine/app/models/version.rb +2 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Version < ActiveRecord::Base
               before_destroy :check_integrity
               belongs_to :project
               has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id'
               has_many :attachments, :as => :container, :dependent => true
-            	validates_presence_of :name, :descr
+              validates_presence_of :name
+              validates_uniqueness_of :name, :scope => [:project_id]
             private
               def check_integrity
                 raise "Can't delete version" if self.fixed_issues.find(:first)
               end
             end

redmine/app/models/workflow.rb 0 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program 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.
             #
             # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Workflow < ActiveRecord::Base
               belongs_to :role
               belongs_to :old_status, :class_name => 'IssueStatus', :foreign_key => 'old_status_id'
               belongs_to :new_status, :class_name => 'IssueStatus', :foreign_key => 'new_status_id'
               validates_presence_of :role, :old_status, :new_status
             end

redmine/app/views/account/login.rhtml +4 -4

             <div class="box">
-            <h2><%=_ 'Please login' %></h2>
+            <h2><%=_('Please login') %></h2>
             <%= start_form_tag :action=> "login" %>
-            <p><label for="user_login"><%=_ 'Login' %>:</label><br/>
+            <p><label for="login"><%=_ 'Login' %>:</label><br/>
-            <input type="text" name="user[login]" id="user_login" size="30" /></p>
+            <%= text_field_tag 'login', nil, :size => 25 %></p>
             <p><label for="user_password"><%=_ 'Password' %>:</label><br/>
-            <input type="password" name="user[password]" id="user_password" size="30"/></p>
+            <%= password_field_tag 'password', nil, :size => 25 %></p>
             <p><input type="submit" name="login" value="<%=_ 'Log in' %> &#187;" class="primary" /></p>
             <%= end_form_tag %>
             </div>

redmine/app/views/account/my_account.rhtml +6 -5

             <h2><%=_('My account')%></h2>
             <p><%=_('Login')%>: <strong><%= @user.login %></strong><br />
             <%=_('Created on')%>: <%= format_time(@user.created_on) %>,
             <%=_('Last update')%>: <%= format_time(@user.updated_on) %></p>
+            <%= error_messages_for 'user' %>
             <div class="splitcontentleft">
               <div class="box">
               <h3><%=_('Information')%></h3>
               &nbsp;
               <%= start_form_tag :action => 'my_account' %>
-              <%= error_messages_for 'user' %>
               <!--[form:user]-->
               <p><label for="user_firstname"><%=_('Firstname')%> <span class="required">*</span></label><br/>
               <%= text_field 'user', 'firstname'  %></p>
               <p><label for="user_lastname"><%=_('Lastname')%> <span class="required">*</span></label><br/>
               <%= text_field 'user', 'lastname'  %></p>
               <p><label for="user_mail"><%=_('Mail')%> <span class="required">*</span></label><br/>
               <%= text_field 'user', 'mail'  %></p>
               <p><label for="user_language"><%=_('Language')%></label><br/>
               <%= select("user", "language", Localization.langs) %></p>
               <!--[eoform:user]-->
               <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=_('Mail notifications')%></label></p>
               <center><%= submit_tag _('Save') %></center>
               <%= end_form_tag %>
               </div>
             </div>
             <div class="splitcontentright">
               <div class="box">
               <h3><%=_('Password')%></h3>
               &nbsp;
               <%= start_form_tag :action => 'change_password' %>
-              <p><label for="old_password"><%=_('Password')%> <span class="required">*</span></label><br/>
+              <p><label for="password"><%=_('Password')%> <span class="required">*</span></label><br/>
-              <%= password_field_tag 'old_password' %></p>
+              <%= password_field_tag 'password', nil, :size => 25 %></p>
               <p><label for="new_password"><%=_('New password')%> <span class="required">*</span></label><br/>
-              <%= password_field_tag 'new_password' %></p>
+              <%= password_field_tag 'new_password', nil, :size => 25 %></p>
               <p><label for="new_password_confirmation"><%=_('Confirmation')%> <span class="required">*</span></label><br/>
-              <%= password_field_tag 'new_password_confirmation' %></p>
+              <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
               <center><%= submit_tag _('Save') %></center>
               <%= end_form_tag %>
               </div>
             </div>

redmine/app/views/admin/info.rhtml +8 -2

@@ -1,4 +1,10
1	<h2><%=_('Information')%></h2>	1	<h2><%=_('Information')%></h2>
2		2
3	<%=_('Version')%>: <%= RDM_APP_NAME %> <%= RDM_APP_VERSION %><br />	3	<p><%=_('Version')%>: <strong><%= RDM_APP_NAME %> <%= RDM_APP_VERSION %></strong></p>
4	<%=_('Database')%>: <%= @adapter_name %> No newline at end of file	4
		5	Environment:
		6	<ul>
		7	<% Rails::Info.properties.each do \|name, value\| %>
		8	<li><%= name %>: <%= value %></li>
		9	<% end %>
		10	</ul> No newline at end of file

redmine/app/views/admin/projects.rhtml +10 -13

             <h2><%=_('Projects')%></h2>
             <table width="100%" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
-            	<%= sort_header_tag('projects.name', :caption => _('Project')) %>
+            	<%= sort_header_tag('name', :caption => _('Project')) %>
             	<th><%=_('Description')%></th>
             	<th><%=_('Public')%></th>
-            	<%= sort_header_tag('projects.created_on', :caption => _('Created on')) %>
+            	<th><%=_('Subprojects')%></th>
+            	<%= sort_header_tag('created_on', :caption => _('Created on')) %>
               <th></th>
               </tr>
-            <% odd_or_even = 1
+            <% for project in @projects %>
-            	for project in @projects
+              <tr class="<%= cycle("odd", "even") %>">
-            	odd_or_even = 1 - odd_or_even %>
-              <tr class="ListLine<%= odd_or_even %>">
             	<td><%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %>
             	<td><%= project.descr %>
-            	<td align="center"><%= image_tag 'true' if project.public? %>
+            	<td align="center"><%= image_tag 'true' if project.is_public? %>
+            	<td align="center"><%= project.projects_count %>
             	<td align="center"><%= format_date(project.created_on) %>
               <td align="center">
                 <%= start_form_tag({:controller => 'projects', :action => 'destroy', :id => project}) %>
                 <%= submit_tag _('Delete'), :class => "button-small"  %>
                 <%= end_form_tag %>
               </td>
               </tr>
             <% end %>
             </table>
-            <%= link_to ('&#171; ' + _('Previous')), { :page => @project_pages.current.previous } if @project_pages.current.previous %>
+            <p><%= pagination_links_full @project_pages %>
-            <%= pagination_links(@project_pages) %>
+            [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p>
-            <%= link_to (_('Next') + ' &#187;'), { :page => @project_pages.current.next } if @project_pages.current.next %>
-            <br />
+            <p><%= link_to ('&#187; ' + _('New project')), :controller => 'projects', :action => 'add' %></p>
  No newline at end of file
-            <%= link_to ('&#187; ' + _('New project')), :controller => 'projects', :action => 'add' %>
  No newline at end of file

redmine/app/views/custom_fields/list.rhtml +1 -1

             <h2><%=_('Custom fields')%></h2>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
             <tr class="ListHead">
             	<th><%=_('Name')%></th>
             	<th><%=_('Type')%></th>
             	<th><%=_('Required')%></th>
             	<th><%=_('For all projects')%></th>
             	<th><%=_('Used by')%></th>
             	<th></th>
             </tr>
             <% for custom_field in @custom_fields %>
-              <tr style="background-color:#CEE1ED">
+              <tr class="<%= cycle("odd", "even") %>">
             	<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
             	<td align="center"><%= CustomField::TYPES[custom_field.typ][0] %></td>
             	<td align="center"><%= image_tag 'true' if custom_field.is_required? %></td>
             	<td align="center"><%= image_tag 'true' if custom_field.is_for_all? %></td>
             	<td align="center"><%= custom_field.projects.count.to_s + ' ' + _('Project') + '(s)' unless custom_field.is_for_all? %></td>
             	<td align="center">
                 <%= start_form_tag :action => 'destroy', :id => custom_field %>
                 <%= submit_tag _('Delete'), :class => "button-small"  %>
                 <%= end_form_tag %>	</td>
               </tr>
             <% end %>
             </table>
             <%= link_to ('&#171; ' + _('Previous')), { :page => @custom_field_pages.current.previous } if @custom_field_pages.current.previous %>
             <%= link_to (_('Next') + ' &#187;'), { :page => @custom_field_pages.current.next } if @custom_field_pages.current.next %>
             <br />
             <%= link_to ('&#187; ' + _('New custom field')), :action => 'new' %>

redmine/app/views/documents/show.rhtml +3 -1

             <h2><%= @document.title %></h2>
             <strong><%=_('Description')%>:</strong> <%= @document.descr %><br />
             <strong><%=_('Category')%>:</strong> <%= @document.category.name %><br />
             <br />
             <% if authorize_for('documents', 'edit') %>
               <%= start_form_tag ({ :controller => 'documents', :action => 'edit', :id => @document }, :method => 'get' ) %>
               <%= submit_tag _('Edit') %>
               <%= end_form_tag %>
             <% end %>
             <% if authorize_for('documents', 'destroy') %>
               <%= start_form_tag ({ :controller => 'documents', :action => 'destroy', :id => @document } ) %>
               <%= submit_tag _('Delete') %>
               <%= end_form_tag %>
             <% end %>
             <br /><br />
             <table border="0" cellspacing="1" cellpadding="2" width="100%">
             <% for attachment in @document.attachments %>
               <tr style="background-color:#CEE1ED">
               <td><%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %></td>
               <td align="center"><%= format_date(attachment.created_on) %></td>
               <td align="center"><%= attachment.author.display_name %></td>
-              <td><%= human_size(attachment.size) %><br /><%= attachment.downloads %> <%=_('download')%>(s)</td>
+              <td><%= human_size(attachment.filesize) %><br /><%= attachment.downloads %> <%=_('download')%>(s)</td>
               <% if authorize_for('documents', 'destroy_attachment') %>
               <td align="center">
                 <%= start_form_tag :action => 'destroy_attachment', :id => @document, :attachment_id => attachment %>
                 <%= submit_tag _('Delete'), :class => "button-small" %>
                 <%= end_form_tag %>
               </tr>
               <% end %>
             <% end %>
             </table>
             <br />
             <% if authorize_for('documents', 'add_attachment') %>
               <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true) %>
               <%=_('Add file')%><br /><%= file_field 'attachment', 'file'  %>
               <%= submit_tag _('Add') %>
               <%= end_form_tag %>
             <% end %>

redmine/app/views/issue_statuses/_form.rhtml +2 -2

             <%= error_messages_for 'issue_status' %>
             <!--[form:issue_status]-->
-            <p><label for="issue_status_name"><%=_('Name')%></label><br/>
+            <p><label for="issue_status_name"><%=_('Name')%></label> <span class="required">*</span><br/>
             <%= text_field 'issue_status', 'name'  %></p>
             <p><%= check_box 'issue_status', 'is_closed' %>
             <label for="issue_status_is_closed"><%=_('Issue closed')%></label></p>
             <p><%= check_box 'issue_status', 'is_default' %>
             <label for="issue_status_is_default"><%=_('Default status')%></label></p>
             <p><label for="issue_status_html_color"><%=_('Color')%></label>
-            #<%= text_field 'issue_status', 'html_color', :size => 6 %></p>
+            #<%= text_field 'issue_status', 'html_color', :maxlength => 6 %> <span class="required">*</span></p>
             <!--[eoform:issue_status]-->

redmine/app/views/issue_statuses/list.rhtml +3 -3

             <h2><%=_('Issue statuses')%></h2>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
               <th><%=_('Status')%></th>
               <th><%=_('Default status')%></th>
               <th><%=_('Issue closed')%></th>
               <th><%=_('Color')%></th>
               <th></th>
               </tr>
             <% for status in @issue_statuses %>
-              <tr style="background-color:#CEE1ED">
+              <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to status.name, :action => 'edit', :id => status %></td>
-              <td align="center"><%= image_tag 'true' if status.is_default %></td>
+              <td align="center"><%= image_tag 'true' if status.is_default? %></td>
-              <td align="center"><%= image_tag 'true' if status.is_closed %></td>
+              <td align="center"><%= image_tag 'true' if status.is_closed? %></td>
               <td bgcolor="#<%= status.html_color %>">&nbsp</td>
               <td align="center">
                 <%= start_form_tag :action => 'destroy', :id => status %>
                 <%= submit_tag _('Delete'), :class => "button-small" %>
                 <%= end_form_tag %>
               </td>
               </tr>
             <% end %>
             </table>
             <%= pagination_links_full @issue_status_pages %>
             <br />
             <%= link_to '&#187; ' + _('New issue status'), :action => 'new' %>

redmine/app/views/issues/show.rhtml +2 -2

             <h2><%=_('Issue')%> #<%= @issue.id %> - <%= @issue.subject %></h2>
             <div class="box">
             <p><b><%=_('Tracker')%>:</b> <%= @issue.tracker.name %></p>
             <p><b><%=_('Priority')%>:</b> <%= @issue.priority.name %></p>
             <p><b><%=_('Category')%>:</b> <%= @issue.category.name unless @issue.category_id.nil? %></p>
             <p><b><%=_('Status')%>:</b> <%= @issue.status.name %></p>
             <p><b><%=_('Author')%>:</b> <%= @issue.author.display_name %></p>
             <p><b><%=_('Assigned to')%>:</b> <%= @issue.assigned_to.display_name unless @issue.assigned_to.nil? %></p>
             <p><b><%=_('Subject')%>:</b> <%= @issue.subject %></p>
-            <p><b><%=_('Description')%>:</b> <%= @issue.descr %></p>
+            <p><b><%=_('Description')%>:</b> <%= simple_format auto_link @issue.descr %></p>
             <p><b><%=_('Created on')%>:</b> <%= format_date(@issue.created_on) %></p>
             <% if authorize_for('issues', 'edit') %>
               <%= start_form_tag ({:controller => 'issues', :action => 'edit', :id => @issue}, :method => "get" ) %>
               <%= submit_tag _('Edit') %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
             <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
               <%= start_form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) %>
               <label for="history_status_id"><%=_('Change status')%>:</label>
               <select name="history[status_id]">
               <%= options_from_collection_for_select @status_options, "id", "name" %>
               </select>
               <%= submit_tag _ "Update..." %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
             <% if authorize_for('issues', 'destroy') %>
               <%= start_form_tag ({:controller => 'issues', :action => 'destroy', :id => @issue} ) %>
               <%= submit_tag _ "Delete" %>
               <%= end_form_tag %>
               &nbsp;&nbsp;
             <% end %>
             </div>
             <div class="splitcontentleft">
             <div class="box">
             <h3><%=_('History')%></h3>
             <table width="100%">
             <% for history in @issue.histories.find(:all, :include => :author) %>
             <tr>
             <td><%= format_date(history.created_on) %></td>
             <td><%= history.author.display_name %></td>
             <td><b><%= history.status.name %></b></td>
             </tr>
             <% if history.notes? %>
             	<tr><td colspan=3><div class="notes"><%= history.notes %></td></tr>
             <% end %>
             <% end %>
             </table>
             </div>
             </div>
             <div class="splitcontentright">
             <div class="box">
             <h3><%=_('Attachments')%></h3>
             <table width="100%">
             <% for attachment in @issue.attachments %>
             <tr>
-            <td><%= link_to attachment.filename, :action => 'download', :id => @issue, :attachment_id => attachment %> (<%= human_size(attachment.size) %>)</td>
+            <td><%= link_to attachment.filename, :action => 'download', :id => @issue, :attachment_id => attachment %> (<%= human_size(attachment.filesize) %>)</td>
             <td><%= format_date(attachment.created_on) %></td>
             <td><%= attachment.author.display_name %></td>
             <% if authorize_for('issues', 'destroy_attachment') %>
               <td>
               <%= start_form_tag :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment %>
               <%= submit_tag _('Delete'), :class => "button-small" %>
               <%= end_form_tag %>
               </td>
             <% end %>
             </tr>
             <% end %>
             </table>
             <br />
             <% if authorize_for('issues', 'add_attachment') %>
               <%= start_form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true) %>
               <%=_('Add file')%>: <%= file_field 'attachment', 'file'  %>
               <%= submit_tag _('Add') %>
               <%= end_form_tag %>
             <% end %>
             </div>
             </div>

redmine/app/views/layouts/base.rhtml +1 -1

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title>redMine</title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <meta name="description" content="redMine" />
             <meta name="keywords" content="issue,bug,tracker" />
             <%= stylesheet_link_tag "application" %>
             <%= stylesheet_link_tag "rails" %>
             <%= javascript_include_tag :defaults %>
             </head>
             <body>
             <div id="container" >
                 <div id="header">
                 <div style="float: left;">
                     <h1><%= RDM_APP_NAME %></h1>
                     <h2>Project management</h2>
                 </div>
                 <div style="float: right; padding-right: 1em; padding-top: 0.2em;">
                   <% unless session[:user].nil? %><small><%=_('Logged as')%> <b><%= session[:user].login %></b></small><% end %>
                 </div>
                 </div>
             	<div id="navigation">
             		<ul>
             			<li class="selected"><%= link_to _('Home'), { :controller => '' }, :class => "picHome" %></li>
             			<li><%= link_to _('My page'), { :controller => 'account', :action => 'my_page'}, :class => "picUserPage" %></li>
             			<li><%= link_to _('Projects'), { :controller => 'projects' }, :class => "picProject" %></li>
             			<% unless session[:user].nil? %>
             				<li><%= link_to _('My account'), { :controller => 'account', :action => 'my_account' }, :class => "picUser" %></li>
             			<% end %>
             			<% if admin_loggedin? %>
             				<li><%= link_to _('Administration'), { :controller => 'admin' }, :class => "picAdmin" %></li>
             			<% end %>
             			<li class="right"><%= link_to _('Help'), { :controller => 'help', :ctrl => @params[:controller], :page => @params[:action] }, :target => "new", :class => "picHelp" %></li>
             			<% if session[:user].nil? %>
             				<li class="right"><%= link_to _('Log in'), { :controller => 'account', :action => 'login' }, :class => "picUser" %></li>
             			<% else %>
             				<li class="right"><%= link_to _('Logout'), { :controller => 'account', :action => 'logout' }, :class => "picUser" %></li>
             			<% end %>
             		</ul>
             	</div>
             	<div id="subcontent">
             		<% unless @project.nil? || @project.id.nil? %>
             			<h2><%= @project.name %></h2>
             			<ul class="menublock">
             				<li><%= link_to _('Overview'), :controller => 'projects', :action => 'show', :id => @project %></li>
             				<li><%= link_to _('Issues'), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
             				<li><%= link_to _('Reports'), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
             				<li><%= link_to _('News'), :controller => 'projects', :action => 'list_news', :id => @project %></li>
             				<li><%= link_to _('Change log'), :controller => 'projects', :action => 'changelog', :id => @project %></li>
             				<li><%= link_to _('Documents'), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
             				<li><%= link_to _('Members'), :controller => 'projects', :action => 'list_members', :id => @project %></li>
             				<li><%= link_to _('Files'), :controller => 'projects', :action => 'list_files', :id => @project %></li>
             				<li><%= link_to_if_authorized _('Settings'), :controller => 'projects', :action => 'settings', :id => @project %></li>
             			</ul>
             		<% end %>
             		<% unless session[:user].nil? %>
             			<h2><%=_('My projects') %></h2>
             			<ul class="menublock">
             				<% for membership in session[:user].memberships %>
             					<li><%= link_to membership.project.name, :controller => 'projects', :action => 'show', :id => membership.project %></li>
             				<% end %>
             			</ul>
             		<% end %>
             	</div>
             	<div id="content">
             		<% if flash[:notice] %><p style="color: green"><%= flash[:notice] %></p><% end %>
             		<%= @content_for_layout %>
             	</div>
             	<div id="footer">
-            		<p><a href="http://redmine.sourceforge.net/" target="_new"><%= RDM_APP_NAME %></a> <%= RDM_APP_VERSION %></p>
+            		<p><a href="http://redmine.org/" target="_new"><%= RDM_APP_NAME %></a> <%= RDM_APP_VERSION %></p>
             	</div>
             </div>
             </body>
             </html>

redmine/app/views/news/show.rhtml +1 -1

             <h2><%= @news.title %></h2>
             <p>
             <b><%=_('Summary')%></b>: <%= @news.shortdescr %><br />
             <b><%=_('By')%></b>: <%= @news.author.display_name %><br />
             <b><%=_('Date')%></b>: <%= format_time(@news.created_on) %>
             </p>
-            <%= @news.descr %>
+            <%= simple_format auto_link @news.descr %>

redmine/app/views/projects/_form.rhtml +11 -3

             <%= error_messages_for 'project' %>
             <!--[form:project]-->
             <p><label for="project_name"><%=_('Name')%> <span class="required">*</span></label><br/>
             <%= text_field 'project', 'name'  %></p>
+            <% if session[:user].admin %>
+            <p><label for="project_parent_id"><%=_('Subproject of')%></label><br/>
+            <select name="project[parent_id]">
+            <option value=""></option>
+            <%= options_from_collection_for_select @root_projects, "id", "name", @project.parent_id %>
+            </select></p>
+            <% end %>
             <p><label for="project_descr"><%=_('Description')%> <span class="required">*</span></label><br/>
-            <%= text_field 'project', 'descr', :size => 60 %></p>
+            <%= text_area 'project', 'descr', :cols => 60, :rows => 3 %></p>
             <p><label for="project_homepage"><%=_('Homepage')%></label><br/>
             <%= text_field 'project', 'homepage', :size => 40 %></p>
-            <p><%= check_box 'project', 'public' %>
+            <p><%= check_box 'project', 'is_public' %>
-            <label for="project_public"><%=_('Public')%></label></p>
+            <label for="project_is_public"><%=_('Public')%></label></p>
             <fieldset><legend><%=_('Custom fields')%></legend>
             <% for custom_field in @custom_fields %>
             	<input type="checkbox"
             	name="custom_field_ids[]"
             	value="<%= custom_field.id %>"
             	<%if @project.custom_fields.include? custom_field%>checked="checked"<%end%>
             	> <%= custom_field.name %>
             <% end %></fieldset>
             <br />
             <!--[eoform:project]-->

redmine/app/views/projects/changelog.rhtml +1 -1

             <h2><%=_('Change log')%></h2>
             <% fixed_issues = @fixed_issues.group_by {|i| i.fixed_version } %>
             <% fixed_issues.each do |version, issues| %>
-              <p><strong><%= version.name %></strong> - <%= format_date(version.date) %><br />
+              <p><strong><%= version.name %></strong> - <%= format_date(version.effective_date) %><br />
               <%=h version.descr %></p>
               <ul>
                 <% issues.each do |i| %>
                 <li><%= link_to i.long_id, :controller => 'issues', :action => 'show', :id => i %> [<%= i.tracker.name %>]: <%= i.subject %></li>
                 <% end %>
               </ul>
             <% end %>

redmine/app/views/projects/list.rhtml +4 -6

             <h2><%=_('Public projects')%></h2>
             <table width="100%" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
-            	<%= sort_header_tag('projects.name', :caption => _('Project')) %>
+            	<%= sort_header_tag('name', :caption => _('Project')) %>
             	<th>Description</th>
-            	<%= sort_header_tag('projects.created_on', :caption => _('Created on')) %>
+            	<%= sort_header_tag('created_on', :caption => _('Created on')) %>
               </tr>
-            <% odd_or_even = 1
+            <% for project in @projects %>
-            	for project in @projects
+              <tr class="<%= cycle("odd", "even") %>">
-            	odd_or_even = 1 - odd_or_even %>
-              <tr class="ListLine<%= odd_or_even %>">
             	<td><%= link_to project.name, :action => 'show', :id => project %>
             	<td><%= project.descr %>
             	<td align="center"><%= format_date(project.created_on) %>
               </tr>
             <% end %>
             </table>
             <%= pagination_links_full @project_pages %>
             [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]

redmine/app/views/projects/list_files.rhtml +5 -6

             <h2><%=_('Files')%></h2>
             <% delete_allowed = authorize_for('versions', 'destroy_file') %>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
                 <th><%=_('Version')%></th>
                 <th><%=_('File')%></th>
                 <th><%=_('Date')%></th>
                 <th><%=_('Size')%></th>
                 <th>D/L</th>
                 <th>MD5</th>
                 <% if delete_allowed %><th></th><% end %>
               </tr>
             <% for version in @versions %>
               <tr>
                 <td colspan="7"><%= image_tag 'package' %> <b><%= version.name %></b></td>
               </tr>
-              <%  odd_or_even = 1
+              <% for file in version.attachments %>
-                    for file in version.attachments
+              <tr class="<%= cycle("odd", "even") %>">
-                    odd_or_even = 1 - odd_or_even %>
-              <tr class="ListLine<%= odd_or_even %>">
                 <td></td>
                 <td><%= link_to file.filename, :controller => 'versions', :action => 'download', :id => version, :attachment_id => file %></td>
                 <td align="center"><%= format_date(file.created_on) %></td>
-                <td align="center"><%= human_size(file.size) %></td>
+                <td align="center"><%= human_size(file.filesize) %></td>
                 <td align="center"><%= file.downloads %></td>
                 <td align="center"><small><%= file.digest %></small></td>
                 <% if delete_allowed %>
                 <td align="center">
                   <%= start_form_tag :controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file %>
                   <%= submit_tag _('Delete'), :class => "button-small" %>
                   <%= end_form_tag %>
                 </td>
                 <% end %>
               </tr>
-              <% end %>
+              <% end
+              reset_cycle %>
             <% end %>
             </table>
             <br />
             <p>
             <%= link_to_if_authorized '&#187; ' + _('New'), :controller => 'projects', :action => 'add_file', :id => @project %>
             </p>

redmine/app/views/projects/list_issues.rhtml +9 -7

             <h2><%=_('Issues')%></h2>
             <form method="post" class="noborder">
             	<table cellpadding=2>
               <tr>
-                <td><%=_('Status')%>:<br /><%= search_filter_tag("status_id") %></td>
+                <td><small><%=_('Status')%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>
-                <td><%=_('Tracker')%>:<br /><%= search_filter_tag("tracker_id") %></td>
+                <td><small><%=_('Tracker')%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>
-                <td><%=_('Priority')%>:<br /><%= search_filter_tag("priority_id") %></td>
+                <td><small><%=_('Priority')%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>
-                <td><%=_('Category')%>:<br /><%= search_filter_tag("category_id") %></td>
+                <td><small><%=_('Category')%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>
-                <td><%=_('Assigned to')%>:<br /><%= search_filter_tag("assigned_to_id") %></td>
+                <td><small><%=_('Assigned to')%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>
+                <td><small><%=_('Subprojects')%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>
                 <td valign="bottom">
-                  <%= submit_tag _('Apply filter') %>
+                  <%= submit_tag _('Apply filter'), :class => 'button-small' %>
                   <%= end_form_tag %>
                   <%= start_form_tag %>
-                  <%= submit_tag _('Reset') %>
+                  <%= submit_tag _('Reset'), :class => 'button-small' %>
                   <%= end_form_tag %>
                 </td>
               </tr>
             </table>
              &nbsp;
             	<table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
             	   <tr><td colspan="7" align="right">
             	   <small><%= link_to 'Export to CSV', :action => 'export_issues_csv', :id => @project.id %></small>
             	   </td></tr>
             		<tr class="ListHead">
             			<%= sort_header_tag('issues.id', :caption => '#') %>
             			<%= sort_header_tag('issue_statuses.name', :caption => _('Status')) %>
             			<%= sort_header_tag('issues.tracker_id', :caption => _('Tracker')) %>
             			<th><%=_('Subject')%></th>
             			<%= sort_header_tag('users.lastname', :caption => _('Author')) %>
             			<%= sort_header_tag('issues.created_on', :caption => _('Created on')) %>
             			<%= sort_header_tag('issues.updated_on', :caption => _('Last update')) %>
             		</tr>
             		<% for issue in @issues %>
             		<tr bgcolor="#<%= issue.status.html_color %>">
             			<td align="center"><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></td>
             			<td align="center"><%= issue.status.name %></td>
             			<td align="center"><%= issue.tracker.name %></td>
             			<td><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></td>
             			<td align="center"><%= issue.author.display_name %></td>
             			<td align="center"><%= format_time(issue.created_on) %></td>
             			<td align="center"><%= format_time(issue.updated_on) %></td>
             		</tr>
             		<% end %>
             	</table>
             	<p>
             	<%= pagination_links_full @issue_pages %>
             	[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
                 </p>
             <p>
             <%= link_to_if_authorized '&#187; ' + _('Report an issue'), :controller => 'projects', :action => 'add_issue', :id => @project %>
             </p>

redmine/app/views/projects/show.rhtml +12 -3

             <h2><%=_('Overview')%></h2>
             <div class="splitcontentleft">
             	<%= @project.descr %>
             	<ul>
             	<li><%=_('Homepage')%>: <%= link_to @project.homepage, @project.homepage %></li>
             	<li><%=_('Created on')%>: <%= format_date(@project.created_on) %></li>
             	</ul>
               <div class="box">
                 <h3><%= image_tag "tracker" %> <%=_('Trackers')%></h3>
                 <ul>
                 <% for tracker in Tracker.find_all %>
                   <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
-                                                            "issues.tracker_id" => tracker.id %>:
+                                                            "tracker_id" => tracker.id %>:
-                  <%= tracker.issues.count(["project_id=?", @project.id]) %> <%=_('open')%>
+                  <%= Issue.count(:conditions => ["project_id=? and tracker_id=? and issue_statuses.is_closed=?", @project.id, tracker.id, false], :include => :status) %> <%=_('open')%>
                   </li>
                 <% end %>
                 </ul>
                 <%= link_to_if_authorized '&#187; ' + _('Report an issue'), :controller => 'projects', :action => 'add_issue', :id => @project %>
                 <br />
                 <center><small>[ <%= link_to _('View all issues'), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %> ]</small></center>
               </div>
             </div>
             <div class="splitcontentright">
             	<div class="box">
             		<h3><%= image_tag "users" %> <%=_('Members')%></h3>
             		<% for member in @members %>
             		<%= link_to_user member.user %> (<%= member.role.name %>)<br />
             		<% end %>
             	</div>
+              <% if @subprojects %>
+             	<div class="box">
+            		<h3><%= image_tag "projects" %> <%=_('Subprojects')%></h3>
+            		<% for subproject in @subprojects %>
+            		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />
+            		<% end %>
+            	</div>
+              <% end %>
               <div class="box">
                 <h3><%=_('Latest news')%></h3>
-                <% for news in @project.news %>
+                <% for news in @news %>
                   <p>
                   <b><%= news.title %></b> <small>(<%= link_to_user news.author %> <%= format_time(news.created_on) %>)</small><br />
                   <%= news.shortdescr %>
                   <small>[<%= link_to _('Read...'), :controller => 'news', :action => 'show', :id => news %>]</small>
                   </p>
                   <hr />
                 <% end %>
                 <center><small>[ <%= link_to _('View all news'), :controller => 'projects', :action => 'list_news', :id => @project %> ]</small></center>
               </div>
             </div>

redmine/app/views/roles/list.rhtml +1 -1

             <h2><%=_('Roles')%></h2>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
                 <th><%=_('Role')%></th>
             	<th></th>
               </tr>
             <% for role in @roles %>
-              <tr style="background-color:#CEE1ED">
+              <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to role.name, :action => 'edit', :id => role %></td>
               <td align="center">
                 <%= start_form_tag :action => 'destroy', :id => role %>
                 <%= submit_tag _('Delete'), :class => "button-small" %>
                 <%= end_form_tag %>
               </tr>
             <% end %>
             </table>
             <%= pagination_links_full @role_pages %>
             <br />
             <%= link_to '&#187; ' + _('New role'), :action => 'new' %>

redmine/app/views/trackers/list.rhtml +1 -1

             <h2><%=_('Trackers')%></h2>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
               <tr class="ListHead">
               <th><%=_('Tracker')%></th>
               <th></th>
               </tr>
             <% for tracker in @trackers %>
-              <tr style="background-color:#CEE1ED">
+              <tr class="<%= cycle("odd", "even") %>">
               <td><%= link_to tracker.name, :action => 'edit', :id => tracker %></td>
               <td align="center">
                 <%= start_form_tag :action => 'destroy', :id => tracker %>
                 <%= submit_tag _('Delete'), :class => "button-small" %>
                 <%= end_form_tag %>
               </td>
               </tr>
             <% end %>
             </table>
             <%= pagination_links_full @tracker_pages %>
             <br />
             <%= link_to '&#187; ' + _('New tracker'), :action => 'new' %>

redmine/app/views/users/_form.rhtml +6 -3

             <%= error_messages_for 'user' %>
             <!--[form:user]-->
             <p><label for="user_login"><%=_('Login')%></label><br/>
-            <%= text_field 'user', 'login'  %></p>
+            <%= text_field 'user', 'login', :size => 25  %></p>
-            <p><label for="user_password"><%=_('Password')%></label><br/>
+            <p><label for="password"><%=_('Password')%></label><br/>
-            <%= password_field 'user', 'password'  %></p>
+            <%= password_field_tag 'password', nil, :size => 25  %></p>
+            <p><label for="password_confirmation"><%=_('Confirmation')%></label><br/>
+            <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
             <p><label for="user_firstname"><%=_('Firstname')%></label><br/>
             <%= text_field 'user', 'firstname'  %></p>
             <p><label for="user_lastname"><%=_('Lastname')%></label><br/>
             <%= text_field 'user', 'lastname'  %></p>
             <p><label for="user_mail"><%=_('Mail')%></label><br/>
             <%= text_field 'user', 'mail'  %></p>
             <p><label for="user_language"><%=_('Language')%></label><br/>
             <%= select("user", "language", Localization.langs) %></p>
             <p><%= check_box 'user', 'admin' %> <label for="user_admin"><%=_('Administrator')%></label></p>
             <p><%= check_box 'user', 'mail_notification' %> <label for="user_mail_notification"><%=_('Mail notifications')%></label></p>
             <p><%= check_box 'user', 'locked' %> <label for="user_locked"><%=_('Locked')%></label></p>
             <!--[eoform:user]-->

redmine/app/views/users/list.rhtml +10 -10

             <h2><%=_('Users')%></h2>
             <table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
             <tr class="ListHead">
-            	<%= sort_header_tag('users.login', :caption => _('Login')) %>
+            	<%= sort_header_tag('login', :caption => _('Login')) %>
-            	<%= sort_header_tag('users.firstname', :caption => _('Firstname')) %>
+            	<%= sort_header_tag('firstname', :caption => _('Firstname')) %>
-            	<%= sort_header_tag('users.lastname', :caption => _('Lastname')) %>
+            	<%= sort_header_tag('lastname', :caption => _('Lastname')) %>
             	<th><%=_('Mail')%></th>
-            	<%= sort_header_tag('users.admin', :caption => _('Admin')) %>
+            	<%= sort_header_tag('admin', :caption => _('Admin')) %>
-            	<%= sort_header_tag('users.locked', :caption => _('Locked')) %>
+            	<%= sort_header_tag('locked', :caption => _('Locked')) %>
-            	<%= sort_header_tag('users.created_on', :caption => _('Created on')) %>
+            	<%= sort_header_tag('created_on', :caption => _('Created on')) %>
-            	<%= sort_header_tag('users.last_login_on', :caption => _('Last login')) %>
+            	<%= sort_header_tag('last_login_on', :caption => _('Last login')) %>
               <th></th>
             </tr>
             <% for user in @users %>
-              <tr style="background-color:#CEE1ED">
+              <tr class="<%= cycle("odd", "even") %>">
             	<td><%= link_to user.login, :action => 'edit', :id => user %></td>
             	<td><%= user.firstname %></td>
             	<td><%= user.lastname %></td>
             	<td><%= user.mail %></td>
             	<td align="center"><%= image_tag 'true' if user.admin? %></td>
             	<td align="center"><%= image_tag 'locked' if user.locked? %></td>
             	<td align="center"><%= format_time(user.created_on) %></td>
             	<td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
               <td align="center">
                 <%= start_form_tag :action => 'edit', :id => user %>
                 <% if user.locked? %>
-                  <%= hidden_field_tag 'user[locked]', false %>
+                  <%= hidden_field_tag 'user[locked]', 0 %>
                   <%= submit_tag _('Unlock'), :class => "button-small"  %>
                 <% else %>
-                  <%= hidden_field_tag 'user[locked]', true %>
+                  <%= hidden_field_tag 'user[locked]', 1 %>
                   <%= submit_tag _('Lock'), :class => "button-small"  %>
                 <% end %>
                 <%= end_form_tag %>
               </td>
               </tr>
             <% end %>
             </table>
             <p><%= pagination_links_full @user_pages %>
             [ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
             </p>
             <p>
             <%= link_to '&#187; ' + _('New user'), :action => 'add' %>
             </p>

redmine/app/views/versions/_form.rhtml +3 -3

             <%= error_messages_for 'version' %>
             <!--[form:version]-->
-            <p><label for="version_name"><%=_('Version')%></label><br/>
+            <p><label for="version_name"><%=_('Version')%></label> <span class="required">*</span><br/>
             <%= text_field 'version', 'name', :size => 20  %></p>
             <p><label for="version_descr"><%=_('Description')%></label><br/>
             <%= text_field 'version', 'descr', :size => 60  %></p>
-            <p><label for="version_date"><%=_('Date')%></label><br/>
+            <p><label for="version_effective_date"><%=_('Date')%></label><br/>
-            <%= date_select 'version', 'date'  %></p>
+            <%= date_select 'version', 'effective_date'  %></p>
             <!--[eoform:version]-->

redmine/app/views/welcome/index.rhtml +2 -2

             <div class="splitcontentleft">
             	<h2><%=_('Welcome')%> !</h2>
               <div class="box">
-            	<h3>Latest news</h3>
+            	<h3><%=_('Latest news')%></h3>
             		<% for news in @news %>
             			<p>
             			<b><%= news.title %></b> (<%= link_to_user news.author %> <%= format_time(news.created_on) %> - <%= news.project.name %>)<br />
             			<%= news.shortdescr %><br />
             			[<%= link_to 'Read...', :controller => 'news', :action => 'show', :id => news %>]
             			</p>
             			<hr />
             		<% end %>
             	</div>
             </div>
             <div class="splitcontentright">
             	<div class="box">
-            	<h3>Latest projects</h3>
+            	<h3><%=_('Latest projects')%></h3>
             		<ul>
             		<% for project in @projects %>
             			<li>
             			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (added <%= format_time(project.created_on) %>)<br />
             			<%= project.descr %>
             			</li>
             		<% end %>
             		</ul>
             	</div>
             </div>

redmine/config/database.yml +37 -7

             # MySQL (default setup).  Versions 4.1 and 5.0 are recommended.
             #
             # Get the fast C bindings:
             #   gem install mysql
             #   (on OS X: gem install mysql -- --include=/usr/local/lib)
             # And be sure to use new-style password hashing:
             #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+            production:
+              adapter: mysql
+              database: redmine
+              host: localhost
+              username: root
+              password:
             development:
               adapter: mysql
               database: redmine_development
               host: localhost
               username: root
               password:
             development_pgsql:
               adapter: postgresql
               database: redmine
               host: localhost
               username: postgres
               password: "postgres"
+            development_oracle:
+              adapter: oci
+              host: 192.168.0.14
+              username: rails
+              password: "rails"
+            development_sqlserver:
+              adapter: sqlserver
+              host: localhost,1157
+              database: redmine
             test:
               adapter: mysql
               database: redmine_test
               host: localhost
               username: root
               password:
+            test_pgsql:
+              adapter: postgresql
+              database: redmine
+              host: localhost
+              username: postgres
+              password: "postgres"
+            test_oracle:
+              adapter: oci
+              host: 192.168.0.14
+              username: rails_test
+              password: "rails"
+            test_sqlserver:
+              adapter: sqlserver
+              host: localhost,1157
+              database: redmine_test
             demo:
               adapter: sqlite3
               dbfile: db/redmine_demo.db
-            production:
-              adapter: mysql
-              database: redmine
-              host: localhost
-              username: root
-              password:
-  No newline at end of file

redmine/config/environment.rb +1 -1

             # Be sure to restart your web server when you modify this file.
             # Uncomment below to force Rails into production mode when
             # you don't control web/app server and can't set it the proper way
             # ENV['RAILS_ENV'] ||= 'production'
             # Bootstrap the Rails environment, frameworks, and default configuration
             require File.join(File.dirname(__FILE__), 'boot')
             Rails::Initializer.run do |config|
               # Settings in config/environments/* take precedence those specified here
               # Skip frameworks you're not going to use
               # config.frameworks -= [ :action_web_service, :action_mailer ]
               # Add additional load paths for your own custom dirs
               # config.load_paths += %W( #{RAILS_ROOT}/extras )
               # Force all environments to use the same logger level
               # (by default production uses :info, the others :debug)
               # config.log_level = :debug
               # Use the database for sessions instead of the file system
               # (create the session table with 'rake create_sessions_table')
               # config.action_controller.session_store = :active_record_store
               # Enable page/fragment caching by setting a file-based store
               # (remember to create the caching directory and make it readable to the application)
               # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
               # Activate observers that should always be running
               # config.active_record.observers = :cacher, :garbage_collector
               # Make Active Record use UTC-base instead of local time
               # config.active_record.default_timezone = :utc
               # Use Active Record's schema dumper instead of SQL when creating the test database
               # (enables use of different database adapters for development and test environments)
               # config.active_record.schema_format = :ruby
               # See Rails::Configuration for more options
             	# SMTP server configuration
             	config.action_mailer.server_settings = {
             		:address => "127.0.0.1",
             		:port => 25,
             		:domain => "somenet.foo",
             		:authentication => :login,
             		:user_name => "redmine",
             		:password => "redmine",
             	}
             	config.action_mailer.perform_deliveries = true
             	# Tell ActionMailer not to deliver emails to the real world.
             	# The :test delivery method accumulates sent emails in the
             	# ActionMailer::Base.deliveries array.
             	#config.action_mailer.delivery_method = :test
             	config.action_mailer.delivery_method = :smtp
             end
             # Add new inflection rules using the following format
             # (all these examples are active by default):
             # Inflector.inflections do |inflect|
             #   inflect.plural /^(ox)$/i, '\1en'
             #   inflect.singular /^(ox)en/i, '\1'
             #   inflect.irregular 'person', 'people'
             #   inflect.uncountable %w( fish sheep )
             # end
             # Include your application configuration below
             # application name
             RDM_APP_NAME = "redMine"
             # application version
-            RDM_APP_VERSION = "0.1.0"
+            RDM_APP_VERSION = "0.2.0"
             # application host name
             RDM_HOST_NAME = "somenet.foo"
             # file storage path
             RDM_STORAGE_PATH = "#{RAILS_ROOT}/files"
             # if RDM_LOGIN_REQUIRED is set to true, login is required to access the application
             RDM_LOGIN_REQUIRED = false
             # default langage
             RDM_DEFAULT_LANG = 'en'

redmine/config/help.yml +54 -13

@@ -1,21 +1,62
		1	# redMine - project management software
		2	# Copyright (C) 2006 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
		18	# available languages for help pages
		19	langs:
		20	- fr
		21
		22	# mapping between controller/action and help pages
		23	# if action is not defined here, 'index' page will be displayed
		24	pages:
1	# administration	25	# administration
2	admin:	26	admin:
3	index: administration.html	27	index: ch01.html
4	mail_options: administration.html#mail_notifications	28	mail_options: ch01s08.html
5	info: administration.html#app_info	29	info: ch01s09.html
6	users:	30	users:
7	index: administration.html#users	31	index: ch01s01.html
8	roles:	32	roles:
9	index: administration.html#roles	33	index: ch01s02.html
10	workflow: administration.html#workflow	34	workflow: ch01s06.html
11	trackers:	35	trackers:
12	index: administration.html#trackers	36	index: ch01s03.html
13	issue_statuses:	37	issue_statuses:
14	index: administration.html#issue_statuses	38	index: ch01s05.html
15
16	# projects	39	# projects
17	projects:	40	projects:
18	add: projects.html#settings	41	index: ch02.html
19		42	add: ch02s08.html
20		43	show: ch02s01.html
21	# issues No newline at end of file	44	add_document: ch02s06.html
		45	list_documents: ch02s06.html
		46	add_issue: ch02s02.html
		47	list_issues: ch02s02.html
		48	add_news: ch02s05.html
		49	list_news: ch02s05.html
		50	add_file: ch02s07.html
		51	list_files: ch02s07.html
		52	changelog: ch02s04.html
		53	issues:
		54	index: ch02s02.html
		55	documents:
		56	index: ch02s06.html
		57	news:
		58	index: ch02s05.html
		59	versions:
		60	index: ch02s08.html
		61	reports:
		62	index: ch02s03.html No newline at end of file

redmine/db/migrate/001_setup.rb +47 -26

+            # redMine - project management software
+            # Copyright (C) 2006  Jean-Philippe Lang
+            #
+            # This program 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.
+            #
+            # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Setup < ActiveRecord::Migration
               def self.up
                 create_table "attachments", :force => true do |t|
                   t.column "container_id", :integer, :default => 0, :null => false
                   t.column "container_type", :string, :limit => 30, :default => "", :null => false
                   t.column "filename", :string, :default => "", :null => false
                   t.column "disk_filename", :string, :default => "", :null => false
-                  t.column "size", :integer, :default => 0, :null => false
+                  t.column "filesize", :integer, :default => 0, :null => false
-                  t.column "content_type", :string, :limit => 60, :default => "", :null => false
+                  t.column "content_type", :string, :limit => 60, :default => ""
                   t.column "digest", :string, :limit => 40, :default => "", :null => false
                   t.column "downloads", :integer, :default => 0, :null => false
                   t.column "author_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                 end
                 create_table "custom_fields", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "typ", :integer, :default => 0, :null => false
                   t.column "is_required", :boolean, :default => false, :null => false
                   t.column "is_for_all", :boolean, :default => false, :null => false
-                  t.column "possible_values", :text, :default => "", :null => false
+                  t.column "possible_values", :text, :default => ""
-                  t.column "regexp", :string, :default => "", :null => false
+                  t.column "regexp", :string, :default => ""
                   t.column "min_length", :integer, :default => 0, :null => false
                   t.column "max_length", :integer, :default => 0, :null => false
                 end
                 create_table "custom_fields_projects", :id => false, :force => true do |t|
                   t.column "custom_field_id", :integer, :default => 0, :null => false
                   t.column "project_id", :integer, :default => 0, :null => false
                 end
                 create_table "custom_values", :force => true do |t|
                   t.column "issue_id", :integer, :default => 0, :null => false
                   t.column "custom_field_id", :integer, :default => 0, :null => false
                   t.column "value", :text, :default => "", :null => false
                 end
                 add_index "custom_values", ["issue_id"], :name => "custom_values_issue_id"
                 create_table "documents", :force => true do |t|
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "category_id", :integer, :default => 0, :null => false
                   t.column "title", :string, :limit => 60, :default => "", :null => false
                   t.column "descr", :text, :default => "", :null => false
                   t.column "created_on", :timestamp
                 end
                 create_table "enumerations", :force => true do |t|
                   t.column "opt", :string, :limit => 4, :default => "", :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                 end
                 create_table "issue_categories", :force => true do |t|
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                 end
                 create_table "issue_histories", :force => true do |t|
                   t.column "issue_id", :integer, :default => 0, :null => false
                   t.column "status_id", :integer, :default => 0, :null => false
                   t.column "author_id", :integer, :default => 0, :null => false
-                  t.column "notes", :text, :default => "", :null => false
+                  t.column "notes", :text, :default => ""
                   t.column "created_on", :timestamp
                 end
                 add_index "issue_histories", ["issue_id"], :name => "issue_histories_issue_id"
                 create_table "issue_statuses", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "is_closed", :boolean, :default => false, :null => false
                   t.column "is_default", :boolean, :default => false, :null => false
                   t.column "html_color", :string, :limit => 6, :default => "FFFFFF", :null => false
                 end
                 create_table "issues", :force => true do |t|
                   t.column "tracker_id", :integer, :default => 0, :null => false
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "subject", :string, :default => "", :null => false
                   t.column "descr", :text, :default => "", :null => false
                   t.column "category_id", :integer
                   t.column "status_id", :integer, :default => 0, :null => false
                   t.column "assigned_to_id", :integer
                   t.column "priority_id", :integer, :default => 0, :null => false
                   t.column "fixed_version_id", :integer
                   t.column "author_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 add_index "issues", ["project_id"], :name => "issues_project_id"
                 create_table "members", :force => true do |t|
                   t.column "user_id", :integer, :default => 0, :null => false
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "role_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                 end
                 create_table "news", :force => true do |t|
                   t.column "project_id", :integer
                   t.column "title", :string, :limit => 60, :default => "", :null => false
-                  t.column "shortdescr", :string, :default => "", :null => false
+                  t.column "shortdescr", :string, :default => ""
                   t.column "descr", :text, :default => "", :null => false
                   t.column "author_id", :integer, :default => 0, :null => false
                   t.column "created_on", :timestamp
                 end
                 create_table "permissions", :force => true do |t|
                   t.column "controller", :string, :limit => 30, :default => "", :null => false
                   t.column "action", :string, :limit => 30, :default => "", :null => false
                   t.column "descr", :string, :limit => 60, :default => "", :null => false
-                  t.column "public", :boolean, :default => false, :null => false
+                  t.column "is_public", :boolean, :default => false, :null => false
                   t.column "sort", :integer, :default => 0, :null => false
                   t.column "mail_option", :boolean, :default => false, :null => false
                   t.column "mail_enabled", :boolean, :default => false, :null => false
                 end
                 create_table "permissions_roles", :id => false, :force => true do |t|
                   t.column "permission_id", :integer, :default => 0, :null => false
                   t.column "role_id", :integer, :default => 0, :null => false
                 end
                 add_index "permissions_roles", ["role_id"], :name => "permissions_roles_role_id"
                 create_table "projects", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "descr", :string, :default => "", :null => false
-                  t.column "homepage", :string, :limit => 60, :default => "", :null => false
+                  t.column "homepage", :string, :limit => 60, :default => ""
-                  t.column "public", :boolean, :default => true, :null => false
+                  t.column "is_public", :boolean, :default => true, :null => false
+                  t.column "parent_id", :integer
+                  t.column "projects_count", :integer, :default => 0
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 create_table "roles", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                 end
                 create_table "trackers", :force => true do |t|
                   t.column "name", :string, :limit => 30, :default => "", :null => false
                   t.column "is_in_chlog", :boolean, :default => false, :null => false
                 end
                 create_table "users", :force => true do |t|
                   t.column "login", :string, :limit => 30, :default => "", :null => false
                   t.column "hashed_password", :string, :limit => 40, :default => "", :null => false
                   t.column "firstname", :string, :limit => 30, :default => "", :null => false
                   t.column "lastname", :string, :limit => 30, :default => "", :null => false
                   t.column "mail", :string, :limit => 60, :default => "", :null => false
                   t.column "mail_notification", :boolean, :default => true, :null => false
                   t.column "admin", :boolean, :default => false, :null => false
                   t.column "locked", :boolean, :default => false, :null => false
                   t.column "last_login_on", :datetime
                   t.column "language", :string, :limit => 2, :default => "", :null => false
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 create_table "versions", :force => true do |t|
                   t.column "project_id", :integer, :default => 0, :null => false
                   t.column "name", :string, :limit => 30, :default => "", :null => false
-                  t.column "descr", :string, :default => "", :null => false
+                  t.column "descr", :string, :default => ""
-                  t.column "date", :date, :null => false
+                  t.column "effective_date", :date, :null => false
                   t.column "created_on", :timestamp
                   t.column "updated_on", :timestamp
                 end
                 create_table "workflows", :force => true do |t|
                   t.column "tracker_id", :integer, :default => 0, :null => false
                   t.column "old_status_id", :integer, :default => 0, :null => false
                   t.column "new_status_id", :integer, :default => 0, :null => false
                   t.column "role_id", :integer, :default => 0, :null => false
                 end
                 # project
-                Permission.create :controller => "projects", :action => "show", :descr => "Overview", :sort => 100, :public => true
+                Permission.create :controller => "projects", :action => "show", :descr => "Overview", :sort => 100, :is_public => true
-                Permission.create :controller => "projects", :action => "changelog", :descr => "View change log", :sort => 105, :public => true
+                Permission.create :controller => "projects", :action => "changelog", :descr => "View change log", :sort => 105, :is_public => true
-                Permission.create :controller => "reports", :action => "issue_report", :descr => "View reports", :sort => 110, :public => true
+                Permission.create :controller => "reports", :action => "issue_report", :descr => "View reports", :sort => 110, :is_public => true
                 Permission.create :controller => "projects", :action => "settings", :descr => "Settings", :sort => 150
                 Permission.create :controller => "projects", :action => "edit", :descr => "Edit", :sort => 151
                 # members
-                Permission.create :controller => "projects", :action => "list_members", :descr => "View list", :sort => 200, :public => true
+                Permission.create :controller => "projects", :action => "list_members", :descr => "View list", :sort => 200, :is_public => true
                 Permission.create :controller => "projects", :action => "add_member", :descr => "New member", :sort => 220
                 Permission.create :controller => "members", :action => "edit", :descr => "Edit", :sort => 221
                 Permission.create :controller => "members", :action => "destroy", :descr => "Delete", :sort => 222
                 # versions
                 Permission.create :controller => "projects", :action => "add_version", :descr => "New version", :sort => 320
                 Permission.create :controller => "versions", :action => "edit", :descr => "Edit", :sort => 321
                 Permission.create :controller => "versions", :action => "destroy", :descr => "Delete", :sort => 322
                 # issue categories
                 Permission.create :controller => "projects", :action => "add_issue_category", :descr => "New issue category", :sort => 420
                 Permission.create :controller => "issue_categories", :action => "edit", :descr => "Edit", :sort => 421
                 Permission.create :controller => "issue_categories", :action => "destroy", :descr => "Delete", :sort => 422
                 # issues
-                Permission.create :controller => "projects", :action => "list_issues", :descr => "View list", :sort => 1000, :public => true
+                Permission.create :controller => "projects", :action => "list_issues", :descr => "View list", :sort => 1000, :is_public => true
-                Permission.create :controller => "issues", :action => "show", :descr => "View", :sort => 1005, :public => true
+                Permission.create :controller => "issues", :action => "show", :descr => "View", :sort => 1005, :is_public => true
-                Permission.create :controller => "issues", :action => "download", :descr => "Download file", :sort => 1010, :public => true
+                Permission.create :controller => "issues", :action => "download", :descr => "Download file", :sort => 1010, :is_public => true
                 Permission.create :controller => "projects", :action => "add_issue", :descr => "Report an issue", :sort => 1050, :mail_option => 1, :mail_enabled => 1
                 Permission.create :controller => "issues", :action => "edit", :descr => "Edit", :sort => 1055
                 Permission.create :controller => "issues", :action => "change_status", :descr => "Change status", :sort => 1060, :mail_option => 1, :mail_enabled => 1
                 Permission.create :controller => "issues", :action => "destroy", :descr => "Delete", :sort => 1065
                 Permission.create :controller => "issues", :action => "add_attachment", :descr => "Add file", :sort => 1070
                 Permission.create :controller => "issues", :action => "destroy_attachment", :descr => "Delete file", :sort => 1075
                 # news
-                Permission.create :controller => "projects", :action => "list_news", :descr => "View list", :sort => 1100, :public => true
+                Permission.create :controller => "projects", :action => "list_news", :descr => "View list", :sort => 1100, :is_public => true
-                Permission.create :controller => "news", :action => "show", :descr => "View", :sort => 1101, :public => true
+                Permission.create :controller => "news", :action => "show", :descr => "View", :sort => 1101, :is_public => true
                 Permission.create :controller => "projects", :action => "add_news", :descr => "Add", :sort => 1120
                 Permission.create :controller => "news", :action => "edit", :descr => "Edit", :sort => 1121
                 Permission.create :controller => "news", :action => "destroy", :descr => "Delete", :sort => 1122
                 # documents
-                Permission.create :controller => "projects", :action => "list_documents", :descr => "View list", :sort => 1200, :public => true
+                Permission.create :controller => "projects", :action => "list_documents", :descr => "View list", :sort => 1200, :is_public => true
-                Permission.create :controller => "documents", :action => "show", :descr => "View", :sort => 1201, :public => true
+                Permission.create :controller => "documents", :action => "show", :descr => "View", :sort => 1201, :is_public => true
-                Permission.create :controller => "documents", :action => "download", :descr => "Download", :sort => 1202, :public => true
+                Permission.create :controller => "documents", :action => "download", :descr => "Download", :sort => 1202, :is_public => true
                 Permission.create :controller => "projects", :action => "add_document", :descr => "Add", :sort => 1220
                 Permission.create :controller => "documents", :action => "edit", :descr => "Edit", :sort => 1221
                 Permission.create :controller => "documents", :action => "destroy", :descr => "Delete", :sort => 1222
                 Permission.create :controller => "documents", :action => "add_attachment", :descr => "Add file", :sort => 1223
                 Permission.create :controller => "documents", :action => "destroy_attachment", :descr => "Delete file", :sort => 1224
                 # files
-                Permission.create :controller => "projects", :action => "list_files", :descr => "View list", :sort => 1300, :public => true
+                Permission.create :controller => "projects", :action => "list_files", :descr => "View list", :sort => 1300, :is_public => true
-                Permission.create :controller => "versions", :action => "download", :descr => "Download", :sort => 1301, :public => true
+                Permission.create :controller => "versions", :action => "download", :descr => "Download", :sort => 1301, :is_public => true
                 Permission.create :controller => "projects", :action => "add_file", :descr => "Add", :sort => 1320
                 Permission.create :controller => "versions", :action => "destroy_file", :descr => "Delete", :sort => 1322
                 # create default administrator account
-                user = User.create :login => "admin", :password => "admin", :firstname => "redMine", :lastname => "Admin", :mail => "admin@somenet.foo", :mail_notification => true, :language => "en"
+                user = User.create :firstname => "redMine", :lastname => "Admin", :mail => "admin@somenet.foo", :mail_notification => true, :language => "en"
+                user.login = "admin"
+                user.password = "admin"
                 user.admin = true
                 user.save
               end
               def self.down
                 drop_table :attachments
                 drop_table :custom_fields
                 drop_table :custom_fields_projects
                 drop_table :custom_values
                 drop_table :documents
                 drop_table :enumerations
                 drop_table :issue_categories
                 drop_table :issue_histories
                 drop_table :issue_statuses
                 drop_table :issues
                 drop_table :members
                 drop_table :news
                 drop_table :permissions
                 drop_table :permissions_roles
                 drop_table :projects
                 drop_table :roles
                 drop_table :trackers
                 drop_table :users
                 drop_table :versions
                 drop_table :workflows
               end
             end

redmine/db/migrate/002_default_configuration.rb +19 -2

+            # redMine - project management software
+            # Copyright (C) 2006  Jean-Philippe Lang
+            #
+            # This program 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.
+            #
+            # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class DefaultConfiguration < ActiveRecord::Migration
               def self.up
                 # roles
                 r = Role.create(:name => "Manager")
                 r.permissions = Permission.find(:all)
                 r = Role.create :name => "Developer"
-                r.permissions = Permission.find([1, 2, 3, 6, 10, 11, 12, 16, 17, 18, 19, 20, 21, 23, 25, 26, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41])
+                r.permissions = Permission.find(:all)
                 r = Role.create :name => "Reporter"
-                r.permissions = Permission.find([1, 2, 3, 6, 16, 17, 18, 19, 20, 21, 23, 25, 26, 30, 31, 32, 38, 39])
+                r.permissions = Permission.find(:all)
                 # trackers
                 Tracker.create(:name => "Bug", :is_in_chlog => true)
                 Tracker.create(:name => "Feature request", :is_in_chlog => true)
                 Tracker.create(:name => "Support request", :is_in_chlog => false)
                 # issue statuses
                 IssueStatus.create(:name => "New", :is_closed => false, :is_default => true, :html_color => 'F98787')
                 IssueStatus.create(:name => "Assigned", :is_closed => false, :is_default => false, :html_color => 'C0C0FF')
                 IssueStatus.create(:name => "Resolved", :is_closed => false, :is_default => false, :html_color => '88E0B3')
                 IssueStatus.create(:name => "Feedback", :is_closed => false, :is_default => false, :html_color => 'F3A4F4')
                 IssueStatus.create(:name => "Closed", :is_closed => true, :is_default => false, :html_color => 'DBDBDB')
                 IssueStatus.create(:name => "Rejected", :is_closed => true, :is_default => false, :html_color => 'F5C28B')
                 # workflow
                 Tracker.find(:all).each { |t|
                   Role.find(:all).each { |r|
                     IssueStatus.find(:all).each { |os|
                       IssueStatus.find(:all).each { |ns|
                         Workflow.create(:tracker_id => t.id, :role_id => r.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
                       }
                     }
                   }
                 }
                 # enumeartions
                 Enumeration.create(:opt => "DCAT", :name => 'Uncategorized')
                 Enumeration.create(:opt => "DCAT", :name => 'User documentation')
                 Enumeration.create(:opt => "DCAT", :name => 'Technical documentation')
                 Enumeration.create(:opt => "IPRI", :name => 'Low')
                 Enumeration.create(:opt => "IPRI", :name => 'Normal')
                 Enumeration.create(:opt => "IPRI", :name => 'High')
                 Enumeration.create(:opt => "IPRI", :name => 'Urgent')
                 Enumeration.create(:opt => "IPRI", :name => 'Immediate')
               end
               def self.down
               end
             end

redmine/doc/CHANGELOG +13 -4

             == redMine changelog
             redMine - project management software
             Copyright (C) 2006  Jean-Philippe Lang
-            http://redmine.sourceforge.net/
+            http://redmine.org/
-            == xx/xx/2006
+            == 07/09/2006 - v0.2.0
-            * More filter options in issues list
+            * new databases supported: Oracle, PostgreSQL, SQL Server
-            * Issues list exportable to CSV
+            * projects/subprojects hierarchy (1 level of subprojects only)
+            * environment information display in admin/info
+            * more filter options in issues list (rev6)
+            * default language based on browser settings (Accept-Language HTTP header)
+            * issues list exportable to CSV (rev6)
+            * simple_format and auto_link on long text fields
+            * more data validations
+            * Fixed: error when all mail notifications are unchecked in admin/mail_options
+            * Fixed: all project news are displayed on project summary
+            * Fixed: Can't change user password in users/edit
             * Fixed: Error on tables creation with PostgreSQL (rev5)
             * Fixed: SQL error in "issue reports" view with PostgreSQL (rev5)
             == 06/25/2006 - v0.1.0
             * multiple users/multiple projects
             * role based access control
             * issue tracking system
             * fully customizable workflow
             * documents/files repository
             * email notifications on issue creation and update
             * multilanguage support (except for error messages):english, french, spanish
             * online manual in french (unfinished)

redmine/doc/INSTALL +12 -4

             == redMine installation
             redMine - project management software
             Copyright (C) 2006  Jean-Philippe Lang
-            http://redmine.sourceforge.net/
+            http://redmine.org/
             == Requirements
             * Ruby on Rails 1.1
-            * Any database supported by Rails (developped using MySQL 5)
+            * a database (see compatibility below)
             * (recommended) Apache/Lighttpd with FCGI support
+            Supported databases:
+            * MySQL (tested with MySQL 5)
+            * PostgreSQL (tested with PostgreSQL 8.1)
+            * Oracle (tested with Oracle 10g)
+            * SQL Server (tested with SQL Server 2005)
+            * SQLite (tested with SQLite 3)
             == Installation
 . Uncompress program archive:
                tar zxvf <filename>
 . Create an empty database: "redmine" for example
 . Configure database parameters in config/database.yml
-               for "production" environment
+               for "production" environment (default database is MySQL)
-. Create database structure. Under application main directory:
+. Create the database structure. Under application main directory:
                rake migrate RAILS_ENV="production"
                It will create tables and default configuration data
 . Test the installation by running WEBrick web server:
                ruby script/server -e production
                Once WEBrick has started, point your browser to http://localhost:3000/
                You should now see the application welcome page
 . Use default administrator account to log in:
                login: admin
                password: admin
 . Setup Apache or Lighttpd with fastcgi for best performance.
             == Configuration
             You can setup a few things in config/environment.rb:
             Don't forget to restart the application after any change.
             config.action_mailer.server_settings: SMTP server configuration
             config.action_mailer.perform_deliveries: set to false to disable mail delivering
             RDM_HOST_NAME: hostname used to provide urls in notification mails
             RDM_STORAGE_PATH: path for all attachments storage (default: "#{RAILS_ROOT}/files")
               "#{RAILS_ROOT}/" represents application main directory
             RDM_LOGIN_REQUIRED: set to true if you want to force users to login to access
               any part of the application (default: false)
             RDM_DEFAULT_LANG: default language for anonymous users: 'en' (default), 'es', 'fr' available

redmine/doc/README +7 -1

             == redMine
             redMine - project management software
             Copyright (C) 2006  Jean-Philippe Lang
-            http://redmine.sourceforge.net/
+            http://redmine.org/
             == License
             This program 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.
             This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
             == Main features
             redMine is a project management software written using Ruby on Rails.
             * multiple users/projects
             * fully customizable role based access control
             * issue tracking system
             * fully customizable workflow
             * documents/files repository
             * email notifications
             * multilanguage support
+            == User documentation
+            User documentation for redMine is written using DocBook XML format.
+            It's also avaible as HTML files in /public/manual (contextual help)
             == Versioning
             redMine versioning scheme is major.minor.revision
             Versions before 1.0.0 must be considered as beta versions and upgrading support
             may not be provided for these versions.
             == Credits
             * Jean-Francois Boutier (spanish translation)
             * Andreas Viklund (open source XHTML layout, http://andreasviklund.com/)

redmine/lang/fr_FR.rb +9 -1

             Localization.define('fr', 'Français') do |l|
               # trackers
               l.store 'Bug', 'Anomalie'
               l.store 'Feature request', 'Evolution'
               l.store 'Support request', 'Assistance'
               # issue statuses
               l.store 'New', 'Nouveau'
               l.store 'Assigned', 'Assignée'
               l.store 'Resolved', 'Résolue'
               l.store 'Closed', 'Fermée'
               l.store 'Rejected', 'Rejetée'
               l.store 'Feedback', 'Commentaire'
+              # filters
+              l.store '[All]', '[Tous]'
+              l.store '[Open]', '[Ouvert]'
+              l.store '[None]', '[Aucun]'
               # issue priorities
               l.store 'Issue priorities', 'Priorités des demandes'
               l.store 'Low', 'Bas'
               l.store 'Normal', 'Normal'
               l.store 'High', 'Haut'
               l.store 'Urgent', 'Urgent'
               l.store 'Immediate', 'Immédiat'
               # document categories
               l.store 'Document categories', 'Catégories de documents'
               l.store 'Uncategorized', 'Sans catégorie'
               l.store 'User documentation', 'Documentation utilisateur'
               l.store 'Technical documentation', 'Documentation technique'
               # dates
               l.store '(date)', lambda { |t| t.strftime('%d/%m/%Y') }
               l.store '(time)', lambda { |t| t.strftime('%d/%m/%Y %H:%M') }
               # ./script/../config/../app/views/account/login.rhtml
               # ./script/../config/../app/views/account/my_account.rhtml
               l.store 'My account', 'Mon compte'
               l.store 'Login', 'Identifiant'
               l.store 'Created on', 'Crée le'
               l.store 'Last update', 'Mis à jour'
               l.store 'Information', 'Informations'
               l.store 'Firstname', 'Prénom'
               l.store 'Lastname', 'Nom'
               l.store 'Mail', 'Mail'
               l.store 'Language', 'Langue'
               l.store 'Mail notifications', 'Notifications par mail'
               l.store 'Save', 'Valider'
               l.store 'Password', 'Mot de passe'
               l.store 'New password', 'Nouveau mot de passe'
               l.store 'Confirmation', 'Confirmation'
               # ./script/../config/../app/views/account/my_page.rhtml
               l.store 'My page', 'Ma page'
               l.store 'Welcome', 'Bienvenue'
               l.store 'Last login', 'Dernière connexion'
               l.store 'Reported issues', 'Demandes soumises'
               l.store 'Assigned to me', 'Demandes qui me sont assignées'
+              # ./script/../config/../app/views/account/login.rhtml
+              l.store 'Please login', 'Identification'
               # ./script/../config/../app/views/account/show.rhtml
               l.store 'Registered on', 'Inscrit le'
               l.store 'Projects', 'Projets'
               l.store 'Activity', 'Activité'
               # ./script/../config/../app/views/admin/index.rhtml
               l.store 'Administration', 'Administration'
               l.store 'Users', 'Utilisateurs'
               l.store 'Roles and permissions', 'Rôles et permissions'
               l.store 'Trackers', 'Trackers'
               l.store 'Custom fields', 'Champs personnalisés'
               l.store 'Issue Statuses', 'Statuts des demandes'
               l.store 'Workflow', 'Workflow'
               l.store 'Enumerations', 'Listes de valeurs'
               # ./script/../config/../app/views/admin/info.rhtml
               l.store 'Version', 'Version'
               l.store 'Database', 'Base de données'
               # ./script/../config/../app/views/admin/mail_options.rhtml
               l.store 'Select actions for which mail notification should be enabled.', 'Sélectionner les actions pour lesquelles la notification par mail doit être activée.'
               l.store 'Check all', 'Cocher tout'
               l.store 'Uncheck all', 'Décocher tout'
               # ./script/../config/../app/views/admin/projects.rhtml
               l.store 'Project', 'Projet'
               l.store 'Description', 'Description'
               l.store 'Public', 'Public'
               l.store 'Delete', 'Supprimer'
               l.store 'Previous', 'Précédent'
               l.store 'Next', 'Suivant'
               # ./script/../config/../app/views/custom_fields/edit.rhtml
               l.store 'Custom field', 'Champ personnalisé'
               # ./script/../config/../app/views/custom_fields/list.rhtml
               l.store 'Name', 'Nom'
               l.store 'Type', 'Type'
               l.store 'Required', 'Obligatoire'
               l.store 'For all projects', 'Pour tous les projets'
               l.store 'Used by', 'Utilisé par'
               # ./script/../config/../app/views/custom_fields/new.rhtml
               l.store 'New custom field', 'Nouveau champ personnalisé'
               l.store 'Create', 'Créer'
               # ./script/../config/../app/views/custom_fields/_form.rhtml
               l.store '0 means no restriction', '0 pour aucune restriction'
               l.store 'Regular expression pattern', 'Expression régulière'
               l.store 'Possible values', 'Valeurs possibles'
               # ./script/../config/../app/views/documents/edit.rhtml
               l.store 'Document', 'Document'
               # ./script/../config/../app/views/documents/show.rhtml
               l.store 'Category', 'Catégorie'
               l.store 'Edit', 'Modifier'
               l.store 'download', 'téléchargement'
               l.store 'Add file', 'Ajouter le fichier'
               l.store 'Add', 'Ajouter'
               # ./script/../config/../app/views/documents/_form.rhtml
               l.store 'Title', 'Titre'
               # ./script/../config/../app/views/enumerations/edit.rhtml
               # ./script/../config/../app/views/enumerations/list.rhtml
               # ./script/../config/../app/views/enumerations/new.rhtml
               l.store 'New enumeration', 'Nouvelle valeur'
               # ./script/../config/../app/views/enumerations/_form.rhtml
               # ./script/../config/../app/views/issues/change_status.rhtml
               l.store 'Issue', 'Demande'
               l.store 'New status', 'Nouveau statut'
               l.store 'Assigned to', 'Assigné à'
               l.store 'Fixed in version', 'Version corrigée'
               l.store 'Notes', 'Remarques'
               # ./script/../config/../app/views/issues/edit.rhtml
               l.store 'Status', 'Statut'
               l.store 'Tracker', 'Tracker'
               l.store 'Priority', 'Priorité'
               l.store 'Subject', 'Sujet'
               # ./script/../config/../app/views/issues/show.rhtml
               l.store 'Author', 'Auteur'
               l.store 'Change status', 'Changer le statut'
               l.store 'History', 'Historique'
               l.store 'Attachments', 'Fichiers'
               l.store 'Update...', 'Changer...'
               # ./script/../config/../app/views/issues/_list_simple.rhtml
               l.store 'No issue', 'Aucune demande'
               # ./script/../config/../app/views/issue_categories/edit.rhtml
               # ./script/../config/../app/views/issue_categories/_form.rhtml
               # ./script/../config/../app/views/issue_statuses/edit.rhtml
               l.store 'Issue status', 'Statut de demande'
               # ./script/../config/../app/views/issue_statuses/list.rhtml
               l.store 'Issue statuses', 'Statuts de demande'
               l.store 'Default status', 'Statut par défaut'
               l.store 'Issue closed', 'Demande fermée'
               l.store 'Color', 'Couleur'
               # ./script/../config/../app/views/issue_statuses/new.rhtml
               l.store 'New issue status', 'Nouveau statut'
               # ./script/../config/../app/views/issue_statuses/_form.rhtml
               # ./script/../config/../app/views/layouts/base.rhtml
               l.store 'Home', 'Accueil'
               l.store 'Help', 'Aide'
               l.store 'Log in', 'Connexion'
               l.store 'Logout', 'Déconnexion'
               l.store 'Overview', 'Aperçu'
               l.store 'Issues', 'Demandes'
               l.store 'Reports', 'Rapports'
               l.store 'News', 'Annonces'
               l.store 'Change log', 'Historique'
               l.store 'Documents', 'Documents'
               l.store 'Members', 'Membres'
               l.store 'Files', 'Fichiers'
               l.store 'Settings', 'Configuration'
               l.store 'My projects', 'Mes projets'
               l.store 'Logged as', 'Connecté en tant que'
               # ./script/../config/../app/views/mailer/issue_add.rhtml
               # ./script/../config/../app/views/mailer/issue_change_status.rhtml
               # ./script/../config/../app/views/mailer/_issue.rhtml
               # ./script/../config/../app/views/news/edit.rhtml
               # ./script/../config/../app/views/news/show.rhtml
               l.store 'Summary', 'Résumé'
               l.store 'By', 'Par'
               l.store 'Date', 'Date'
               # ./script/../config/../app/views/news/_form.rhtml
               # ./script/../config/../app/views/projects/add.rhtml
               l.store 'New project', 'Nouveau projet'
               # ./script/../config/../app/views/projects/add_document.rhtml
               l.store 'New document', 'Nouveau document'
               l.store 'File', 'Fichier'
               # ./script/../config/../app/views/projects/add_issue.rhtml
               l.store 'New issue', 'Nouvelle demande'
               l.store 'Attachment', 'Fichier'
               # ./script/../config/../app/views/projects/add_news.rhtml
               # ./script/../config/../app/views/projects/add_version.rhtml
               l.store 'New version', 'Nouvelle version'
               # ./script/../config/../app/views/projects/changelog.rhtml
               # ./script/../config/../app/views/projects/destroy.rhtml
               l.store 'Are you sure you want to delete project', 'Êtes-vous sûr de vouloir supprimer le projet'
               # ./script/../config/../app/views/projects/list.rhtml
               l.store 'Public projects', 'Projets publics'
               # ./script/../config/../app/views/projects/list_documents.rhtml
               l.store 'Desciption', 'Description'
               # ./script/../config/../app/views/projects/list_files.rhtml
               l.store 'Files', 'Fichiers'
               l.store 'New file', 'Nouveau fichier'
               # ./script/../config/../app/views/projects/list_issues.rhtml
+              l.store 'Subprojects', 'Sous-projets'
               l.store 'Apply filter', 'Appliquer'
               l.store 'Reset', 'Annuler'
               l.store 'Report an issue', 'Nouvelle demande'
               # ./script/../config/../app/views/projects/list_members.rhtml
               l.store 'Project members', 'Membres du projet'
               # ./script/../config/../app/views/projects/list_news.rhtml
               l.store 'Read...', 'Lire...'
               # ./script/../config/../app/views/projects/settings.rhtml
               l.store 'New member', 'Nouveau membre'
               l.store 'Versions', 'Versions'
               l.store 'New version...', 'Nouvelle version...'
               l.store 'Issue categories', 'Catégories des demandes'
               l.store 'New category', 'Nouvelle catégorie'
               # ./script/../config/../app/views/projects/show.rhtml
               l.store 'Homepage', 'Site web'
               l.store 'open', 'ouverte(s)'
               l.store 'View all issues', 'Voir toutes les demandes'
               l.store 'View all news', 'Voir toutes les annonces'
               l.store 'Latest news', 'Dernières annonces'
               # ./script/../config/../app/views/projects/_form.rhtml
               # ./script/../config/../app/views/reports/issue_report.rhtml
               l.store 'Issues by tracker', 'Demandes par tracker'
               l.store 'Issues by priority', 'Demandes par priorité'
               l.store 'Issues by category', 'Demandes par catégorie'
               # ./script/../config/../app/views/reports/_simple.rhtml
               l.store 'Open', 'Ouverte'
               l.store 'Total', 'Total'
               # ./script/../config/../app/views/roles/edit.rhtml
               l.store 'Role', 'Rôle'
               # ./script/../config/../app/views/roles/list.rhtml
               l.store 'Roles', 'Rôles'
               # ./script/../config/../app/views/roles/new.rhtml
               l.store 'New role', 'Nouveau rôle'
               # ./script/../config/../app/views/roles/workflow.rhtml
               l.store 'Workflow setup', 'Configuration du workflow'
               l.store 'Select a workflow to edit', 'Sélectionner un workflow à mettre à jour'
               l.store 'New statuses allowed', 'Nouveaux statuts autorisés'
               # ./script/../config/../app/views/roles/_form.rhtml
               l.store 'Permissions', 'Permissions'
               # ./script/../config/../app/views/trackers/edit.rhtml
               # ./script/../config/../app/views/trackers/list.rhtml
               l.store 'View issues in change log', 'Demandes affichées dans l\'historique'
               # ./script/../config/../app/views/trackers/new.rhtml
               l.store 'New tracker', 'Nouveau tracker'
               # ./script/../config/../app/views/trackers/_form.rhtml
               # ./script/../config/../app/views/users/add.rhtml
               l.store 'New user', 'Nouvel utilisateur'
               # ./script/../config/../app/views/users/edit.rhtml
               l.store 'User', 'Utilisateur'
               # ./script/../config/../app/views/users/list.rhtml
               l.store 'Admin', 'Admin'
               l.store 'Locked', 'Verrouillé'
               # ./script/../config/../app/views/users/_form.rhtml
               l.store 'Administrator', 'Administrateur'
               # ./script/../config/../app/views/versions/edit.rhtml
               # ./script/../config/../app/views/versions/_form.rhtml
               # ./script/../config/../app/views/welcome/index.rhtml
+              l.store 'Latest projects', 'Derniers projets'
             end

redmine/public/manual/fr/resources/users_list.png ~~redmine/public/manual/images/users_list.png~~ renamed 0 0

NO CONTENT: file renamed from redmine/public/manual/images/users_list.png to redmine/public/manual/fr/resources/users_list.png

redmine/public/stylesheets/application.css +11 -2

             /* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */
             /* Edited by Jean-Philippe Lang *>
             /**************** Body and tag styles ****************/
             #header * {margin:0; padding:0;}
             p, ul, ol, li {margin:0; padding:0;}
             body{
             font:76% Verdana,Tahoma,Arial,sans-serif;
             line-height:1.4em;
             text-align:center;
             color:#303030;
             background:#e8eaec;
             }
             a{
             color:#467aa7;
             font-weight:bold;
             text-decoration:none;
             background-color:inherit;
             }
             a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
             a img{border:none;}
             p{padding:0 0 1em 0;}
             p form{margin-top:0; margin-bottom:20px;}
             img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
             img.left{float:left; margin:0 12px 5px 0;}
             img.center{display:block; margin:0 auto 5px auto;}
             img.right{float:right; margin:0 0 5px 12px;}
             /**************** Header and navigation styles ****************/
             #container{
             width:100%;
             min-width: 800px;
             margin:5px auto;
             padding:1px 0;
             text-align:left;
             background:#ffffff;
             color:#303030;
             border:2px solid #a0a0a0;
             }
             #header{
             height:5.5em;
             /*width:758px;*/
             margin:0 1px 1px 1px;
             background:#467aa7;
             color:#ffffff;
             }
             #header h1{
             padding:14px 0 0 20px;
             font-size:2.4em;
             background-color:inherit;
             color:#fff; /*rgb(152, 26, 33);*/
             letter-spacing:-2px;
             font-weight:normal;
             }
             #header h2{
             margin:10px 0 0 40px;
             font-size:1.4em;
             background-color:inherit;
             color:#f0f2f4;
             letter-spacing:-1px;
             font-weight:normal;
             }
             #navigation{
             height:2.2em;
             line-height:2.2em;
             /*width:758px;*/
             margin:0 1px;
             background:#578bb8;
             color:#ffffff;
             }
             #navigation li{
             float:left;
             list-style-type:none;
             border-right:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li.right {
              float:right;
             list-style-type:none;
             border-right:0;
             border-left:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li a{
             display:block;
             padding:0px 10px 0px 22px;
             font-size:0.8em;
             font-weight:normal;
             /*text-transform:uppercase;*/
             text-decoration:none;
             background-color:inherit;
             color: #ffffff;
             }
             * html #navigation a {width:1%;}
             #navigation .selected,#navigation a:hover{
             color:#ffffff;
             text-decoration:none;
             background-color: #80b0da;
             }
             /**************** Icons links *******************/
             .picHome {	background: url(../images/home.png) no-repeat 4px 50%; }
             .picUser {	background: url(../images/user.png) no-repeat 4px 50%; }
             .picUserPage {	background: url(../images/user_page.png) no-repeat 4px 50%; }
             .picAdmin {	background: url(../images/admin.png) no-repeat 4px 50%; }
             .picProject { background: url(../images/projects.png) no-repeat 4px 50%; }
             .picLogout { background: url(../images/logout.png) no-repeat 4px 50%; }
             .picHelp { background: url(../images/help.png) no-repeat 4px 50%; }
             /**************** Content styles ****************/
             #content{
             /*float:right;*/
             /*width:530px;*/
             width: auto;
             min-height: 500px;
             font-size:0.9em;
             padding:20px 10px 10px 20px;
             /*position: absolute;*/
             margin: 0 0 0 140px;
             border-left: 1px dashed #c0c0c0;
             }
             #content h2{
             display:block;
             margin:0 0 16px 0;
             font-size:1.7em;
             font-weight:normal;
             letter-spacing:-1px;
             color:#505050;
             background-color:inherit;
             }
             #content h2 a{font-weight:normal;}
             #content h3{margin:0 0 5px 0; font-size:1.4em; letter-spacing:-1px;}
             #content a:hover,#subcontent a:hover{text-decoration:underline;}
             #content ul,#content ol{margin:0 5px 16px 35px;}
             #content dl{margin:0 5px 10px 25px;}
             #content dt{font-weight:bold; margin-bottom:5px;}
             #content dd{margin:0 0 10px 15px;}
             /***********************************************/
             /*
             form{
             	padding:15px;
             	margin:0 0 20px 0;
             	border:1px solid #c0c0c0;
             	background-color:#CEE1ED;
             	width:600px;
             }
             */
             form {
             	display: inline;
             }
             .noborder {
             	border:0px;
             	background-color:#fff;
             	width:100%;
             }
             input {
             	vertical-align: top;
             }
             input.button-small
             {
                 font-size: 0.8em;
             }
+            select.select-small
+            {
+                font-size: 0.8em;
+            }
             label {
             	font-weight: bold;
             	font-size: 1em;
             }
+            fieldset {
+                border:1px solid #7F9DB9;
+            }
             .required {
             	color: #bb0000;
             }
             table.listTableContent {
             	/*margin: 2em 2em 2em 0;	*/
             	border:1px solid #c0c0c0;
             	width:99%;
             }
             table.listTableContent td {
             	margin: 2px;
             }
             tr.ListHead {
             	background-color:#467aa7;
             	color:#FFFFFF;
             	text-align:center;
             }
             tr.ListHead a {
             	color:#FFFFFF;
             	text-decoration:underline;
             }
-            tr.ListLine0 {
+            tr.odd {
             	background-color: #C1E2F7;
             }
-            tr.ListLine1 {
+            tr.even {
             	background-color:#CEE1ED;
             }
             hr { border:0px; border-bottom:1px dashed #000000; }
             /**************** Sidebar styles ****************/
             #subcontent{
             float:left;
             clear:both;
             width:130px;
             padding:20px 20px 10px 5px;
             line-height:1.4em;
             }
             #subcontent h2{
             display:block;
             margin:0 0 15px 0;
             font-size:1.6em;
             font-weight:normal;
             text-align:left;
             letter-spacing:-1px;
             color:#505050;
             background-color:inherit;
             }
             #subcontent p{margin:0 0 16px 0; font-size:0.9em;}
             /**************** Menublock styles ****************/
             .menublock{margin:0 0 20px 8px; font-size:0.9em;}
             .menublock li{list-style:none; display:block; padding:1px; margin-bottom:0px;}
             .menublock li a{font-weight:bold; text-decoration:none;}
             .menublock li a:hover{text-decoration:none;}
             .menublock li ul{margin:3px 0 3px 15px; font-size:1em; font-weight:normal;}
             .menublock li ul li{margin-bottom:0;}
             .menublock li ul a{font-weight:normal;}
             /**************** Searchbar styles ****************/
             #searchbar{margin:0 0 20px 0;}
             #searchbar form fieldset{margin-left:10px; border:0 solid;}
             #searchbar #s{
             height:1.2em;
             width:110px;
             margin:0 5px 0 0;
             border:1px solid #a0a0a0;
             }
             #searchbar #searchbutton{
             width:auto;
             padding:0 1px;
             border:1px solid #808080;
             font-size:0.9em;
             text-align:center;
             }
             /**************** Footer styles ****************/
             #footer{
             clear:both;
             /*width:758px;*/
             padding:5px 0;
             margin:0 1px;
             font-size:0.9em;
             color:#f0f0f0;
             background:#467aa7;
             }
             #footer p{padding:0; margin:0; text-align:center;}
             #footer a{color:#f0f0f0; background-color:inherit; font-weight:bold;}
             #footer a:hover{color:#ffffff; background-color:inherit; text-decoration: underline;}
             /**************** Misc classes and styles ****************/
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             .clear{clear:both;}
             .small{font-size:0.8em;line-height:1.4em;padding:0 0 0 0;}
             .hide{display:none;}
             .textcenter{text-align:center;}
             .textright{text-align:right;}
             .important{color:#f02025; background-color:inherit; font-weight:bold;}
             .box{
             margin:0 0 20px 0;
             padding:10px;
             border:1px solid #c0c0c0;
             background-color:#fafbfc;
             color:#505050;
             line-height:1.5em;
             }

redmine/test/fixtures/projects.yml +23 -2

@@ -1,5 +1,26
1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html	1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2	first:	2	ecookbook:
3	id: 1	3	id: 1
4	another:	4	name: eCookbook
		5	descr: Recipes management application
		6	homepage: http://ecookbook.somenet.foo/
		7	projects_count: 1
		8	created_on: 2005-01-01 01:00:00
		9	updated_on: 2005-01-01 01:00:00
		10	onlinestore:
5	id: 2	11	id: 2
		12	name: OnlineStore
		13	descr: E-commerce web site
		14	is_public: false
		15	projects_count: 0
		16	created_on: 2005-01-01 01:00:00
		17	updated_on: 2005-01-01 01:00:00
		18	tracker:
		19	id: 3
		20	name: tracker
		21	descr: bug tracker
		22	is_public: true
		23	projects_count: 0
		24	parent_id: 1
		25	created_on: 2005-01-01 01:00:00
		26	updated_on: 2005-01-01 01:00:00 No newline at end of file

redmine/test/fixtures/roles.yml +7 -2

@@ -1,5 +1,10
1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html	1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2	first:	2	manager:
3	id: 1	3	id: 1
4	another:	4	name: manager
		5	developer:
5	id: 2	6	id: 2
		7	name: developer
		8	reporter:
		9	id: 3
		10	name: reporter

redmine/test/fixtures/users.yml +16 -2

@@ -1,5 +1,19
1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html	1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
2	first:	2	admin:
3	id: 1	3	id: 1
4	another:	4	login: admin
		5	firstname: admin
		6	lastname: admin
		7	mail: admin@somenet.foo
		8	hashed_password: d033e22ae348aeb5660fc2140aec35850c4da997
		9	admin: true
		10	language: en
		11	paulochon:
5	id: 2	12	id: 2
		13	login: plochon
		14	firstname: Paul
		15	lastname: Ochon
		16	mail: plochon@somenet.foo
		17	hashed_password: d033e22ae348aeb5660fc2140aec35850c4da997
		18	admin: false
		19	language: en No newline at end of file

redmine/test/functional/projects_controller_test.rb +17 -58

@@ -1,88 +1,47
		1	# redMine - project management software
		2	# Copyright (C) 2006 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
1	require File.dirname(__FILE__) + '/../test_helper'	18	require File.dirname(__FILE__) + '/../test_helper'
2	require 'projects_controller'	19	require 'projects_controller'
3		20
4	# Re-raise errors caught by the controller.	21	# Re-raise errors caught by the controller.
5	class ProjectsController; def rescue_action(e) raise e end; end	22	class ProjectsController; def rescue_action(e) raise e end; end
6		23
7	class ProjectsControllerTest < Test::Unit::TestCase	24	class ProjectsControllerTest < Test::Unit::TestCase
8	fixtures :projects	25	fixtures :projects
9		26
10	def setup	27	def setup
11	@controller = ProjectsController.new	28	@controller = ProjectsController.new
12	@request = ActionController::TestRequest.new	29	@request = ActionController::TestRequest.new
13	@response = ActionController::TestResponse.new	30	@response = ActionController::TestResponse.new
14	end	31	end
15		32
16	def test_index	33	def test_index
17	get :index	34	get :index
18	assert_response :success	35	assert_response :success
19	assert_template 'list'	36	assert_template 'list'
20	end	37	end
21		38
22	def test_list	39	def test_list
23	get :list	40	get :list
24		41
25	assert_response :success	42	assert_response :success
26	assert_template 'list'	43	assert_template 'list'
27		44
28	assert_not_nil assigns(:projects)	45	assert_not_nil assigns(:projects)
29	end	46	end
30
31	def test_show
32	get :show, :id => 1
33
34	assert_response :success
35	assert_template 'show'
36
37	assert_not_nil assigns(:project)
38	assert assigns(:project).valid?
39	end
40
41	def test_new
42	get :new
43
44	assert_response :success
45	assert_template 'new'
46
47	assert_not_nil assigns(:project)
48	end
49
50	def test_create
51	num_projects = Project.count
52
53	post :create, :project => {}
54
55	assert_response :redirect
56	assert_redirected_to :action => 'list'
57
58	assert_equal num_projects + 1, Project.count
59	end
60
61	def test_edit
62	get :edit, :id => 1
63
64	assert_response :success
65	assert_template 'edit'
66
67	assert_not_nil assigns(:project)
68	assert assigns(:project).valid?
69	end
70
71	def test_update
72	post :update, :id => 1
73	assert_response :redirect
74	assert_redirected_to :action => 'show', :id => 1
75	end
76
77	def test_destroy
78	assert_not_nil Project.find(1)
79
80	post :destroy, :id => 1
81	assert_response :redirect
82	assert_redirected_to :action => 'list'
83
84	assert_raise(ActiveRecord::RecordNotFound) {
85	Project.find(1)
86	}
87	end
88	end	47	end

redmine/test/test_helper.rb +28 -1

-            ENV["RAILS_ENV"] = "test"
+            # redMine - project management software
+            # Copyright (C) 2006  Jean-Philippe Lang
+            #
+            # This program 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.
+            #
+            # This program 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
+            ENV["RAILS_ENV"] ||= "test"
             require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
             require 'test_help'
             class Test::Unit::TestCase
               # Transactional fixtures accelerate your tests by wrapping each test method
               # in a transaction that's rolled back on completion.  This ensures that the
               # test database remains unchanged so your fixtures don't have to be reloaded
               # between every test method.  Fewer database queries means faster tests.
               #
               # Read Mike Clark's excellent walkthrough at
               #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
               #
               # Every Active Record database supports transactions except MyISAM tables
               # in MySQL.  Turn off transactional fixtures in this case; however, if you
               # don't care one way or the other, switching from MyISAM to InnoDB tables
               # is recommended.
               self.use_transactional_fixtures = true
               # Instantiated fixtures are slow, but give you @david where otherwise you
               # would need people(:david).  If you don't want to migrate your existing
               # test cases which use the @david style and don't mind the speed hit (each
               # instantiated fixtures translates to a database query per test method),
               # then set this back to true.
               self.use_instantiated_fixtures  = false
               # Add more helper methods to be used by all tests here...
+              def log_user(login, password)
+                get "/account/login"
+                assert_equal nil, session[:user]
+                assert_response :success
+                assert_template "account/login"
+                post "/account/login", :login => login, :password => password
+                assert_redirected_to "account/my_page"
+                assert_equal login, session[:user].login
+              end
             end

redmine/test/unit/project_test.rb +69 -2

@@ -1,10 +1,77
		1	# redMine - project management software
		2	# Copyright (C) 2006 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
1	require File.dirname(__FILE__) + '/../test_helper'	18	require File.dirname(__FILE__) + '/../test_helper'
2		19
3	class ProjectTest < Test::Unit::TestCase	20	class ProjectTest < Test::Unit::TestCase
4	fixtures :projects	21	fixtures :projects
5		22
6	# Replace this with your real tests.	23	def setup
		24	@project = projects(:ecookbook)
		25	end
		26
7	def test_truth	27	def test_truth
8	assert_kind_of Project, projects(~~:first~~)	28	assert_kind_of Project, @project
		29	assert_equal "eCookbook", @project.name
		30	end
		31
		32	def test_update
		33	assert_equal "eCookbook", @project.name
		34	@project.name = "eCook"
		35	assert @project.save, @project.errors.full_messages.join("; ")
		36	@project.reload
		37	assert_equal "eCook", @project.name
		38	end
		39
		40	def test_validate
		41	@project.name = ""
		42	assert !@project.save
		43	assert_equal 1, @project.errors.count
		44	assert_equal "can't be blank", @project.errors.on(:name)
		45	end
		46
		47	def test_public_projects
		48	public_projects = Project.find(:all, :conditions => ["is_public=?", true])
		49	assert_equal 2, public_projects.length
		50	assert_equal true, public_projects[0].is_public?
		51	end
		52
		53	def test_destroy
		54	@project.destroy
		55	assert_raise(ActiveRecord::RecordNotFound) { Project.find(@project.id) }
		56	end
		57
		58	def test_subproject_ok
		59	sub = Project.find(2)
		60	sub.parent = Project.find(1)
		61	assert sub.save
		62	assert_equal 1, sub.parent.id
		63	assert_equal 2, Project.find(1).projects_count
		64	end
		65
		66	def test_subproject_invalid
		67	sub = Project.find(2)
		68	sub.parent = projects(:tracker)
		69	assert !sub.save
		70	end
		71
		72	def test_subproject_invalid_2
		73	sub = Project.find(1)
		74	sub.parent = projects(:onlinestore)
		75	assert !sub.save
9	end	76	end
10	end	77	end

redmine/test/unit/user_test.rb +56 -2

@@ -1,10 +1,64
		1	# redMine - project management software
		2	# Copyright (C) 2006 Jean-Philippe Lang
		3	#
		4	# This program is free software; you can redistribute it and/or
		5	# modify it under the terms of the GNU General Public License
		6	# as published by the Free Software Foundation; either version 2
		7	# of the License, or (at your option) any later version.
		8	#
		9	# This program is distributed in the hope that it will be useful,
		10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	# GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License
		15	# along with this program; if not, write to the Free Software
		16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		17
1	require File.dirname(__FILE__) + '/../test_helper'	18	require File.dirname(__FILE__) + '/../test_helper'
2		19
3	class UserTest < Test::Unit::TestCase	20	class UserTest < Test::Unit::TestCase
4	fixtures :users	21	fixtures :users
5		22
6	# Replace this with your real tests.
7	def test_truth	23	def test_truth
8	assert_kind_of User, users(:~~first~~)	24	assert_kind_of User, users(:paulochon)
		25	end
		26
		27	def test_update
		28	user = User.find(1)
		29	assert_equal "admin", user.login
		30	user.login = "john"
		31	assert user.save, user.errors.full_messages.join("; ")
		32	user.reload
		33	assert_equal "john", user.login
		34	end
		35
		36	def test_validate
		37	user = User.find(1)
		38	user.login = ""
		39	assert !user.save
		40	assert_equal 2, user.errors.count
		41	end
		42
		43	def test_password
		44	user = User.try_to_login("admin", "admin")
		45	assert_kind_of User, user
		46	assert_equal "admin", user.login
		47	user.password = "hello"
		48	assert user.save
		49
		50	user = User.try_to_login("admin", "hello")
		51	assert_kind_of User, user
		52	assert_equal "admin", user.login
		53	assert_equal User.hash_password("hello"), user.hashed_password
		54	end
		55
		56	def test_lock
		57	user = User.find(1)
		58	user.locked = true
		59	assert user.save
		60
		61	user = User.try_to_login("admin", "admin")
		62	assert_equal nil, user
9	end	63	end
10	end	64	end

redmine/public/manual/administration.html removed 0 -121

NO CONTENT: file was removed

redmine/public/manual/images/issues_list.png removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

redmine/public/manual/images/users_edit.png removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

redmine/public/manual/images/workflow.png removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

redmine/public/manual/index.html removed 0 -64

NO CONTENT: file was removed

redmine/public/manual/projects.html removed 0 -109

NO CONTENT: file was removed

redmine/public/manual/stylesheets/help.css removed 0 -70

NO CONTENT: file was removed

redmine/test/fixtures/attachments.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/custom_fields.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/documents.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/enumerations.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/issue_categories.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/issue_custom_fields.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/issue_custom_values.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/issue_histories.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/issue_statuses.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/issues.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/mailer/issue_closed removed 0 -3

NO CONTENT: file was removed

redmine/test/fixtures/members.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/news.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/permissions.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/trackers.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/versions.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/fixtures/workflow.yml removed 0 -5

NO CONTENT: file was removed

redmine/test/functional/account_controller_test.rb removed 0 -18

NO CONTENT: file was removed

redmine/test/functional/admin_controller_test.rb removed 0 -18

NO CONTENT: file was removed

redmine/test/functional/custom_fields_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/documents_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/enumerations_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/help_controller_test.rb removed 0 -18

NO CONTENT: file was removed

redmine/test/functional/issue_categories_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/issue_statuses_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/issues_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/members_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/news_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/reports_controller_test.rb removed 0 -18

NO CONTENT: file was removed

redmine/test/functional/roles_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/trackers_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/users_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/versions_controller_test.rb removed 0 -88

NO CONTENT: file was removed

redmine/test/functional/welcome_controller_test.rb removed 0 -18

NO CONTENT: file was removed

redmine/test/unit/attachment_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/custom_field_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/document_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/enumeration_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/issue_category_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/issue_custom_field_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/issue_custom_value_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/issue_history_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/issue_status_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/issue_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/mailer_test.rb removed 0 -35

NO CONTENT: file was removed

redmine/test/unit/member_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/news_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/packages_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/permission_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/role_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/tracker_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/version_test.rb removed 0 -10

NO CONTENT: file was removed

redmine/test/unit/workflow_test.rb removed 0 -10

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages