tagged version 0.5.1

git-svn-id: http://redmine.rubyforge.org/svn/tags/0.5.1@605 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/account_controller.rb

@@ -28,6 +28,11 @@ class AccountController < ApplicationController
   def show
     @user = User.find(params[:id])
     @custom_values = @user.custom_values.find(:all, :include => :custom_field)
+    
+    # show only public projects and private projects that the logged in user is also a member of
+    @memberships = @user.memberships.select do |membership|
+      membership.project.is_public? || (logged_in_user && logged_in_user.role_for_project(membership.project))
+    end
   rescue ActiveRecord::RecordNotFound
     render_404
   end
@@ -42,6 +47,11 @@ class AccountController < ApplicationController
       user = User.try_to_login(params[:login], params[:password])
       if user
         self.logged_in_user = user
+        # generate a key and set cookie if autologin
+        if params[:autologin] && Setting.autologin?
+          token = Token.create(:user => user, :action => 'autologin')
+          cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
+        end
         redirect_back_or_default :controller => 'my', :action => 'page'
       else
         flash.now[:notice] = l(:notice_account_invalid_creditentials)
@@ -51,6 +61,8 @@ class AccountController < ApplicationController
 
   # Log out current user and redirect to welcome page
   def logout
+    cookies.delete :autologin
+    Token.delete_all(["user_id = ? AND action = ?", logged_in_user.id, "autologin"]) if logged_in_user
     self.logged_in_user = nil
     redirect_to :controller => 'welcome'
   end

app/controllers/admin_controller.rb

@@ -27,12 +27,18 @@ class AdminController < ApplicationController
 	
   def projects
     sort_init 'name', 'asc'
-    sort_update		
-    @project_count = Project.count		
+    sort_update
+    
+    @status = params[:status] ? params[:status].to_i : 0
+    conditions = nil
+    conditions = ["status=?", @status] unless @status == 0
+    
+    @project_count = Project.count(:conditions => conditions)
     @project_pages = Paginator.new self, @project_count,
-								15,
+								25,
 								params['page']								
     @projects = Project.find :all, :order => sort_clause,
+                        :conditions => conditions,
 						:limit  =>  @project_pages.items_per_page,
 						:offset =>  @project_pages.current.offset
 

app/controllers/application.rb

@@ -19,6 +19,10 @@ class ApplicationController < ActionController::Base
   before_filter :check_if_login_required, :set_localization
   filter_parameter_logging :password
   
+  REDMINE_SUPPORTED_SCM.each do |scm|
+    require_dependency "repository/#{scm.underscore}"
+  end
+  
   def logged_in_user=(user)
     @logged_in_user = user
     session[:user_id] = (user ? user.id : nil)
@@ -40,6 +44,13 @@ class ApplicationController < ActionController::Base
   
   # check if login is globally required to access the application
   def check_if_login_required
+    # no check needed if user is already logged in
+    return true if logged_in_user
+    # auto-login feature
+    autologin_key = cookies[:autologin]
+    if autologin_key && Setting.autologin?
+      self.logged_in_user = User.find_by_autologin_key(autologin_key)
+    end
     require_login if Setting.login_required?
   end 
   
@@ -71,7 +82,7 @@ class ApplicationController < ActionController::Base
   def require_admin
     return unless require_login
     unless self.logged_in_user.admin?
-      render :nothing => true, :status => 403
+      render_403
       return false
     end
     true
@@ -79,6 +90,11 @@ class ApplicationController < ActionController::Base
 
   # authorizes the user for the requested action.
   def authorize(ctrl = params[:controller], action = params[:action])
+    unless @project.active?
+      @project = nil
+      render_404
+      return false
+    end
     # check if action is allowed on public projects
     if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ ctrl, action ]
       return true
@@ -91,17 +107,22 @@ class ApplicationController < ActionController::Base
     if logged_in_user_membership and Permission.allowed_to_role( "%s/%s" % [ ctrl, action ], logged_in_user_membership )    
       return true		
     end		
-    render :nothing => true, :status => 403
+    render_403
     false
   end
   
   # make sure that the user is a member of the project (or admin) if project is private
   # used as a before_filter for actions that do not require any particular permission on the project
   def check_project_privacy
+    unless @project.active?
+      @project = nil
+      render_404
+      return false
+    end
     return true if @project.is_public?
     return false unless logged_in_user
     return true if logged_in_user.admin? || logged_in_user_membership
-    render :nothing => true, :status => 403
+    render_403
     false
   end
 
@@ -121,6 +142,13 @@ class ApplicationController < ActionController::Base
     end
   end
   
+  def render_403
+    @html_title = "403"
+    @project = nil
+    render :template => "common/403", :layout => true, :status => 403
+    return false
+  end
+    
   def render_404
     @html_title = "404"
     render :template => "common/404", :layout => true, :status => 404

app/controllers/attachments_controller.rb

@@ -0,0 +1,44 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 AttachmentsController < ApplicationController
+  layout 'base'
+  before_filter :find_project, :check_project_privacy
+
+  # sends an attachment
+  def download
+    send_file @attachment.diskfile, :filename => @attachment.filename
+  rescue
+    render_404
+  end
+    
+  # sends an image to be displayed inline
+  def show
+    render(:nothing => true, :status => 404) and return unless @attachment.diskfile =~ /\.(jpeg|jpg|gif|png)$/i
+    send_file @attachment.diskfile, :filename => @attachment.filename, :type => "image/#{$1}", :disposition => 'inline'
+  rescue
+    render_404
+  end
+ 
+private
+  def find_project
+    @attachment = Attachment.find(params[:id])
+    @project = @attachment.project
+  rescue
+    render_404
+  end
+end

app/controllers/boards_controller.rb

@@ -0,0 +1,89 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 BoardsController < ApplicationController
+  layout 'base'
+  before_filter :find_project
+  before_filter :authorize, :except => [:index, :show]
+  before_filter :check_project_privacy, :only => [:index, :show]
+
+  helper :messages
+  include MessagesHelper
+  helper :sort
+  include SortHelper
+  helper :watchers
+  include WatchersHelper
+ 
+  def index
+    @boards = @project.boards
+    # show the board if there is only one
+    if @boards.size == 1
+      @board = @boards.first
+      show
+      render :action => 'show'
+    end
+  end
+
+  def show
+    sort_init "#{Message.table_name}.updated_on", "desc"
+    sort_update	
+      
+    @topic_count = @board.topics.count
+    @topic_pages = Paginator.new self, @topic_count, 25, params['page']
+    @topics =  @board.topics.find :all, :order => sort_clause,
+                                  :include => [:author, {:last_reply => :author}],
+                                  :limit  =>  @topic_pages.items_per_page,
+                                  :offset =>  @topic_pages.current.offset
+    render :action => 'show', :layout => false if request.xhr?
+  end
+  
+  verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }
+
+  def new
+    @board = Board.new(params[:board])
+    @board.project = @project
+    if request.post? && @board.save
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
+    end
+  end
+
+  def edit
+    if request.post? && @board.update_attributes(params[:board])
+      case params[:position]
+      when 'highest'; @board.move_to_top
+      when 'higher'; @board.move_higher
+      when 'lower'; @board.move_lower
+      when 'lowest'; @board.move_to_bottom
+      end if params[:position]
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
+    end
+  end
+
+  def destroy
+    @board.destroy
+    redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
+  end
+  
+private
+  def find_project
+    @project = Project.find(params[:project_id])
+    @board = @project.boards.find(params[:id]) if params[:id]
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/feeds_controller.rb

@@ -37,6 +37,7 @@ class FeedsController < ApplicationController
   def issues
     if @project && params[:query_id]
       query = Query.find(params[:query_id])
+      query.executed_by = @user
       # ignore query if it's not valid
       query = nil unless query.valid?
       # override with query conditions
@@ -44,7 +45,7 @@ class FeedsController < ApplicationController
     end
 
     Issue.with_scope(:find => @find_options) do
-      @issues = Issue.find :all, :include => [:project, :author, :tracker, :status], 
+      @issues = Issue.find :all, :include => [:project, :author, :tracker, :status, :custom_values], 
                                  :order => "#{Issue.table_name}.created_on DESC"
     end
     @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
@@ -56,6 +57,7 @@ class FeedsController < ApplicationController
   def history    
     if @project && params[:query_id]
       query = Query.find(params[:query_id])
+      query.executed_by = @user
       # ignore query if it's not valid
       query = nil unless query.valid?
       # override with query conditions
@@ -63,7 +65,7 @@ class FeedsController < ApplicationController
     end
 
     Journal.with_scope(:find => @find_options) do
-      @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ], 
+      @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status, :custom_values]} ], 
                                      :order => "#{Journal.table_name}.created_on DESC"
     end
     
@@ -90,7 +92,7 @@ private
       # global feed
       scope = ["#{Project.table_name}.is_public=?", true]
     end
-    @find_options = {:conditions => scope, :limit => Setting.feeds_limit}
+    @find_options = {:conditions => scope, :limit => Setting.feeds_limit.to_i}
     return true
   end
 end

app/controllers/issue_relations_controller.rb

@@ -0,0 +1,59 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 IssueRelationsController < ApplicationController
+  layout 'base'
+  before_filter :find_project, :authorize
+  
+  def new
+    @relation = IssueRelation.new(params[:relation])
+    @relation.issue_from = @issue
+    @relation.save if request.post?
+    respond_to do |format|
+      format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
+      format.js do
+        render :update do |page|
+          page.replace_html "relations", :partial => 'issues/relations'
+          if @relation.errors.empty?
+            page << "$('relation_delay').value = ''"
+            page << "$('relation_issue_to_id').value = ''"
+          end
+        end
+      end
+    end
+  end
+  
+  def destroy
+    relation = IssueRelation.find(params[:id])
+    if request.post? && @issue.relations.include?(relation)
+      relation.destroy
+      @issue.reload
+    end
+    respond_to do |format|
+      format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
+      format.js { render(:update) {|page| page.replace_html "relations", :partial => 'issues/relations'} }
+    end
+  end
+  
+private
+  def find_project
+    @issue = Issue.find(params[:issue_id])
+    @project = @issue.project
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/issues_controller.rb

@@ -18,11 +18,21 @@
 class IssuesController < ApplicationController
   layout 'base', :except => :export_pdf
   before_filter :find_project, :authorize
+  
+  cache_sweeper :issue_sweeper, :only => [ :edit, :change_status, :destroy ]
 
+  helper :projects
+  include ProjectsHelper   
   helper :custom_fields
   include CustomFieldsHelper
   helper :ifpdf
   include IfpdfHelper
+  helper :issue_relations
+  include IssueRelationsHelper
+  helper :watchers
+  include WatchersHelper
+  helper :attachments
+  include AttachmentsHelper   
 
   def show
     @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
@@ -39,7 +49,7 @@ class IssuesController < ApplicationController
   def export_pdf
     @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
     @options_for_rfpdf ||= {}
-    @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.long_id}.pdf"
+    @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.id}.pdf"
   end
 
   def edit
@@ -95,6 +105,13 @@ class IssuesController < ApplicationController
                                                  :value => a.filename) unless a.new_record?
           } if params[:attachments] and params[:attachments].is_a? Array
         
+          # Log time
+          if logged_in_user.authorized_to(@project, "timelog/edit")
+            @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => logged_in_user, :spent_on => Date.today)
+            @time_entry.attributes = params[:time_entry]
+            @time_entry.save
+          end
+          
           flash[:notice] = l(:notice_successful_update)
           Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
           redirect_to :action => 'show', :id => @issue
@@ -105,6 +122,7 @@ class IssuesController < ApplicationController
       end
     end    
     @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
+    @activities = Enumeration::get_values('ACTI')
   end
 
   def destroy
@@ -140,14 +158,6 @@ class IssuesController < ApplicationController
     redirect_to :action => 'show', :id => @issue
   end
 
-  # Send the file in stream mode
-  def download
-    @attachment = @issue.attachments.find(params[:attachment_id])
-    send_file @attachment.diskfile, :filename => @attachment.filename
-  rescue
-    render_404
-  end
-
 private
   def find_project
     @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])

app/controllers/members_controller.rb

@@ -21,15 +21,19 @@ class MembersController < ApplicationController
 
   def edit
     if request.post? and @member.update_attributes(params[:member])
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project
+  	 respond_to do |format|
+        format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+        format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/members'} }
+      end
     end
   end
 
   def destroy
     @member.destroy
-    flash[:notice] = l(:notice_successful_delete)
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project
+	respond_to do |format|
+      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+      format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/members'} }
+    end
   end
 
 private

app/controllers/messages_controller.rb

@@ -0,0 +1,62 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 MessagesController < ApplicationController
+  layout 'base'
+  before_filter :find_project, :check_project_privacy
+  before_filter :require_login, :only => [:new, :reply]
+
+  verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
+
+  helper :attachments
+  include AttachmentsHelper   
+
+  def show
+    @reply = Message.new(:subject => "RE: #{@message.subject}")
+    render :action => "show", :layout => false if request.xhr?
+  end
+  
+  def new
+    @message = Message.new(params[:message])
+    @message.author = logged_in_user
+    @message.board = @board 
+    if request.post? && @message.save
+      params[:attachments].each { |file|
+        next unless file.size > 0
+        Attachment.create(:container => @message, :file => file, :author => logged_in_user)
+      } if params[:attachments] and params[:attachments].is_a? Array    
+      redirect_to :action => 'show', :id => @message
+    end
+  end
+
+  def reply
+    @reply = Message.new(params[:reply])
+    @reply.author = logged_in_user
+    @reply.board = @board
+    @message.children << @reply
+    redirect_to :action => 'show', :id => @message
+  end
+  
+private
+  def find_project
+    @board = Board.find(params[:board_id], :include => :project)
+    @project = @board.project
+    @message = @board.topics.find(params[:id]) if params[:id]
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/my_controller.rb

@@ -21,6 +21,7 @@ class MyController < ApplicationController
 
   BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
              'issuesreportedbyme' => :label_reported_issues,
+             'issueswatched' => :label_watched_issues,
              'news' => :label_news_latest,
              'calendar' => :label_calendar,
              'documents' => :label_document_plural

app/controllers/projects_controller.rb

@@ -19,8 +19,12 @@ require 'csv'
 
 class ProjectsController < ApplicationController
   layout 'base'
-  before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
-  before_filter :require_admin, :only => [ :add, :destroy ]
+  before_filter :find_project, :except => [ :index, :list, :add ]
+  before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
+  before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
+  
+  cache_sweeper :project_sweeper, :only => [ :add, :edit, :archive, :unarchive, :destroy ]
+  cache_sweeper :issue_sweeper, :only => [ :add_issue ]
 
   helper :sort
   include SortHelper
@@ -31,6 +35,8 @@ class ProjectsController < ApplicationController
   helper IssuesHelper
   helper :queries
   include QueriesHelper
+  helper :repositories
+  include RepositoriesHelper
   
   def index
     list
@@ -41,12 +47,12 @@ class ProjectsController < ApplicationController
   def list
     sort_init "#{Project.table_name}.name", "asc"
     sort_update		
-    @project_count = Project.count(:all, :conditions => ["is_public=?", true])		
+    @project_count = Project.count(:all, :conditions => Project.visible_by(logged_in_user))		
     @project_pages = Paginator.new self, @project_count,
 								15,
 								params['page']								
     @projects = Project.find :all, :order => sort_clause,
-						:conditions => ["#{Project.table_name}.is_public=?", true],
+						:conditions => Project.visible_by(logged_in_user),
 						:include => :parent,
 						:limit  =>  @project_pages.items_per_page,
 						:offset =>  @project_pages.current.offset
@@ -66,7 +72,7 @@ class ProjectsController < ApplicationController
       @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
       @project.custom_values = @custom_values			
       if params[:repository_enabled] && params[:repository_enabled] == "1"
-        @project.repository = Repository.new
+        @project.repository = Repository.factory(params[:repository_scm])
         @project.repository.attributes = params[:repository]
       end
       if "1" == params[:wiki_enabled]
@@ -84,7 +90,7 @@ class ProjectsController < ApplicationController
   def show
     @custom_values = @project.custom_values.find(:all, :include => :custom_field)
     @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
-    @subprojects = @project.children if @project.children.size > 0
+    @subprojects = @project.active_children
     @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
     @trackers = Tracker.find(:all, :order => 'position')
     @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
@@ -96,8 +102,6 @@ class ProjectsController < ApplicationController
     @custom_fields = IssueCustomField.find(:all)
     @issue_category ||= IssueCategory.new
     @member ||= @project.members.new
-    @roles = Role.find(:all, :order => 'position')
-    @users = User.find_active(:all) - @project.users
     @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
   end
   
@@ -114,8 +118,8 @@ class ProjectsController < ApplicationController
         when "0"
           @project.repository = nil
         when "1"
-          @project.repository ||= Repository.new
-          @project.repository.update_attributes params[:repository]
+          @project.repository ||= Repository.factory(params[:repository_scm])
+          @project.repository.update_attributes params[:repository] if @project.repository
         end
       end
       if params[:wiki_enabled]
@@ -138,27 +142,35 @@ class ProjectsController < ApplicationController
     end
   end
 
+  def archive
+    @project.archive if request.post? && @project.active?
+    redirect_to :controller => 'admin', :action => 'projects'
+  end
+  
+  def unarchive
+    @project.unarchive if request.post? && !@project.active?
+    redirect_to :controller => 'admin', :action => 'projects'
+  end
+  
   # Delete @project
   def destroy
+    @project_to_destroy = @project
     if request.post? and params[:confirm]
-      @project.destroy
+      @project_to_destroy.destroy
       redirect_to :controller => 'admin', :action => 'projects'
     end
+    # hide project in layout
+    @project = nil
   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
-        flash[:notice] = l(:notice_successful_create)
-        redirect_to :action => 'settings', :tab => 'categories', :id => @project
-      else
-        settings
-        render :action => 'settings'
-      end
+    @category = @project.issue_categories.build(params[:category])
+    if request.post? and @category.save
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to :action => 'settings', :tab => 'categories', :id => @project
     end
-  end	
+  end
 	
   # Add a new version to @project
   def add_version
@@ -172,14 +184,14 @@ class ProjectsController < ApplicationController
   # Add a new member to @project
   def add_member
     @member = @project.members.build(params[:member])
-  	if request.post?
-      if @member.save
-        flash[:notice] = l(:notice_successful_create)
-        redirect_to :action => 'settings', :tab => 'members', :id => @project
-      else		
-        settings
-        render :action => 'settings'
+  	if request.post? && @member.save
+  	  respond_to do |format|
+        format.html { redirect_to :action => 'settings', :tab => 'members', :id => @project }
+        format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'members'} }
       end
+    else		
+      settings
+      render :action => 'settings'
     end
   end
 
@@ -214,9 +226,14 @@ class ProjectsController < ApplicationController
     @priorities = Enumeration::get_values('IPRI')
     
     default_status = IssueStatus.default
+    unless default_status
+      flash.now[:notice] = 'No default issue status defined. Please check your configuration.'
+      render :nothing => true, :layout => true
+      return
+    end
     @issue = Issue.new(:project => @project, :tracker => @tracker)    
     @issue.status = default_status
-    @allowed_statuses = default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
+    @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker))if logged_in_user
     if request.get?
       @issue.start_date = Date.today
       @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
@@ -259,15 +276,14 @@ class ProjectsController < ApplicationController
     end
 
     if @query.valid?
-      @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)		
+      @issue_count = Issue.count(:include => [:status, :project, :custom_values], :conditions => @query.statement)		
       @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']								
       @issues = Issue.find :all, :order => sort_clause,
-  						:include => [ :assigned_to, :status, :tracker, :project, :priority ],
+  						:include => [ :assigned_to, :status, :tracker, :project, :priority, :custom_values ],
   						:conditions => @query.statement,
   						:limit  =>  @issue_pages.items_per_page,
   						:offset =>  @issue_pages.current.offset						
-    end    
-    @trackers = Tracker.find :all, :order => 'position'
+    end
     render :layout => false if request.xhr?
   end
 
@@ -280,15 +296,16 @@ class ProjectsController < ApplicationController
     render :action => 'list_issues' and return unless @query.valid?
 					
     @issues =  Issue.find :all, :order => sort_clause,
-						:include => [ :assigned_to, :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
+						:include => [ :assigned_to, :author, :status, :tracker, :priority, :project, {:custom_values => :custom_field} ],
 						:conditions => @query.statement,
-						:limit => Setting.issues_export_limit
+						:limit => Setting.issues_export_limit.to_i
 
     ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
     export = StringIO.new
     CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
       # csv header fields
       headers = [ "#", l(:field_status), 
+                       l(:field_project),
                        l(:field_tracker),
                        l(:field_priority),
                        l(:field_subject),
@@ -303,13 +320,14 @@ class ProjectsController < ApplicationController
       for custom_field in @project.all_custom_fields
         headers << custom_field.name
       end      
-      csv << headers.collect {|c| ic.iconv(c) }
+      csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       # csv lines
       @issues.each do |issue|
         fields = [issue.id, issue.status.name, 
+                            issue.project.name,
                             issue.tracker.name, 
                             issue.priority.name,
-                            issue.subject, 
+                            issue.subject,
                             (issue.assigned_to ? issue.assigned_to.name : ""),
                             issue.author.name,
                             issue.start_date ? l_date(issue.start_date) : nil,
@@ -321,7 +339,7 @@ class ProjectsController < ApplicationController
         for custom_field in @project.all_custom_fields
           fields << (show_value issue.custom_value_for(custom_field))
         end
-        csv << fields.collect {|c| ic.iconv(c.to_s) }
+        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       end
     end
     export.rewind
@@ -337,9 +355,9 @@ class ProjectsController < ApplicationController
     render :action => 'list_issues' and return unless @query.valid?
 					
     @issues =  Issue.find :all, :order => sort_clause,
-						:include => [ :author, :status, :tracker, :priority ],
+						:include => [ :author, :status, :tracker, :priority, :project, :custom_values ],
 						:conditions => @query.statement,
-						:limit => Setting.issues_export_limit
+						:limit => Setting.issues_export_limit.to_i
 											
     @options_for_rfpdf ||= {}
     @options_for_rfpdf[:file_name] = "export.pdf"
@@ -362,6 +380,9 @@ class ProjectsController < ApplicationController
         unless i.project_id == new_project.id
           i.category = nil 
           i.fixed_version = nil
+          # delete issue relations
+          i.relations_from.clear
+          i.relations_to.clear
         end
         # move the issue
         i.project = new_project
@@ -373,22 +394,6 @@ class ProjectsController < ApplicationController
     end
   end
 
-  def add_query
-    @query = Query.new(params[:query])
-    @query.project = @project
-    @query.user = logged_in_user
-    
-    params[:fields].each do |field|
-      @query.add_filter(field, params[:operators][field], params[:values][field])
-    end if params[:fields]
-    
-    if request.post? and @query.save
-      flash[:notice] = l(:notice_successful_create)
-      redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
-    end    
-    render :layout => false if request.xhr?
-  end
-
   # Add a news to @project
   def add_news
     @news = News.new(:project => @project)
@@ -421,34 +426,25 @@ class ProjectsController < ApplicationController
       Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
     end
-    @versions = @project.versions
+    @versions = @project.versions.sort
   end
   
   def list_files
-    @versions = @project.versions
+    @versions = @project.versions.sort
   end
   
   # Show changelog for @project
   def changelog
     @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
-    retrieve_selected_tracker_ids(@trackers)
-    
-    @fixed_issues = @project.issues.find(:all, 
-      :include => [ :fixed_version, :status, :tracker ], 
-      :conditions => [ "#{IssueStatus.table_name}.is_closed=? and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}) and #{Issue.table_name}.fixed_version_id is not null", true],
-      :order => "#{Version.table_name}.effective_date DESC, #{Issue.table_name}.id DESC"
-    ) unless @selected_tracker_ids.empty?
-    @fixed_issues ||= []
+    retrieve_selected_tracker_ids(@trackers)    
+    @versions = @project.versions.sort
   end
 
   def roadmap
     @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
     retrieve_selected_tracker_ids(@trackers)
-    
-    @versions = @project.versions.find(:all,
-      :conditions => [ "#{Version.table_name}.effective_date>?", Date.today],
-      :order => "#{Version.table_name}.effective_date ASC"
-    )
+    conditions = ("1" == params[:completed] ? nil : [ "#{Version.table_name}.effective_date > ? OR #{Version.table_name}.effective_date IS NULL", Date.today])
+    @versions = @project.versions.find(:all, :conditions => conditions).sort
   end
   
   def activity
@@ -462,7 +458,7 @@ class ProjectsController < ApplicationController
     @month ||= Date.today.month
 
     @date_from = Date.civil(@year, @month, 1)
-    @date_to = (@date_from >> 1)-1
+    @date_to = @date_from >> 1
     
     @events_by_day = {}    
     
@@ -502,8 +498,8 @@ class ProjectsController < ApplicationController
       @show_documents = 1 
     end
     
-    unless params[:show_wiki_edits] == "0"
-      select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comment, " +
+    unless @project.wiki.nil? || params[:show_wiki_edits] == "0"
+      select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
                "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title"
       joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
               "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
@@ -559,7 +555,7 @@ class ProjectsController < ApplicationController
     @events = []
     @project.issues_with_subprojects(params[:with_subprojects]) do
       @events += Issue.find(:all, 
-                           :include => [:tracker, :status, :assigned_to, :priority], 
+                           :include => [:tracker, :status, :assigned_to, :priority, :project], 
                            :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to]
                            ) unless @selected_tracker_ids.empty?
     end
@@ -597,7 +593,7 @@ class ProjectsController < ApplicationController
     @project.issues_with_subprojects(params[:with_subprojects]) do
       @events += Issue.find(:all, 
                            :order => "start_date, due_date",
-                           :include => [:tracker, :status, :assigned_to, :priority], 
+                           :include => [:tracker, :status, :assigned_to, :priority, :project], 
                            :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                            ) unless @selected_tracker_ids.empty?
     end
@@ -612,33 +608,7 @@ class ProjectsController < ApplicationController
       render :template => "projects/gantt.rhtml"
     end
   end
-  
-  def search
-    @question = params[:q] || ""
-    @question.strip!
-    @all_words = params[:all_words] || (params[:submit] ? false : true)
-    @scope = params[:scope] || (params[:submit] ? [] : %w(issues changesets news documents wiki) )
-    # tokens must be at least 3 character long
-    @tokens = @question.split.uniq.select {|w| w.length > 2 }
-    if !@tokens.empty?
-      # no more than 5 tokens to search for
-      @tokens.slice! 5..-1 if @tokens.size > 5
-      # strings used in sql like statement
-      like_tokens = @tokens.collect {|w| "%#{w}%"}
-      operator = @all_words ? " AND " : " OR "
-      limit = 10
-      @results = []
-      @results += @project.issues.find(:all, :limit => limit, :include => :author, :conditions => [ (["(LOWER(subject) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'issues'
-      @results += @project.news.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort], :include => :author ) if @scope.include? 'news'
-      @results += @project.documents.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'documents'
-      @results += @project.wiki.pages.find(:all, :limit => limit, :include => :content, :conditions => [ (["(LOWER(title) like ? OR LOWER(text) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @project.wiki && @scope.include?('wiki')
-      @results += @project.repository.changesets.find(:all, :limit => limit, :conditions => [ (["(LOWER(comment) like ?)"] * like_tokens.size).join(operator), * (like_tokens).sort] ) if @project.repository && @scope.include?('changesets')
-      @question = @tokens.join(" ")
-    else
-      @question = ""
-    end
-  end
-  
+    
   def feeds
     @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
     @key = logged_in_user.get_or_create_rss_key.value if logged_in_user
@@ -667,11 +637,12 @@ private
   def retrieve_query
     if params[:query_id]
       @query = @project.queries.find(params[:query_id])
+      @query.executed_by = logged_in_user
       session[:query] = @query
     else
       if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id
         # Give it a name, required to be valid
-        @query = Query.new(:name => "_")
+        @query = Query.new(:name => "_", :executed_by => logged_in_user)
         @query.project = @project
         if params[:fields] and params[:fields].is_a? Array
           params[:fields].each do |field|

app/controllers/queries_controller.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2007  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
@@ -16,9 +16,35 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class QueriesController < ApplicationController
-  layout 'base'
-  before_filter :require_login, :find_query
+  layout 'base'  
+  before_filter :require_login, :except => :index
+  before_filter :find_project, :check_project_privacy
 
+  def index
+    @queries = @project.queries.find(:all, 
+                                     :order => "name ASC",
+                                     :conditions => ["is_public = ? or user_id = ?", true, (logged_in_user ? logged_in_user.id : 0)])
+  end
+  
+  def new
+    @query = Query.new(params[:query])
+    @query.project = @project
+    @query.user = logged_in_user
+    @query.executed_by = logged_in_user
+    @query.is_public = false unless logged_in_user.authorized_to(@project, 'projects/add_query')
+    
+    params[:fields].each do |field|
+      @query.add_filter(field, params[:operators][field], params[:values][field])
+    end if params[:fields]
+    
+    if request.post? and @query.save
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query
+      return
+    end
+    render :layout => false if request.xhr?
+  end
+  
   def edit
     if request.post?
       @query.filters = {}
@@ -26,6 +52,7 @@ class QueriesController < ApplicationController
         @query.add_filter(field, params[:operators][field], params[:values][field])
       end if params[:fields]
       @query.attributes = params[:query]
+      @query.is_public = false unless logged_in_user.authorized_to(@project, 'projects/add_query')
           
       if @query.save
         flash[:notice] = l(:notice_successful_update)
@@ -36,15 +63,19 @@ class QueriesController < ApplicationController
 
   def destroy
     @query.destroy if request.post?
-    redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
+    redirect_to :controller => 'queries', :project_id => @project
   end
   
 private
-  def find_query
-    @query = Query.find(params[:id])
-    @project = @query.project
-    # check if user is allowed to manage queries (same permission as add_query)
-    authorize('projects', 'add_query')
+  def find_project
+    if params[:id]
+      @query = Query.find(params[:id])
+      @query.executed_by = logged_in_user
+      @project = @query.project
+      render_403 unless @query.editable_by?(logged_in_user)
+    else
+      @project = Project.find(params[:project_id])
+    end
   rescue ActiveRecord::RecordNotFound
     render_404
   end

app/controllers/reports_controller.rb

@@ -29,6 +29,12 @@ class ReportsController < ApplicationController
       @data = issues_by_tracker
       @report_title = l(:field_tracker)
       render :template => "reports/issue_report_details"
+    when "version"
+      @field = "fixed_version_id"
+      @rows = @project.versions.sort
+      @data = issues_by_version
+      @report_title = l(:field_version)
+      render :template => "reports/issue_report_details"
     when "priority"
       @field = "priority_id"
       @rows = Enumeration::get_values('IPRI')
@@ -49,18 +55,19 @@ class ReportsController < ApplicationController
       render :template => "reports/issue_report_details"  
     when "subproject"
       @field = "project_id"
-      @rows = @project.children
+      @rows = @project.active_children
       @data = issues_by_subproject
       @report_title = l(:field_subproject)
       render :template => "reports/issue_report_details"  
     else
-      @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
       @trackers = Tracker.find(:all, :order => 'position')
+      @versions = @project.versions.sort
       @priorities = Enumeration::get_values('IPRI')
       @categories = @project.issue_categories
       @authors = @project.members.collect { |m| m.user }
-      @subprojects = @project.children
+      @subprojects = @project.active_children
       issues_by_tracker
+      issues_by_version
       issues_by_priority
       issues_by_category
       issues_by_author
@@ -128,7 +135,22 @@ private
                                                   and i.project_id=#{@project.id}
                                                 group by s.id, s.is_closed, t.id")	
   end
-	
+
+  def issues_by_version
+    @issues_by_version ||= 
+        ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
+                                                  s.is_closed as closed, 
+                                                  v.id as fixed_version_id,
+                                                  count(i.id) as total 
+                                                from 
+                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Version.table_name} v
+                                                where 
+                                                  i.status_id=s.id 
+                                                  and i.fixed_version_id=v.id
+                                                  and i.project_id=#{@project.id}
+                                                group by s.id, s.is_closed, v.id")	
+  end
+  	
   def issues_by_priority    
     @issues_by_priority ||= 
       ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
@@ -184,8 +206,8 @@ private
                                                   #{Issue.table_name} i, #{IssueStatus.table_name} s
                                                 where 
                                                   i.status_id=s.id 
-                                                  and i.project_id IN (#{@project.children.collect{|p| p.id}.join(',')})
-                                                group by s.id, s.is_closed, i.project_id") if @project.children.any?
+                                                  and i.project_id IN (#{@project.active_children.collect{|p| p.id}.join(',')})
+                                                group by s.id, s.is_closed, i.project_id") if @project.active_children.any?
     @issues_by_subproject ||= []
   end
 end

app/controllers/repositories_controller.rb

@@ -17,66 +17,78 @@
 
 require 'SVG/Graph/Bar'
 require 'SVG/Graph/BarHorizontal'
+require 'digest/sha1'
 
 class RepositoriesController < ApplicationController
   layout 'base'
-  before_filter :find_project
-  before_filter :authorize, :except => [:stats, :graph]
+  before_filter :find_project, :except => [:update_form]
+  before_filter :authorize, :except => [:update_form, :stats, :graph]
   before_filter :check_project_privacy, :only => [:stats, :graph]
   
   def show
-    # get entries for the browse frame
-    @entries = @repository.scm.entries('')
-    show_error and return unless @entries
     # check if new revisions have been committed in the repository
-    scm_latestrev = @entries.revisions.latest
-    if Setting.autofetch_changesets? && scm_latestrev && ((@repository.latest_changeset.nil?) || (@repository.latest_changeset.revision < scm_latestrev.identifier.to_i))
-      @repository.fetch_changesets
-      @repository.reload
-    end
-    @changesets = @repository.changesets.find(:all, :limit => 5, :order => "committed_on DESC")
+    @repository.fetch_changesets if Setting.autofetch_changesets?
+    # get entries for the browse frame
+    @entries = @repository.entries('')    
+    # latest changesets
+    @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
+    show_error and return unless @entries || @changesets.any?
   end
   
   def browse
-    @entries = @repository.scm.entries(@path, @rev)
-    show_error and return unless @entries
+    @entries = @repository.entries(@path, @rev)
+    show_error and return unless @entries    
+  end
+  
+  def changes
+    @entry = @repository.scm.entry(@path, @rev)
+    show_error and return unless @entry
+    @changes = Change.find(:all, :include => :changeset, 
+                                 :conditions => ["repository_id = ? AND path = ?", @repository.id, @path.with_leading_slash],
+                                 :order => "committed_on DESC")
   end
   
   def revisions
-    unless @path == ''
-      @entry = @repository.scm.entry(@path, @rev)  
-      show_error and return unless @entry
-    end
-    @repository.changesets_with_path @path do
-      @changeset_count = @repository.changesets.count
-      @changeset_pages = Paginator.new self, @changeset_count,
-  								      25,
-  								      params['page']								
-      @changesets = @repository.changesets.find(:all,
-  						:limit  =>  @changeset_pages.items_per_page,
-  						:offset =>  @changeset_pages.current.offset)
-    end
+    @changeset_count = @repository.changesets.count
+    @changeset_pages = Paginator.new self, @changeset_count,
+								      25,
+								      params['page']								
+    @changesets = @repository.changesets.find(:all,
+						:limit  =>  @changeset_pages.items_per_page,
+						:offset =>  @changeset_pages.current.offset)
+
     render :action => "revisions", :layout => false if request.xhr?
   end
   
   def entry
-    if 'raw' == params[:format]
-      content = @repository.scm.cat(@path, @rev)
-      show_error and return unless content
-      send_data content, :filename => @path.split('/').last
+    @content = @repository.scm.cat(@path, @rev)
+    show_error and return unless @content
+    if 'raw' == params[:format]      
+      send_data @content, :filename => @path.split('/').last
     end
   end
   
   def revision
     @changeset = @repository.changesets.find_by_revision(@rev)
     show_error and return unless @changeset
+    @changes_count = @changeset.changes.size
+    @changes_pages = Paginator.new self, @changes_count, 150, params['page']								
+    @changes = @changeset.changes.find(:all,
+  						:limit  =>  @changes_pages.items_per_page,
+  						:offset =>  @changes_pages.current.offset)
+  	
+  	render :action => "revision", :layout => false if request.xhr?	
   end
   
   def diff
-    @rev_to = params[:rev_to] || (@rev-1)
-    type = params[:type] || 'inline'
-    @diff = @repository.scm.diff(params[:path], @rev, @rev_to, type)
-    show_error and return unless @diff
+    @rev_to = params[:rev_to] ? params[:rev_to].to_i : (@rev - 1)
+    @diff_type = ('sbs' == params[:type]) ? 'sbs' : 'inline'
+    
+    @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")    
+    unless read_fragment(@cache_key)
+      @diff = @repository.diff(@path, @rev, @rev_to, type)
+      show_error and return unless @diff
+    end
   end
   
   def stats  
@@ -98,14 +110,19 @@ class RepositoriesController < ApplicationController
     end
   end
   
+  def update_form
+    @repository = Repository.factory(params[:repository_scm])
+    render :partial => 'projects/repository', :locals => {:repository => @repository}
+  end
+  
 private
   def find_project
     @project = Project.find(params[:id])
     @repository = @project.repository
     render_404 and return false unless @repository
-    @path = params[:path].squeeze('/').gsub(/^\//, '') if params[:path]
+    @path = params[:path].squeeze('/') if params[:path]
     @path ||= ''
-    @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
+    @rev = params[:rev].to_i if params[:rev]
   rescue ActiveRecord::RecordNotFound
     render_404
   end
@@ -206,3 +223,9 @@ class Date
     (date.year - self.year)*52 + (date.cweek - self.cweek)
   end
 end
+
+class String
+  def with_leading_slash
+    starts_with?('/') ? self : "/#{self}"
+  end
+end

app/controllers/search_controller.rb

@@ -0,0 +1,81 @@
+# 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 SearchController < ApplicationController
+  layout 'base'
+
+  helper :messages
+  include MessagesHelper
+
+  def index
+    @question = params[:q] || ""
+    @question.strip!
+    @all_words = params[:all_words] || (params[:submit] ? false : true)
+    @scope = params[:scope] || (params[:submit] ? [] : %w(projects issues changesets news documents wiki messages) )
+    
+    # quick jump to an issue
+    if @scope.include?('issues') && @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(logged_in_user))
+      redirect_to :controller => "issues", :action => "show", :id => $1
+      return
+    end
+    
+    if params[:id]
+      find_project
+      return unless check_project_privacy
+    end
+    
+    # tokens must be at least 3 character long
+    @tokens = @question.split.uniq.select {|w| w.length > 2 }
+    
+    if !@tokens.empty?
+      # no more than 5 tokens to search for
+      @tokens.slice! 5..-1 if @tokens.size > 5
+      # strings used in sql like statement
+      like_tokens = @tokens.collect {|w| "%#{w.downcase}%"}
+      operator = @all_words ? " AND " : " OR "
+      limit = 10
+      @results = []
+      if @project
+        @results += @project.issues.find(:all, :limit => limit, :include => :author, :conditions => [ (["(LOWER(subject) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'issues'
+        @results += @project.news.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort], :include => :author ) if @scope.include? 'news'
+        @results += @project.documents.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'documents'
+        @results += @project.wiki.pages.find(:all, :limit => limit, :include => :content, :conditions => [ (["(LOWER(title) like ? OR LOWER(text) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @project.wiki && @scope.include?('wiki')
+        @results += @project.repository.changesets.find(:all, :limit => limit, :conditions => [ (["(LOWER(comments) like ?)"] * like_tokens.size).join(operator), * (like_tokens).sort] ) if @project.repository && @scope.include?('changesets')
+        Message.with_scope :find => {:conditions => ["#{Board.table_name}.project_id = ?", @project.id]} do
+          @results += Message.find(:all, :include => :board, :limit => limit, :conditions => [ (["(LOWER(subject) like ? OR LOWER(content) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'messages'
+        end
+      else
+        Project.with_scope(:find => {:conditions => Project.visible_by(logged_in_user)}) do
+          @results += Project.find(:all, :limit => limit, :conditions => [ (["(LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'projects'
+        end
+        # if only one project is found, user is redirected to its overview
+        redirect_to :controller => 'projects', :action => 'show', :id => @results.first and return if @results.size == 1
+      end
+      @question = @tokens.join(" ")
+    else
+      @question = ""
+    end
+  end
+
+private  
+  def find_project
+    @project = Project.find(params[:id])
+    @html_title = @project.name
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/settings_controller.rb

@@ -29,5 +29,6 @@ class SettingsController < ApplicationController
       params[:settings].each { |name, value| Setting[name] = value }
       redirect_to :action => 'edit' and return
     end
+    @textile_available = ActionView::Helpers::TextHelper.method_defined?("textilize")
   end
 end

app/controllers/timelog_controller.rb

@@ -1,13 +1,107 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 TimelogController < ApplicationController
   layout 'base'
   
   before_filter :find_project
   before_filter :authorize, :only => :edit
-  before_filter :check_project_privacy, :only => :details
+  before_filter :check_project_privacy, :except => :edit
 
   helper :sort
   include SortHelper
   
+  def report
+    @available_criterias = { 'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
+                                          :values => @project.versions,
+                                          :label => :label_version},
+                             'category' => {:sql => "#{Issue.table_name}.category_id",
+                                            :values => @project.issue_categories,
+                                            :label => :field_category},
+                             'member' => {:sql => "#{TimeEntry.table_name}.user_id",
+                                         :values => @project.users,
+                                         :label => :label_member},
+                             'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
+                                          :values => Tracker.find(:all),
+                                          :label => :label_tracker},
+                             'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
+                                           :values => Enumeration::get_values('ACTI'),
+                                           :label => :label_activity}
+                           }
+    
+    @criterias = params[:criterias] || []
+    @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
+    @criterias.uniq!
+    
+    @columns = (params[:period] && %w(year month week).include?(params[:period])) ? params[:period] : 'month'
+    
+    if params[:date_from]
+      begin; @date_from = params[:date_from].to_date; rescue; end
+    end
+    if params[:date_to]
+      begin; @date_to = params[:date_to].to_date; rescue; end
+    end
+    @date_from ||= Date.civil(Date.today.year, 1, 1)
+    @date_to ||= Date.civil(Date.today.year, Date.today.month+1, 1) - 1
+    
+    unless @criterias.empty?
+      sql_select = @criterias.collect{|criteria| @available_criterias[criteria][:sql] + " AS " + criteria}.join(', ')
+      sql_group_by = @criterias.collect{|criteria| @available_criterias[criteria][:sql]}.join(', ')
+      
+      sql = "SELECT #{sql_select}, tyear, tmonth, tweek, SUM(hours) AS hours"
+      sql << " FROM #{TimeEntry.table_name} LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
+      sql << " WHERE #{TimeEntry.table_name}.project_id = %s" % @project.id
+      sql << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@date_from.to_time), ActiveRecord::Base.connection.quoted_date(@date_to.to_time)]
+      sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek"
+      
+      @hours = ActiveRecord::Base.connection.select_all(sql)
+      
+      @hours.each do |row|
+        case @columns
+        when 'year'
+          row['year'] = row['tyear']
+        when 'month'
+          row['month'] = "#{row['tyear']}-#{row['tmonth']}"
+        when 'week'
+          row['week'] = "#{row['tyear']}-#{row['tweek']}"
+        end
+      end
+    end
+       
+    @periods = []
+    date_from = @date_from
+    # 100 columns max
+    while date_from < @date_to && @periods.length < 100
+      case @columns
+      when 'year'
+        @periods << "#{date_from.year}"
+        date_from = date_from >> 12
+      when 'month'
+        @periods << "#{date_from.year}-#{date_from.month}"
+        date_from = date_from >> 1
+      when 'week'
+        @periods << "#{date_from.year}-#{date_from.cweek}"
+        date_from = date_from + 7
+      end
+    end
+    
+    render :layout => false if request.xhr?
+  end
+  
   def details
     sort_init 'spent_on', 'desc'
     sort_update
@@ -59,9 +153,9 @@ private
                  l(:field_activity),
                  l(:field_issue),
                  l(:field_hours),
-                 l(:field_comment)
+                 l(:field_comments)
                  ]
-      csv << headers.collect {|c| ic.iconv(c) }
+      csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       # csv lines
       @entries.each do |entry|
         fields = [l_date(entry.spent_on),
@@ -69,9 +163,9 @@ private
                   entry.activity.name,
                   (entry.issue ? entry.issue.id : nil),
                   entry.hours,
-                  entry.comment
+                  entry.comments
                   ]
-        csv << fields.collect {|c| ic.iconv(c.to_s) }
+        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       end
     end
     export.rewind

app/controllers/users_controller.rb

@@ -61,6 +61,7 @@ class UsersController < ApplicationController
       @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
       @user.custom_values = @custom_values			
       if @user.save
+        Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
         flash[:notice] = l(:notice_successful_create)
         redirect_to :action => 'list'
       end
@@ -87,7 +88,7 @@ class UsersController < ApplicationController
     end
     @auth_sources = AuthSource.find(:all)
     @roles = Role.find(:all, :order => 'position')
-    @projects = Project.find(:all) - @user.projects
+    @projects = Project.find(:all, :order => 'name', :conditions => "status=#{Project::STATUS_ACTIVE}") - @user.projects
     @membership ||= Member.new
   end
   

app/controllers/watchers_controller.rb

@@ -0,0 +1,49 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 WatchersController < ApplicationController
+  layout 'base'
+  before_filter :require_login, :find_project, :check_project_privacy
+  
+  def add
+    user = logged_in_user
+    @watched.add_watcher(user)
+    respond_to do |format|
+      format.html { render :text => 'Watcher added.', :layout => true }
+      format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
+    end
+  end
+  
+  def remove
+    user = logged_in_user
+    @watched.remove_watcher(user)
+    respond_to do |format|
+      format.html { render :text => 'Watcher removed.', :layout => true }
+      format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
+    end
+  end
+
+private
+  def find_project
+    klass = Object.const_get(params[:object_type].camelcase)
+    return false unless klass.respond_to?('watched_by')
+    @watched = klass.find(params[:object_id])
+    @project = @watched.project
+  rescue
+    render_404
+  end
+end

app/controllers/wiki_controller.rb

@@ -15,10 +15,18 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'diff'
+
 class WikiController < ApplicationController
   layout 'base'
-  before_filter :find_wiki, :check_project_privacy, :except => [:preview]
-    
+  before_filter :find_wiki, :check_project_privacy
+  before_filter :authorize, :only => [:destroy, :add_attachment, :destroy_attachment]
+  
+  verify :method => :post, :only => [:destroy, :destroy_attachment], :redirect_to => { :action => :index }
+
+  helper :attachments
+  include AttachmentsHelper   
+  
   # display a page (in editing mode if it doesn't exist)
   def index
     page_title = params[:page]
@@ -47,30 +55,54 @@ class WikiController < ApplicationController
     @content = @page.content_for_version(params[:version])
     @content.text = "h1. #{@page.pretty_title}" if @content.text.blank?
     # don't keep previous comment
-    @content.comment = nil
+    @content.comments = nil
     if request.post?      
       if @content.text == params[:content][:text]
         # don't save if text wasn't changed
         redirect_to :action => 'index', :id => @project, :page => @page.title
         return
       end
-      @content.text = params[:content][:text]
-      @content.comment = params[:content][:comment]
+      #@content.text = params[:content][:text]
+      #@content.comments = params[:content][:comments]
+      @content.attributes = params[:content]
       @content.author = logged_in_user
       # if page is new @page.save will also save content, but not if page isn't a new record
       if (@page.new_record? ? @page.save : @content.save)
         redirect_to :action => 'index', :id => @project, :page => @page.title
       end
     end
+  rescue ActiveRecord::StaleObjectError
+    # Optimistic locking exception
+    flash[:notice] = l(:notice_locking_conflict)
   end
   
   # show page history
   def history
     @page = @wiki.find_page(params[:page])
-    # don't load text
+    
+    @version_count = @page.content.versions.count
+    @version_pages = Paginator.new self, @version_count, 25, params['p']
+    # don't load text    
     @versions = @page.content.versions.find :all, 
-                                            :select => "id, author_id, comment, updated_on, version",
-                                            :order => 'version DESC'
+                                            :select => "id, author_id, comments, updated_on, version",
+                                            :order => 'version DESC',
+                                            :limit  =>  @version_pages.items_per_page + 1,
+                                            :offset =>  @version_pages.current.offset
+
+    render :layout => false if request.xhr?
+  end
+  
+  def diff
+    @page = @wiki.find_page(params[:page])
+    @diff = @page.diff(params[:version], params[:version_from])
+    render_404 unless @diff
+  end
+  
+  # remove a wiki page and its history
+  def destroy
+    @page = @wiki.find_page(params[:page])
+    @page.destroy if @page
+    redirect_to :action => 'special', :id => @project, :page => 'Page_index'
   end
 
   # display special pages
@@ -97,15 +129,34 @@ class WikiController < ApplicationController
   end
   
   def preview
+    page = @wiki.find_page(params[:page])
+    @attachements = page.attachments if page
     @text = params[:content][:text]
     render :partial => 'preview'
   end
 
+  def add_attachment
+    @page = @wiki.find_page(params[:page])
+    # Save the attachments
+    params[:attachments].each { |file|
+      next unless file.size > 0
+      a = Attachment.create(:container => @page, :file => file, :author => logged_in_user)
+    } if params[:attachments] and params[:attachments].is_a? Array
+    redirect_to :action => 'index', :page => @page.title
+  end
+
+  def destroy_attachment
+    @page = @wiki.find_page(params[:page])
+    @page.attachments.find(params[:attachment_id]).destroy
+    redirect_to :action => 'index', :page => @page.title
+  end
+
 private
   
   def find_wiki
     @project = Project.find(params[:id])
     @wiki = @project.wiki
+    render_404 unless @wiki
   rescue ActiveRecord::RecordNotFound
     render_404
   end

app/helpers/admin_helper.rb

@@ -16,4 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module AdminHelper
+  def project_status_options_for_select(selected)
+    options_for_select([[l(:label_all), "*"], 
+                        [l(:status_active), 1]], selected)
+  end
 end

app/helpers/application_helper.rb

@@ -15,6 +15,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+class RedCloth
+  # Patch for RedCloth.  Fixed in RedCloth r128 but _why hasn't released it yet.
+  # <a href="http://code.whytheluckystiff.net/redcloth/changeset/128">http://code.whytheluckystiff.net/redcloth/changeset/128</a>
+  def hard_break( text ) 
+    text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />" ) if hard_breaks 
+  end 
+end
+
 module ApplicationHelper
 
   # Return current logged in user or nil
@@ -47,7 +55,7 @@ module ApplicationHelper
 
   # Display a link to user's account page
   def link_to_user(user)
-    link_to user.display_name, :controller => 'account', :action => 'show', :id => user
+    link_to user.name, :controller => 'account', :action => 'show', :id => user
   end
   
   def link_to_issue(issue)
@@ -70,11 +78,16 @@ module ApplicationHelper
   end
   
   def format_date(date)
-    l_date(date) if date
+    return nil unless date
+    @date_format_setting ||= Setting.date_format.to_i
+    @date_format_setting == 0 ? l_date(date) : date.strftime("%Y-%m-%d")
   end
   
   def format_time(time)
-    l_datetime((time.is_a? String) ? time.to_time : time) if time
+    return nil unless time
+    @date_format_setting ||= Setting.date_format.to_i
+    time = time.to_time if time.is_a?(String)
+    @date_format_setting == 0 ? l_datetime(time) : (time.strftime("%Y-%m-%d") + ' ' + l_time(time))
   end
   
   def day_name(day)
@@ -86,25 +99,29 @@ module ApplicationHelper
   end
 
   def pagination_links_full(paginator, options={}, html_options={})
+    page_param = options.delete(:page_param) || :page
+  
     html = ''    
     html << link_to_remote(('&#171; ' + l(:label_previous)), 
-                            {:update => "content", :url => options.merge(:page => paginator.current.previous)},
-                            {:href => url_for(:params => options.merge(:page => paginator.current.previous))}) + ' ' if paginator.current.previous
+                            {:update => "content", :url => options.merge(page_param => paginator.current.previous)},
+                            {:href => url_for(:params => options.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
                             
     html << (pagination_links_each(paginator, options) do |n|
       link_to_remote(n.to_s, 
-                      {:url => {:params => options.merge(:page => n)}, :update => 'content'},
-                      {:href => url_for(:params => options.merge(:page => n))})
+                      {:url => {:params => options.merge(page_param => n)}, :update => 'content'},
+                      {:href => url_for(:params => options.merge(page_param => n))})
     end || '')
     
     html << ' ' + link_to_remote((l(:label_next) + ' &#187;'), 
-                                 {:update => "content", :url => options.merge(:page => paginator.current.next)},
-                                 {:href => url_for(:params => options.merge(:page => paginator.current.next))}) if paginator.current.next
+                                 {:update => "content", :url => options.merge(page_param => paginator.current.next)},
+                                 {:href => url_for(:params => options.merge(page_param => paginator.current.next))}) if paginator.current.next
     html  
   end
   
   # textilize text according to system settings and RedCloth availability
   def textilizable(text, options = {})
+    return "" if text.blank?
+    
     # different methods for formatting wiki links
     case options[:wiki_links]
     when :local
@@ -127,19 +144,44 @@ module ApplicationHelper
     #   [[link|title]] -> "title":link
     text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) {|m| "\"#{$3 || $1}\":" + format_wiki_link.call(Wiki.titleize($1)) }
 
-    # turn issue ids to textile links
+    # turn issue ids into links
     # example:
-    #   #52 -> "#52":/issues/show/52
-    text = text.gsub(/#(\d+)(?=\b)/) {|m| "\"##{$1}\":" + url_for(:controller => 'issues', :action => 'show', :id => $1) }
+    #   #52 -> <a href="/issues/show/52">#52</a>
+    text = text.gsub(/#(\d+)(?=\b)/) {|m| link_to "##{$1}", :controller => 'issues', :action => 'show', :id => $1}
        
-    # turn revision ids to textile links (@project needed)
+    # turn revision ids into links (@project needed)
     # example:
-    #   r52 -> "r52":/repositories/revision/6?rev=52 (@project.id is 6)
-    text = text.gsub(/(?=\b)r(\d+)(?=\b)/) {|m| "\"r#{$1}\":" + url_for(:controller => 'repositories', :action => 'revision', :id => @project.id, :rev => $1) } if @project
-   
+    #   r52 -> <a href="/repositories/revision/6?rev=52">r52</a> (@project.id is 6)
+    text = text.gsub(/(?=\b)r(\d+)(?=\b)/) {|m| link_to "r#{$1}", :controller => 'repositories', :action => 'revision', :id => @project.id, :rev => $1} if @project
+    
+    # when using an image link, try to use an attachment, if possible
+    attachments = options[:attachments]
+    if attachments
+      text = text.gsub(/!([<>=]*)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
+        align = $1
+        filename = $2
+        rf = Regexp.new(filename,  Regexp::IGNORECASE)
+        # search for the picture in attachments
+        if found = attachments.detect { |att| att.filename =~ rf }
+          image_url = url_for :controller => 'attachments', :action => 'show', :id => found.id
+          "!#{align}#{image_url}!"
+        else
+          "!#{align}#{filename}!"
+        end
+      end
+    end
+
     # finally textilize text
     @do_textilize ||= (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize")
-    text = @do_textilize ? auto_link(RedCloth.new(text).to_html) : simple_format(auto_link(h(text)))
+    text = @do_textilize ? auto_link(RedCloth.new(text, [:hard_breaks]).to_html) : simple_format(auto_link(h(text)))
+  end
+  
+  # Same as Rails' simple_format helper without using paragraphs
+  def simple_format_without_paragraph(text)
+    text.to_s.
+      gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
+      gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
+      gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
   end
   
   def error_messages_for(object_name, options = {})
@@ -181,7 +223,7 @@ module ApplicationHelper
   
   def lang_options_for_select(blank=true)
     (blank ? [["(auto)", ""]] : []) + 
-      (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
+      GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.first <=> y.first }
   end
   
   def label_tag_for(name, option_tags = nil, options = {})
@@ -205,6 +247,11 @@ module ApplicationHelper
     image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
     javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
   end
+  
+  def wikitoolbar_for(field_id)
+    return '' unless Setting.text_formatting == 'textile'
+    javascript_include_tag('jstoolbar') + javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.draw();")
+  end
 end
 
 class TabularFormBuilder < ActionView::Helpers::FormBuilder
@@ -219,7 +266,9 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
     src = <<-END_SRC
     def #{selector}(field, options = {}) 
       return super if options.delete :no_label
-      label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
+      label_text = l(options[:label]) if options[:label]
+      label_text ||= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym)
+      label_text << @template.content_tag("span", " *", :class => "required") if options.delete(:required)
       label = @template.content_tag("label", label_text, 
                     :class => (@object && @object.errors[field] ? "error" : nil), 
                     :for => (@object_name.to_s + "_" + field.to_s))

app/helpers/attachments_helper.rb

@@ -0,0 +1,25 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 AttachmentsHelper
+  # displays the links to a collection of attachments
+  def link_to_attachments(attachments, options = {})
+    if attachments.any?
+      render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}
+    end
+  end
+end

app/helpers/boards_helper.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2007  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
@@ -15,10 +15,5 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-class IssueHistory < ActiveRecord::Base
-	belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
-	belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-	belongs_to :issue
-	
-	validates_presence_of :status
+module BoardsHelper
 end

app/helpers/issue_relations_helper.rb

@@ -0,0 +1,23 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 IssueRelationsHelper
+  def collection_for_relation_type_select
+    values = IssueRelation::TYPES
+    values.keys.sort{|x,y| values[x][:order] <=> values[y][:order]}.collect{|k| [l(values[k][:name]), k]}
+  end
+end

app/helpers/messages_helper.rb

@@ -0,0 +1,28 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 MessagesHelper
+
+  def link_to_message(message)
+    return '' unless message
+    link_to h(truncate(message.subject, 60)), :controller => 'messages',
+                                           :action => 'show',
+                                           :board_id => message.board_id,
+                                           :id => message.root,
+                                           :anchor => (message.parent_id ? "message-#{message.id}" : nil)
+  end
+end

app/helpers/projects_helper.rb

@@ -16,14 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module ProjectsHelper
-
-  def highlight_tokens(text, tokens)
-    return text unless tokens && !tokens.empty?
-    regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE    
-    result = ''
-    text.split(regexp).each_with_index do |words, i|
-      result << (i.even? ? (words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words) : content_tag('span', words, :class => 'highlight'))
-    end
-    result
+  def link_to_version(version, options = {})
+    return '' unless version && version.is_a?(Version)
+    link_to version.name, {:controller => 'projects',
+                           :action => 'roadmap',
+                           :id => version.project_id,
+                           :completed => (version.completed? ? 1 : nil),
+                           :anchor => version.name
+                          }, options
   end
 end

app/helpers/reports_helper.rb

@@ -22,7 +22,7 @@ module ReportsHelper
     data.each { |row|
       match = 1
       criteria.each { |k, v|
-        match = 0 unless row[k].to_s == v.to_s
+        match = 0 unless (row[k].to_s == v.to_s) || (k == 'closed' && row[k] == (v == 0 ? "f" : "t"))
       } unless criteria.nil?
       a = a + row["total"].to_i if match == 1
     } unless data.nil?

app/helpers/repositories_helper.rb

@@ -16,4 +16,43 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module RepositoriesHelper
+  def repository_field_tags(form, repository)    
+    method = repository.class.name.demodulize.underscore + "_field_tags"
+    send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method)
+  end
+  
+  def scm_select_tag
+    container = [[]]
+    REDMINE_SUPPORTED_SCM.each {|scm| container << ["Repository::#{scm}".constantize.scm_name, scm]}
+    select_tag('repository_scm', 
+               options_for_select(container, @project.repository.class.name.demodulize),
+               :disabled => (@project.repository && !@project.repository.new_record?),
+               :onchange => remote_function(:update => "repository_fields", :url => { :controller => 'repositories', :action => 'update_form', :id => @project }, :with => "Form.serialize(this.form)")
+               )
+  end
+  
+  def with_leading_slash(path)
+    path ||= ''
+    path.starts_with?("/") ? "/#{path}" : path
+  end
+
+  def subversion_field_tags(form, repository)
+      content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
+                       '<br />(http://, https://, svn://, file:///)') +
+      content_tag('p', form.text_field(:login, :size => 30)) +
+      content_tag('p', form.password_field(:password, :size => 30))
+  end
+
+  def darcs_field_tags(form, repository)
+      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
+  end
+  
+  def mercurial_field_tags(form, repository)
+      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
+  end
+
+  def cvs_field_tags(form, repository)
+      content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
+      content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
+  end
 end

app/helpers/search_helper.rb

@@ -0,0 +1,28 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 SearchHelper
+  def highlight_tokens(text, tokens)
+    return text unless tokens && !tokens.empty?
+    regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE    
+    result = ''
+    text.split(regexp).each_with_index do |words, i|
+      result << (i.even? ? (words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words) : content_tag('span', words, :class => 'highlight'))
+    end
+    result
+  end
+end

app/helpers/timelog_helper.rb

@@ -1,2 +1,30 @@
+# 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 TimelogHelper
+  def select_hours(data, criteria, value)
+    data.select {|row| row[criteria] == value.to_s}
+  end
+  
+  def sum_hours(data)
+    sum = 0
+    data.each do |row|
+      sum += row['hours'].to_f
+    end
+    sum
+  end
 end

app/helpers/watchers_helper.rb

@@ -0,0 +1,36 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 WatchersHelper
+  def watcher_tag(object, user)
+    content_tag("span", watcher_link(object, user), :id => 'watcher')
+  end
+  
+  def watcher_link(object, user)
+    return '' unless user && object.respond_to?('watched_by?')
+    watched = object.watched_by?(user)
+    url = {:controller => 'watchers',
+           :action => (watched ? 'remove' : 'add'),
+           :object_type => object.class.to_s.underscore,
+           :object_id => object.id}           
+    link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)),
+                   {:url => url},
+                   :href => url_for(url),
+                   :class => (watched ? 'icon icon-fav' : 'icon icon-fav-off'))
+  
+  end
+end

app/helpers/wiki_helper.rb

@@ -16,4 +16,41 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module WikiHelper
+
+  def html_diff(wdiff)
+    words = wdiff.words.collect{|word| h(word)}
+    words_add = 0
+    words_del = 0
+    dels = 0
+    del_off = 0
+    wdiff.diff.diffs.each do |diff|
+      add_at = nil
+      add_to = nil
+      del_at = nil
+      deleted = ""	    
+      diff.each do |change|
+        pos = change[1]
+        if change[0] == "+"
+          add_at = pos + dels unless add_at
+          add_to = pos + dels
+          words_add += 1
+        else
+          del_at = pos unless del_at
+          deleted << ' ' + change[2]
+          words_del	 += 1
+        end
+      end
+      if add_at
+        words[add_at] = '<span class="diff_in">' + words[add_at]
+        words[add_to] = words[add_to] + '</span>'
+      end
+      if del_at
+        words.insert del_at - del_off + dels + words_add, '<span class="diff_out">' + deleted + '</span>'
+        dels += 1
+        del_off += words_del
+        words_del = 0
+      end
+    end
+    simple_format_without_paragraph(words.join(' '))
+  end
 end

app/models/attachment.rb

@@ -77,7 +77,11 @@ class Attachment < ActiveRecord::Base
 	def self.most_downloaded
 		find(:all, :limit => 5, :order => "downloads DESC")	
 	end
-	
+
+  def project
+    container.is_a?(Project) ? container : container.project
+  end
+  
 private
   def sanitize_filename(value)
       # get only the filename, not the whole path

app/models/board.rb

@@ -0,0 +1,29 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 Board < ActiveRecord::Base
+  belongs_to :project
+  has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
+  has_many :messages, :dependent => :delete_all, :order => "#{Message.table_name}.created_on DESC"
+  belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
+  acts_as_list :scope => :project_id
+  acts_as_watchable
+  
+  validates_presence_of :name, :description
+  validates_length_of :name, :maximum => 30
+  validates_length_of :description, :maximum => 255
+end

app/models/changeset.rb

@@ -18,13 +18,52 @@
 class Changeset < ActiveRecord::Base
   belongs_to :repository
   has_many :changes, :dependent => :delete_all
+  has_and_belongs_to_many :issues
   
   validates_presence_of :repository_id, :revision, :committed_on, :commit_date
   validates_numericality_of :revision, :only_integer => true
   validates_uniqueness_of :revision, :scope => :repository_id
+  validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
   
   def committed_on=(date)
     self.commit_date = date
     super
   end
+  
+  def after_create
+    scan_comment_for_issue_ids
+  end
+  
+  def scan_comment_for_issue_ids
+    return if comments.blank?
+    # keywords used to reference issues
+    ref_keywords = Setting.commit_ref_keywords.downcase.split(",")
+    # keywords used to fix issues
+    fix_keywords = Setting.commit_fix_keywords.downcase.split(",")
+    # status applied
+    fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
+    
+    kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw.strip)}.join("|")
+    return if kw_regexp.blank?
+    
+    # remove any associated issues
+    self.issues.clear
+    
+    comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
+      action = match[0]
+      target_issue_ids = match[1].scan(/\d+/)
+      target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
+      if fix_status && fix_keywords.include?(action.downcase)
+        # update status of issues
+        logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
+        target_issues.each do |issue|
+          # don't change the status is the issue is already closed
+          next if issue.status.is_closed?
+          issue.status = fix_status
+          issue.save
+        end
+      end
+      self.issues << target_issues
+    end
+  end
 end

app/models/comment.rb

@@ -19,5 +19,5 @@ class Comment < ActiveRecord::Base
   belongs_to :commented, :polymorphic => true, :counter_cache => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
 
-  validates_presence_of :commented, :author, :comment
+  validates_presence_of :commented, :author, :comments
 end

app/models/custom_value.rb

@@ -22,7 +22,7 @@ class CustomValue < ActiveRecord::Base
 protected
   def validate
     errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.empty?    
-    errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.empty? or value =~ Regexp.new(custom_field.regexp)
+    errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
     errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
     errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
     case custom_field.field_format

app/models/issue.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2007  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
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Issue < ActiveRecord::Base
-
   belongs_to :project
   belongs_to :tracker
   belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
@@ -28,10 +27,16 @@ class Issue < ActiveRecord::Base
 
   has_many :journals, :as => :journalized, :dependent => :destroy
   has_many :attachments, :as => :container, :dependent => :destroy
-  has_many :time_entries
+  has_many :time_entries, :dependent => :nullify
   has_many :custom_values, :dependent => :delete_all, :as => :customized
   has_many :custom_fields, :through => :custom_values
-
+  has_and_belongs_to_many :changesets, :order => "revision ASC"
+  
+  has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
+  has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
+  
+  acts_as_watchable
+  
   validates_presence_of :subject, :description, :priority, :tracker, :author, :status
   validates_inclusion_of :done_ratio, :in => 0..100
   validates_associated :custom_values, :on => :update
@@ -49,13 +54,20 @@ class Issue < ActiveRecord::Base
     if self.due_date and self.start_date and self.due_date < self.start_date
       errors.add :due_date, :activerecord_error_greater_than_start_date
     end
+    
+    if start_date && soonest_start && start_date < soonest_start
+      errors.add :start_date, :activerecord_error_invalid
+    end
   end
-
-  #def before_create
-  #  build_history
-  #end
   
-  def before_save
+  def before_create
+    # default assignment based on category
+    if assigned_to.nil? && category && category.assigned_to
+      self.assigned_to = category.assigned_to
+    end
+  end
+  
+  def before_save  
     if @current_journal
       # attributes changes
       (Issue.column_names - %w(id description)).each {|c|
@@ -75,8 +87,8 @@ class Issue < ActiveRecord::Base
     end
   end
   
-  def long_id
-    "%05d" % self.id
+  def after_save
+    relations_from.each(&:set_issue_to_dates)
   end
   
   def custom_value_for(custom_field)
@@ -95,12 +107,25 @@ class Issue < ActiveRecord::Base
   def spent_hours
     @spent_hours ||= time_entries.sum(:hours) || 0
   end
-
-private
-  # Creates an history for the issue
-  #def build_history
-  #  @history = self.histories.build
-  #  @history.status = self.status
-  #  @history.author = self.author
-  #end
+  
+  def relations
+    (relations_from + relations_to).sort
+  end
+  
+  def all_dependent_issues
+    dependencies = []
+    relations_from.each do |relation|
+      dependencies << relation.issue_to
+      dependencies += relation.issue_to.all_dependent_issues
+    end
+    dependencies
+  end
+  
+  def duration
+    (start_date && due_date) ? due_date - start_date : 0
+  end
+  
+  def soonest_start
+    @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min
+  end
 end

app/models/issue_category.rb

@@ -18,6 +18,7 @@
 class IssueCategory < ActiveRecord::Base
   before_destroy :check_integrity  
   belongs_to :project
+  belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
 
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [:project_id]

app/models/issue_relation.rb

@@ -0,0 +1,79 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 IssueRelation < ActiveRecord::Base
+  belongs_to :issue_from, :class_name => 'Issue', :foreign_key => 'issue_from_id'
+  belongs_to :issue_to, :class_name => 'Issue', :foreign_key => 'issue_to_id'
+  
+  TYPE_RELATES      = "relates"
+  TYPE_DUPLICATES   = "duplicates"
+  TYPE_BLOCKS       = "blocks"
+  TYPE_PRECEDES     = "precedes"
+  
+  TYPES = { TYPE_RELATES =>     { :name => :label_relates_to, :sym_name => :label_relates_to, :order => 1 },
+            TYPE_DUPLICATES =>  { :name => :label_duplicates, :sym_name => :label_duplicates, :order => 2 },
+            TYPE_BLOCKS =>      { :name => :label_blocks, :sym_name => :label_blocked_by, :order => 3 },
+            TYPE_PRECEDES =>    { :name => :label_precedes, :sym_name => :label_follows, :order => 4 },
+          }.freeze
+  
+  validates_presence_of :issue_from, :issue_to, :relation_type
+  validates_inclusion_of :relation_type, :in => TYPES.keys
+  validates_numericality_of :delay, :allow_nil => true
+  validates_uniqueness_of :issue_to_id, :scope => :issue_from_id
+  
+  def validate
+    if issue_from && issue_to
+      errors.add :issue_to_id, :activerecord_error_invalid if issue_from_id == issue_to_id
+      errors.add :issue_to_id, :activerecord_error_not_same_project unless issue_from.project_id == issue_to.project_id
+      errors.add_to_base :activerecord_error_circular_dependency if issue_to.all_dependent_issues.include? issue_from
+    end
+  end
+  
+  def other_issue(issue)
+    (self.issue_from_id == issue.id) ? issue_to : issue_from
+  end
+  
+  def label_for(issue)
+    TYPES[relation_type] ? TYPES[relation_type][(self.issue_from_id == issue.id) ? :name : :sym_name] : :unknow
+  end
+  
+  def before_save
+    if TYPE_PRECEDES == relation_type
+      self.delay ||= 0
+    else
+      self.delay = nil
+    end
+    set_issue_to_dates
+  end
+  
+  def set_issue_to_dates
+    soonest_start = self.successor_soonest_start
+    if soonest_start && (!issue_to.start_date || issue_to.start_date < soonest_start)
+      issue_to.start_date, issue_to.due_date = successor_soonest_start, successor_soonest_start + issue_to.duration
+      issue_to.save
+    end
+  end
+  
+  def successor_soonest_start
+    return nil unless (TYPE_PRECEDES == self.relation_type) && (issue_from.start_date || issue_from.due_date)
+    (issue_from.due_date || issue_from.start_date) + 1 + delay
+  end
+  
+  def <=>(relation)
+    TYPES[self.relation_type][:order] <=> TYPES[relation.relation_type][:order]
+  end
+end

app/models/issue_status.rb

@@ -17,7 +17,7 @@
 
 class IssueStatus < ActiveRecord::Base
   before_destroy :check_integrity  
-  has_many :workflows, :foreign_key => "old_status_id"
+  has_many :workflows, :foreign_key => "old_status_id", :dependent => :delete_all
   acts_as_list
 
   validates_presence_of :name
@@ -38,19 +38,17 @@ class IssueStatus < ActiveRecord::Base
   # Returns an array of all statuses the given role can switch to
   # Uses association cache when called more than one time
   def new_statuses_allowed_to(role, tracker)
-    new_statuses = [self]
-    new_statuses += workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker
-    new_statuses.sort{|x, y| x.position <=> y.position }
+    new_statuses = workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker
+    new_statuses ? new_statuses.compact.sort{|x, y| x.position <=> y.position } : []
   end
   
   # Same thing as above but uses a database query
   # More efficient than the previous method if called just once
   def find_new_statuses_allowed_to(role, tracker)  
-    new_statuses = [self]
-    new_statuses += workflows.find(:all, 
+    new_statuses = workflows.find(:all, 
                                    :include => :new_status,
-                                   :conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status }  if role && tracker
-    new_statuses.sort{|x, y| x.position <=> y.position }
+                                   :conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status }.compact  if role && tracker
+    new_statuses ? new_statuses.sort{|x, y| x.position <=> y.position } : []
   end
   
 private

app/models/journal_detail.rb

@@ -17,4 +17,9 @@
 
 class JournalDetail < ActiveRecord::Base
   belongs_to :journal
+  
+  def before_save
+    self.value = value[0..254] if value && value.is_a?(String)
+    self.old_value = old_value[0..254] if old_value && old_value.is_a?(String)
+  end
 end

app/models/mail_handler.rb

@@ -0,0 +1,40 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 MailHandler < ActionMailer::Base
+  
+  # Processes incoming emails
+  # Currently, it only supports adding a note to an existing issue
+  # by replying to the initial notification message
+  def receive(email)
+    # find related issue by parsing the subject
+    m = email.subject.match %r{\[.*#(\d+)\]}
+    return unless m
+    issue = Issue.find_by_id(m[1])
+    return unless issue
+    
+    # find user
+    user = User.find_active(:first, :conditions => {:mail => email.from.first})
+    return unless user
+    # check permission
+    return unless Permission.allowed_to_role("issues/add_note", user.role_for_project(issue.project))
+    
+    # add the note
+    issue.init_journal(user, email.body.chomp)
+    issue.save
+  end
+end

app/models/mailer.rb

@@ -17,11 +17,24 @@
 
 class Mailer < ActionMailer::Base
   helper IssuesHelper
+  
+  def account_information(user, password)
+    set_language_if_valid user.language
+    recipients user.mail
+    from Setting.mail_from
+    subject l(:mail_subject_register)
+    body :user => user, :password => password
+  end
 
   def issue_add(issue)
     set_language_if_valid(Setting.default_language)
     # Sends to all project members
     @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }.compact
+    # Sends to author and assignee (even if they turned off mail notification)
+    @recipients     << issue.author.mail if issue.author
+    @recipients     << issue.assigned_to.mail if issue.assigned_to
+    @recipients.compact!
+    @recipients.uniq!
     @from           = Setting.mail_from
     @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
     @body['issue']  = issue
@@ -31,7 +44,14 @@ class Mailer < ActionMailer::Base
     set_language_if_valid(Setting.default_language)
     # Sends to all project members
     issue = journal.journalized
-    @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }.compact
+    @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }
+    # Sends to author and assignee (even if they turned off mail notification)
+    @recipients     << issue.author.mail if issue.author
+    @recipients     << issue.assigned_to.mail if issue.assigned_to
+    @recipients.compact!
+    @recipients.uniq!
+    # Watchers in cc
+    @cc             = issue.watcher_recipients - @recipients
     @from           = Setting.mail_from
     @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
     @body['issue']  = issue
@@ -85,4 +105,12 @@ class Mailer < ActionMailer::Base
     @subject        = l(:mail_subject_register)
     @body['token']  = token
   end
+  
+  def message_posted(message, recipients)
+    set_language_if_valid(Setting.default_language)
+    @recipients     = recipients
+    @from           = Setting.mail_from
+    @subject        = "[#{message.board.project.name} - #{message.board.name}] #{message.subject}"
+    @body['message'] = message
+  end
 end

app/models/member.rb

@@ -24,6 +24,11 @@ class Member < ActiveRecord::Base
   validates_uniqueness_of :user_id, :scope => :project_id
 
   def name
-    self.user.display_name
+    self.user.name
+  end
+  
+  def before_destroy
+    # remove category based auto assignments for this member
+    project.issue_categories.update_all "assigned_to_id = NULL", ["assigned_to_id = ?", self.user.id]
   end
 end

app/models/message.rb

@@ -0,0 +1,41 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 Message < ActiveRecord::Base
+  belongs_to :board
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+  acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
+  has_many :attachments, :as => :container, :dependent => :destroy
+  belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
+  
+  validates_presence_of :subject, :content
+  validates_length_of :subject, :maximum => 255
+  
+  def after_create
+    board.update_attribute(:last_message_id, self.id)
+    board.increment! :messages_count
+    if parent
+      parent.reload.update_attribute(:last_reply_id, self.id)
+    else
+      board.increment! :topics_count
+    end
+  end
+  
+  def project
+    board.project
+  end
+end

app/models/message_observer.rb

@@ -0,0 +1,24 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 MessageObserver < ActiveRecord::Observer
+  def after_create(message)
+    # send notification to board watchers
+    recipients = message.board.watcher_recipients
+    Mailer.deliver_message_posted(message, recipients) unless recipients.empty?
+  end
+end

app/models/permission.rb

@@ -31,7 +31,9 @@ class Permission < ActiveRecord::Base
     1200 => :label_document_plural,
     1300 => :label_attachment_plural,
     1400 => :label_repository,
-    1500 => :label_time_tracking
+    1500 => :label_time_tracking,
+    1700 => :label_wiki_page_plural,
+    2000 => :label_board_plural
   }.freeze
   
   @@cached_perms_for_public = nil

app/models/project.rb

@@ -16,21 +16,28 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Project < ActiveRecord::Base
-  has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
+  # Project statuses
+  STATUS_ACTIVE     = 1
+  STATUS_ARCHIVED   = 9
+  
   has_many :members, :dependent => :delete_all, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
   has_many :users, :through => :members
   has_many :custom_values, :dependent => :delete_all, :as => :customized
   has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
+  has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
   has_many :time_entries, :dependent => :delete_all
   has_many :queries, :dependent => :delete_all
   has_many :documents, :dependent => :destroy
   has_many :news, :dependent => :delete_all, :include => :author
   has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
+  has_many :boards, :order => "position ASC"
   has_one :repository, :dependent => :destroy
   has_one :wiki, :dependent => :destroy
   has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
   acts_as_tree :order => "name", :counter_cache => true
   
+  attr_protected :status
+  
   validates_presence_of :name, :description, :identifier
   validates_uniqueness_of :name, :identifier
   validates_associated :custom_values, :on => :update
@@ -51,12 +58,11 @@ class Project < ActiveRecord::Base
   
   def issues_with_subprojects(include_subprojects=false)
     conditions = nil
-    if include_subprojects && children.size > 0
-      ids = [id] + children.collect {|c| c.id}
+    if include_subprojects && !active_children.empty?
+      ids = [id] + active_children.collect {|c| c.id}
       conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
-    else
-      conditions = ["#{Issue.table_name}.project_id = ?", id]
     end
+    conditions ||= ["#{Issue.table_name}.project_id = ?", id]
     Issue.with_scope :find => { :conditions => conditions } do 
       yield
     end 
@@ -69,13 +75,36 @@ class Project < ActiveRecord::Base
   end	
 
   def self.visible_by(user=nil)
-    if user && !user.memberships.empty?
-      return ["#{Project.table_name}.is_public = ? or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')})", true]
+    if user && user.admin?
+      return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
+    elsif user && user.memberships.any?
+      return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = ? or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))", true]
     else
-      return ["#{Project.table_name}.is_public = ?", true]
+      return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = ?", true]
     end
   end
   
+  def active?
+    self.status == STATUS_ACTIVE
+  end
+  
+  def archive
+    # Archive subprojects if any
+    children.each do |subproject|
+      subproject.archive
+    end
+    update_attribute :status, STATUS_ARCHIVED
+  end
+  
+  def unarchive
+    return false if parent && !parent.active?
+    update_attribute :status, STATUS_ACTIVE
+  end
+  
+  def active_children
+    children.select {|child| child.active?}
+  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(tracker)

app/models/query.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2007  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
@@ -21,6 +21,7 @@ class Query < ActiveRecord::Base
   serialize :filters
   
   attr_protected :project, :user
+  attr_accessor :executed_by
   
   validates_presence_of :name, :on => :save
     
@@ -48,6 +49,7 @@ class Query < ActiveRecord::Base
                                  :list_one_or_more => [ "*", "=" ],
                                  :date => [ "<t+", ">t+", "t+", "t", ">t-", "<t-", "t-" ],
                                  :date_past => [ ">t-", "<t-", "t-", "t" ],
+                                 :string => [ "=", "~", "!", "!~" ],
                                  :text => [  "~", "!~" ] }
 
   cattr_reader :operators_by_filter_type
@@ -55,12 +57,16 @@ class Query < ActiveRecord::Base
   def initialize(attributes = nil)
     super attributes
     self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
-    self.is_public = true
+  end
+  
+  def executed_by=(user)
+    @executed_by = user
+    set_language_if_valid(user.language) if user
   end
   
   def validate
     filters.each_key do |field|
-      errors.add field.gsub(/\_id$/, ""), :activerecord_error_blank unless 
+      errors.add label_for(field), :activerecord_error_blank unless 
           # filter requires one or more values
           (values_for(field) and !values_for(field).first.empty?) or 
           # filter doesn't require any value
@@ -68,6 +74,12 @@ class Query < ActiveRecord::Base
     end if filters
   end
   
+  def editable_by?(user)
+    return false unless user
+    return true if !is_public && self.user_id == user.id
+    is_public && user.authorized_to(project, "projects/add_query")
+  end
+  
   def available_filters
     return @available_filters if @available_filters
     @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },       
@@ -80,12 +92,31 @@ class Query < ActiveRecord::Base
                            "due_date" => { :type => :date, :order => 12 } }                          
     unless project.nil?
       # project specific filters
-      @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }  
-      @available_filters["author_id"] = { :type => :list, :order => 5, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }  
+      user_values = []
+      user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
+      user_values += @project.users.collect{|s| [s.name, s.id.to_s] }
+      
+      @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values }  
+      @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values }  
       @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
-      @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.collect{|s| [s.name, s.id.to_s] } }
-      unless @project.children.empty?
-        @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.children.collect{|s| [s.name, s.id.to_s] } }
+      @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
+      unless @project.active_children.empty?
+        @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
+      end
+      @project.all_custom_fields.select(&:is_filter?).each do |field|
+        case field.field_format
+        when "string", "int"
+          options = { :type => :string, :order => 20 }
+        when "text"
+          options = { :type => :text, :order => 20 }
+        when "list"
+          options = { :type => :list_optional, :values => field.possible_values, :order => 20}
+        when "date"
+          options = { :type => :date, :order => 20 }
+        when "bool"
+          options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
+        end          
+        @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
       end
       # remove category filter if no category defined
       @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?
@@ -126,6 +157,11 @@ class Query < ActiveRecord::Base
     has_filter?(field) ? filters[field][:values] : nil
   end
   
+  def label_for(field)
+    label = @available_filters[field][:name] if @available_filters.has_key?(field)
+    label ||= field.gsub(/\_id$/, "")
+  end
+  
   def statement
     sql = "1=1"
     if has_filter?("subproject_id")
@@ -133,7 +169,7 @@ class Query < ActiveRecord::Base
       if operator_for("subproject_id") == "="
         subproject_ids = values_for("subproject_id").each(&:to_i)
       else
-        subproject_ids = project.children.collect{|p| p.id}
+        subproject_ids = project.active_children.collect{|p| p.id}
       end
       sql << " AND #{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
     else
@@ -141,41 +177,62 @@ class Query < ActiveRecord::Base
     end
     filters.each_key do |field|
       next if field == "subproject_id"
-      v = values_for field
-      next unless v and !v.empty?  
+      v = values_for(field).clone
+      next unless v and !v.empty?
+        
       sql = sql + " AND " unless sql.empty?      
+      sql << "("
+      
+      if field =~ /^cf_(\d+)$/
+        # custom field
+        db_table = CustomValue.table_name
+        db_field = "value"
+        sql << "#{db_table}.custom_field_id = #{$1} AND "
+      else
+        # regular field
+        db_table = Issue.table_name
+        db_field = field
+      end
+      
+      # "me" value subsitution
+      if %w(assigned_to_id author_id).include?(field)
+        v.push(executed_by ? executed_by.id.to_s : "0") if v.delete("me")
+      end
+      
       case operator_for field
       when "="
-        sql = sql + "#{Issue.table_name}.#{field} IN (" + v.each(&:to_i).join(",") + ")"
+        sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
       when "!"
-        sql = sql + "#{Issue.table_name}.#{field} NOT IN (" + v.each(&:to_i).join(",") + ")"
+        sql = sql + "#{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
       when "!*"
-        sql = sql + "#{Issue.table_name}.#{field} IS NULL"
+        sql = sql + "#{db_table}.#{db_field} IS NULL"
       when "*"
-        sql = sql + "#{Issue.table_name}.#{field} IS NOT NULL"
+        sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
       when "o"
         sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
       when "c"
         sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
       when ">t-"
-        sql = sql + "#{Issue.table_name}.#{field} >= '%s'" % connection.quoted_date(Date.today - v.first.to_i)
+        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today + 1).to_time)]
       when "<t-"
-        sql = sql + "#{Issue.table_name}.#{field} <= '" + (Date.today - v.first.to_i).strftime("%Y-%m-%d") + "'"
+        sql = sql + "#{db_table}.#{db_field} <= '%s'" % connection.quoted_date((Date.today - v.first.to_i).to_time)
       when "t-"
-        sql = sql + "#{Issue.table_name}.#{field} = '" + (Date.today - v.first.to_i).strftime("%Y-%m-%d") + "'"
+        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today - v.first.to_i + 1).to_time)]
       when ">t+"
-        sql = sql + "#{Issue.table_name}.#{field} >= '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
+        sql = sql + "#{db_table}.#{db_field} >= '%s'" % connection.quoted_date((Date.today + v.first.to_i).to_time)
       when "<t+"
-        sql = sql + "#{Issue.table_name}.#{field} <= '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
+        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
       when "t+"
-        sql = sql + "#{Issue.table_name}.#{field} = '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
+        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today + v.first.to_i).to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
       when "t"
-        sql = sql + "#{Issue.table_name}.#{field} = '%s'" % connection.quoted_date(Date.today)
+        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today+1).to_time)]
       when "~"
-        sql = sql + "#{Issue.table_name}.#{field} LIKE '%#{connection.quote_string(v.first)}%'"
+        sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
       when "!~"
-        sql = sql + "#{Issue.table_name}.#{field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
+        sql = sql + "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
       end
+      sql << ")"
+      
     end if filters and valid?
     sql
   end

app/models/repository.rb

@@ -17,66 +17,37 @@
 
 class Repository < ActiveRecord::Base
   belongs_to :project
-  has_many :changesets, :dependent => :destroy, :order => 'revision DESC'
+  has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.revision DESC"
   has_many :changes, :through => :changesets
-  has_one  :latest_changeset, :class_name => 'Changeset', :foreign_key => :repository_id, :order => 'revision DESC'
-  
-  attr_protected :root_url
-  
-  validates_presence_of :url
-  validates_format_of :url, :with => /^(http|https|svn|file):\/\/.+/i
     
   def scm
-    @scm ||= SvnRepos::Base.new url, root_url, login, password
+    @scm ||= self.scm_adapter.new url, root_url, login, password
     update_attribute(:root_url, @scm.root_url) if root_url.blank?
     @scm
   end
   
-  def url=(str)
-    super if root_url.blank?
+  def scm_name
+    self.class.scm_name
   end
   
-  def changesets_with_path(path="")
-    path = "/#{path}%"
-    path = url.gsub(/^#{root_url}/, '') + path if root_url && root_url != url
-    path.squeeze!("/")
-    Changeset.with_scope(:find => { :include => :changes, :conditions => ["#{Change.table_name}.path LIKE ?", path] }) do 
-      yield
-    end 
+  def supports_cat?
+    scm.supports_cat?
   end
   
-  def fetch_changesets
-    scm_info = scm.info
-    if scm_info
-      lastrev_identifier = scm_info.lastrev.identifier.to_i
-      if latest_changeset.nil? || latest_changeset.revision < lastrev_identifier
-        logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
-        identifier_from = latest_changeset ? latest_changeset.revision + 1 : 1
-        while (identifier_from <= lastrev_identifier)
-          # loads changesets by batches of 200
-          identifier_to = [identifier_from + 199, lastrev_identifier].min
-          revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
-          transaction do
-            revisions.reverse_each do |revision|
-              changeset = Changeset.create(:repository => self,
-                                           :revision => revision.identifier, 
-                                           :committer => revision.author, 
-                                           :committed_on => revision.time,
-                                           :comment => revision.message)
-              
-              revision.paths.each do |change|
-                Change.create(:changeset => changeset,
-                              :action => change[:action],
-                              :path => change[:path],
-                              :from_path => change[:from_path],
-                              :from_revision => change[:from_revision])
-              end
-            end
-          end unless revisions.nil?
-          identifier_from = identifier_to + 1
-        end
-      end
-    end
+  def entries(path=nil, identifier=nil)
+    scm.entries(path, identifier)
+  end
+  
+  def diff(path, rev, rev_to, type)
+    scm.diff(path, rev, rev_to, type)
+  end
+  
+  def latest_changeset
+    @latest_changeset ||= changesets.find(:first)
+  end
+    
+  def scan_changesets_for_issue_ids
+    self.changesets.each(&:scan_comment_for_issue_ids)
   end
   
   # fetch new changesets for all repositories
@@ -85,4 +56,24 @@ class Repository < ActiveRecord::Base
   def self.fetch_changesets
     find(:all).each(&:fetch_changesets)
   end
+  
+  # scan changeset comments to find related and fixed issues for all repositories
+  def self.scan_changesets_for_issue_ids
+    find(:all).each(&:scan_changesets_for_issue_ids)
+  end
+
+  def self.scm_name
+    'Abstract'
+  end
+  
+  def self.available_scm
+    subclasses.collect {|klass| [klass.scm_name, klass.name]}
+  end
+  
+  def self.factory(klass_name, *args)
+    klass = "Repository::#{klass_name}".constantize
+    klass.new(*args)
+  rescue
+    nil
+  end
 end

app/models/repository/cvs.rb

@@ -0,0 +1,150 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 'redmine/scm/adapters/cvs_adapter'
+require 'digest/sha1'
+
+class Repository::Cvs < Repository
+  validates_presence_of :url, :root_url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::CvsAdapter
+  end
+  
+  def self.scm_name
+    'CVS'
+  end
+  
+  def entry(path, identifier)
+    e = entries(path, identifier)
+    e ? e.first : nil
+  end
+  
+  def entries(path=nil, identifier=nil)
+    entries=scm.entries(path, identifier)
+    if entries
+      entries.each() do |entry|
+        unless entry.lastrev.nil? || entry.lastrev.identifier
+          change=changes.find_by_revision_and_path( entry.lastrev.revision, scm.with_leading_slash(entry.path) )
+          if change
+            entry.lastrev.identifier=change.changeset.revision
+            entry.lastrev.author=change.changeset.committer
+            entry.lastrev.revision=change.revision
+            entry.lastrev.branch=change.branch
+          end
+        end
+      end
+    end
+    entries
+  end
+  
+  def diff(path, rev, rev_to, type)
+    #convert rev to revision. CVS can't handle changesets here
+    diff=[]
+    changeset_from=changesets.find_by_revision(rev)
+    if rev_to.to_i > 0 
+      changeset_to=changesets.find_by_revision(rev_to)
+    end
+    changeset_from.changes.each() do |change_from|
+      
+      revision_from=nil
+      revision_to=nil      
+      
+      revision_from=change_from.revision if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
+      
+      if revision_from
+        if changeset_to
+          changeset_to.changes.each() do |change_to|
+            revision_to=change_to.revision if change_to.path==change_from.path 
+          end
+        end
+        unless revision_to
+          revision_to=scm.get_previous_revision(revision_from)
+        end
+        diff=diff+scm.diff(change_from.path, revision_from, revision_to, type)
+      end
+    end
+    return diff
+  end
+  
+  def fetch_changesets
+    #not the preferred way with CVS. maybe we should introduce always a cron-job for this
+    last_commit = changesets.maximum(:committed_on)
+    
+    # some nifty bits to introduce a commit-id with cvs
+    # natively cvs doesn't provide any kind of changesets, there is only a revision per file.
+    # we now take a guess using the author, the commitlog and the commit-date.
+    
+    # last one is the next step to take. the commit-date is not equal for all 
+    # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
+    # we use a small delta here, to merge all changes belonging to _one_ changeset
+    time_delta=10.seconds
+    
+    transaction do
+      scm.revisions('', last_commit, nil, :with_paths => true) do |revision|
+        # only add the change to the database, if it doen't exists. the cvs log
+        # is not exclusive at all. 
+        unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
+          revision
+          cs=Changeset.find(:first, :conditions=>{
+            :committed_on=>revision.time-time_delta..revision.time+time_delta,
+            :committer=>revision.author,
+            :comments=>revision.message
+          })
+        
+          # create a new changeset.... 
+          unless cs 
+            # we use a negative changeset-number here (just for inserting)
+            # later on, we calculate a continous positive number
+            next_rev = changesets.minimum(:revision)            
+            next_rev = 0 if next_rev.nil? or next_rev > 0 
+            next_rev = next_rev - 1
+            
+            cs=Changeset.create(:repository => self,
+            :revision => next_rev, 
+            :committer => revision.author, 
+            :committed_on => revision.time,
+            :comments => revision.message)
+          end
+        
+          #convert CVS-File-States to internal Action-abbrevations
+          #default action is (M)odified
+          action="M"
+          if revision.paths[0][:action]=="Exp" && revision.paths[0][:revision]=="1.1"
+            action="A" #add-action always at first revision (= 1.1)
+          elsif revision.paths[0][:action]=="dead"
+            action="D" #dead-state is similar to Delete
+          end
+        
+          Change.create(:changeset => cs,
+          :action => action,
+          :path => scm.with_leading_slash(revision.paths[0][:path]),
+          :revision => revision.paths[0][:revision],
+          :branch => revision.paths[0][:branch]
+          )
+        end
+      end
+      
+      next_rev = [changesets.maximum(:revision) || 0, 0].max
+      changesets.find(:all, :conditions=>["revision < 0"], :order=>"committed_on ASC").each() do |changeset|
+        next_rev = next_rev + 1
+        changeset.revision = next_rev
+        changeset.save!
+      end
+    end
+  end
+end

app/models/repository/darcs.rb

@@ -0,0 +1,90 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 'redmine/scm/adapters/darcs_adapter'
+
+class Repository::Darcs < Repository
+  validates_presence_of :url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::DarcsAdapter
+  end
+  
+  def self.scm_name
+    'Darcs'
+  end
+  
+  def entries(path=nil, identifier=nil)
+    entries=scm.entries(path, identifier)
+    if entries
+      entries.each do |entry|
+        # Search the DB for the entry's last change
+        changeset = changesets.find_by_scmid(entry.lastrev.scmid) if entry.lastrev && !entry.lastrev.scmid.blank?
+        if changeset
+          entry.lastrev.identifier = changeset.revision
+          entry.lastrev.name = changeset.revision
+          entry.lastrev.time = changeset.committed_on
+          entry.lastrev.author = changeset.committer
+        end
+      end
+    end
+    entries
+  end
+  
+  def diff(path, rev, rev_to, type)
+    patch_from = changesets.find_by_revision(rev)
+    patch_to = changesets.find_by_revision(rev_to) if rev_to
+    if path.blank?
+      path = patch_from.changes.collect{|change| change.path}.join(' ')
+    end
+    scm.diff(path, patch_from.scmid, patch_to.scmid, type)
+  end
+  
+  def fetch_changesets
+    scm_info = scm.info
+    if scm_info
+      db_last_id = latest_changeset ? latest_changeset.scmid : nil
+      next_rev = latest_changeset ? latest_changeset.revision + 1 : 1      
+      # latest revision in the repository
+      scm_revision = scm_info.lastrev.scmid      
+      unless changesets.find_by_scmid(scm_revision)
+        revisions = scm.revisions('', db_last_id, nil, :with_path => true)
+        transaction do
+          revisions.reverse_each do |revision|
+            changeset = Changeset.create(:repository => self,
+                                         :revision => next_rev,
+                                         :scmid => revision.scmid,
+                                         :committer => revision.author, 
+                                         :committed_on => revision.time,
+                                         :comments => revision.message)
+            
+            next if changeset.new_record?
+            
+            revision.paths.each do |change|
+              Change.create(:changeset => changeset,
+                            :action => change[:action],
+                            :path => change[:path],
+                            :from_path => change[:from_path],
+                            :from_revision => change[:from_revision])
+            end
+            next_rev += 1
+          end if revisions
+        end
+      end
+    end
+  end
+end

app/models/repository/mercurial.rb

@@ -0,0 +1,81 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 'redmine/scm/adapters/mercurial_adapter'
+
+class Repository::Mercurial < Repository
+  attr_protected :root_url
+  validates_presence_of :url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::MercurialAdapter
+  end
+  
+  def self.scm_name
+    'Mercurial'
+  end
+  
+  def entries(path=nil, identifier=nil)
+    entries=scm.entries(path, identifier)
+    if entries
+      entries.each do |entry|
+        next unless entry.is_file?
+        # Search the DB for the entry's last change
+        change = changes.find(:first, :conditions => ["path = ?", scm.with_leading_slash(entry.path)], :order => "#{Changeset.table_name}.committed_on DESC")
+        if change
+          entry.lastrev.identifier = change.changeset.revision
+          entry.lastrev.name = change.changeset.revision
+          entry.lastrev.author = change.changeset.committer
+          entry.lastrev.revision = change.revision
+        end
+      end
+    end
+    entries
+  end
+
+  def fetch_changesets
+    scm_info = scm.info
+    if scm_info
+      # latest revision found in database
+      db_revision = latest_changeset ? latest_changeset.revision : nil
+      # latest revision in the repository
+      scm_revision = scm_info.lastrev.identifier.to_i
+      
+      unless changesets.find_by_revision(scm_revision)
+        revisions = scm.revisions('', db_revision, nil)
+        transaction do
+          revisions.reverse_each do |revision|
+            changeset = Changeset.create(:repository => self,
+                                         :revision => revision.identifier,
+                                         :scmid => revision.scmid,
+                                         :committer => revision.author, 
+                                         :committed_on => revision.time,
+                                         :comments => revision.message)
+            
+            revision.paths.each do |change|
+              Change.create(:changeset => changeset,
+                            :action => change[:action],
+                            :path => change[:path],
+                            :from_path => change[:from_path],
+                            :from_revision => change[:from_revision])
+            end
+          end
+        end
+      end
+    end
+  end
+end

app/models/repository/subversion.rb

@@ -0,0 +1,69 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 'redmine/scm/adapters/subversion_adapter'
+
+class Repository::Subversion < Repository
+  attr_protected :root_url
+  validates_presence_of :url
+  validates_format_of :url, :with => /^(http|https|svn|file):\/\/.+/i
+
+  def scm_adapter
+    Redmine::Scm::Adapters::SubversionAdapter
+  end
+  
+  def self.scm_name
+    'Subversion'
+  end
+
+  def fetch_changesets
+    scm_info = scm.info
+    if scm_info
+      # latest revision found in database
+      db_revision = latest_changeset ? latest_changeset.revision : 0
+      # latest revision in the repository
+      scm_revision = scm_info.lastrev.identifier.to_i
+      if db_revision < scm_revision
+        logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
+        identifier_from = db_revision + 1
+        while (identifier_from <= scm_revision)
+          # loads changesets by batches of 200
+          identifier_to = [identifier_from + 199, scm_revision].min
+          revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
+          transaction do
+            revisions.reverse_each do |revision|
+              changeset = Changeset.create(:repository => self,
+                                           :revision => revision.identifier, 
+                                           :committer => revision.author, 
+                                           :committed_on => revision.time,
+                                           :comments => revision.message)
+              
+              revision.paths.each do |change|
+                Change.create(:changeset => changeset,
+                              :action => change[:action],
+                              :path => change[:path],
+                              :from_path => change[:from_path],
+                              :from_revision => change[:from_revision])
+              end
+            end
+          end unless revisions.nil?
+          identifier_from = identifier_to + 1
+        end
+      end
+    end
+  end
+end

app/models/setting.rb

@@ -49,7 +49,7 @@ class Setting < ActiveRecord::Base
     end
 
     def self.#{name}?
-      self[:#{name}].to_s == "1"
+      self[:#{name}].to_i > 0
     end
 
     def self.#{name}=(value)

app/models/svn_repos.rb

@@ -1,431 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  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 'rexml/document'
-require 'cgi'
-
-module SvnRepos
-
-  class CommandFailed < StandardError #:nodoc:
-  end
-
-  class Base
-        
-    def initialize(url, root_url=nil, login=nil, password=nil)
-      @url = url
-      @login = login if login && !login.empty?
-      @password = (password || "") if @login    
-      @root_url = root_url.blank? ? retrieve_root_url : root_url
-    end
-    
-    def root_url
-      @root_url
-    end
-    
-    def url
-      @url
-    end
-
-    # get info about the svn repository
-    def info
-      cmd = "svn info --xml #{target('')}"
-      cmd << " --username #{@login} --password #{@password}" if @login
-      info = nil
-      shellout(cmd) do |io|
-        begin
-          doc = REXML::Document.new(io)
-          #root_url = doc.elements["info/entry/repository/root"].text          
-          info = Info.new({:root_url => doc.elements["info/entry/repository/root"].text,
-                           :lastrev => Revision.new({
-                             :identifier => doc.elements["info/entry/commit"].attributes['revision'],
-                             :time => Time.parse(doc.elements["info/entry/commit/date"].text),
-                             :author => (doc.elements["info/entry/commit/author"] ? doc.elements["info/entry/commit/author"].text : "")
-                           })
-                         })
-        rescue
-        end
-      end
-      return nil if $? && $?.exitstatus != 0
-      info
-    rescue Errno::ENOENT => e
-      return nil
-    end
-    
-    # Returns the entry identified by path and revision identifier
-    # or nil if entry doesn't exist in the repository
-    def entry(path=nil, identifier=nil)
-      e = entries(path, identifier)
-      e ? e.first : nil
-    end
-    
-    # Returns an Entries collection
-    # or nil if the given path doesn't exist in the repository
-    def entries(path=nil, identifier=nil)
-      path ||= ''
-      identifier = 'HEAD' unless identifier and identifier > 0
-      entries = Entries.new
-      cmd = "svn list --xml #{target(path)}@#{identifier}"
-      cmd << " --username #{@login} --password #{@password}" if @login
-      shellout(cmd) do |io|
-        begin
-          doc = REXML::Document.new(io)
-          doc.elements.each("lists/list/entry") do |entry|
-            entries << Entry.new({:name => entry.elements['name'].text,
-                        :path => ((path.empty? ? "" : "#{path}/") + entry.elements['name'].text),
-                        :kind => entry.attributes['kind'],
-                        :size => (entry.elements['size'] and entry.elements['size'].text).to_i,
-                        :lastrev => Revision.new({
-                          :identifier => entry.elements['commit'].attributes['revision'],
-                          :time => Time.parse(entry.elements['commit'].elements['date'].text),
-                          :author => (entry.elements['commit'].elements['author'] ? entry.elements['commit'].elements['author'].text : "")
-                          })
-                        })
-          end
-        rescue
-        end
-      end
-      return nil if $? && $?.exitstatus != 0
-      entries.sort_by_name
-    rescue Errno::ENOENT => e
-      raise CommandFailed
-    end
-
-    def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
-      path ||= ''
-      identifier_from = 'HEAD' unless identifier_from and identifier_from.to_i > 0
-      identifier_to = 1 unless identifier_to and identifier_to.to_i > 0
-      revisions = Revisions.new
-      cmd = "svn log --xml -r #{identifier_from}:#{identifier_to}"
-      cmd << " --username #{@login} --password #{@password}" if @login
-      cmd << " --verbose " if  options[:with_paths]
-      cmd << target(path)
-      shellout(cmd) do |io|
-        begin
-          doc = REXML::Document.new(io)
-          doc.elements.each("log/logentry") do |logentry|
-            paths = []
-            logentry.elements.each("paths/path") do |path|
-              paths << {:action => path.attributes['action'],
-                        :path => path.text,
-                        :from_path => path.attributes['copyfrom-path'],
-                        :from_revision => path.attributes['copyfrom-rev']
-                        }
-            end
-            paths.sort! { |x,y| x[:path] <=> y[:path] }
-            
-            revisions << Revision.new({:identifier => logentry.attributes['revision'],
-                          :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
-                          :time => Time.parse(logentry.elements['date'].text),
-                          :message => logentry.elements['msg'].text,
-                          :paths => paths
-                        })
-          end
-        rescue
-        end
-      end
-      return nil if $? && $?.exitstatus != 0
-      revisions
-    rescue Errno::ENOENT => e
-      raise CommandFailed    
-    end
-    
-    def diff(path, identifier_from, identifier_to=nil, type="inline")
-      path ||= ''
-      if identifier_to and identifier_to.to_i > 0
-        identifier_to = identifier_to.to_i 
-      else
-        identifier_to = identifier_from.to_i - 1
-      end
-      cmd = "svn diff -r "
-      cmd << "#{identifier_to}:"
-      cmd << "#{identifier_from}"
-      cmd << "#{target(path)}@#{identifier_from}"
-      cmd << " --username #{@login} --password #{@password}" if @login
-      diff = []
-      shellout(cmd) do |io|
-        io.each_line do |line|
-          diff << line
-        end
-      end
-      return nil if $? && $?.exitstatus != 0
-      DiffTableList.new diff, type
-
-    rescue Errno::ENOENT => e
-      raise CommandFailed    
-    end
-    
-    def cat(path, identifier=nil)
-      identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
-      cmd = "svn cat #{target(path)}@#{identifier}"
-      cmd << " --username #{@login} --password #{@password}" if @login
-      cat = nil
-      shellout(cmd) do |io|
-        cat = io.read
-      end
-      return nil if $? && $?.exitstatus != 0
-      cat
-    rescue Errno::ENOENT => e
-      raise CommandFailed    
-    end
-  
-  private    
-    def retrieve_root_url
-      info = self.info
-      info ? info.root_url : nil
-    end
-    
-    def target(path)
-      path ||= ""
-      base = path.match(/^\//) ? root_url : url    
-      " \"" << "#{base}/#{path}".gsub(/["'?<>\*]/, '') << "\""
-    end
-    
-    def logger
-      RAILS_DEFAULT_LOGGER
-    end
-    
-    def shellout(cmd, &block)
-      logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
-      IO.popen(cmd, "r+") do |io|
-        io.close_write
-        block.call(io) if block_given?
-      end
-    end
-  end
-  
-  class Entries < Array
-    def sort_by_name
-      sort {|x,y| 
-        if x.kind == y.kind
-          x.name <=> y.name
-        else
-          x.kind <=> y.kind
-        end
-      }   
-    end
-    
-    def revisions
-      revisions ||= Revisions.new(collect{|entry| entry.lastrev})
-    end
-  end
-  
-  class Info
-    attr_accessor :root_url, :lastrev
-    def initialize(attributes={})
-      self.root_url = attributes[:root_url] if attributes[:root_url]
-      self.lastrev = attributes[:lastrev]
-    end
-  end
-  
-  class Entry
-    attr_accessor :name, :path, :kind, :size, :lastrev
-    def initialize(attributes={})
-      self.name = attributes[:name] if attributes[:name]
-      self.path = attributes[:path] if attributes[:path]
-      self.kind = attributes[:kind] if attributes[:kind]
-      self.size = attributes[:size].to_i if attributes[:size]
-      self.lastrev = attributes[:lastrev]
-    end
-    
-    def is_file?
-      'file' == self.kind
-    end
-    
-    def is_dir?
-      'dir' == self.kind
-    end
-  end
-  
-  class Revisions < Array
-    def latest
-      sort {|x,y| x.time <=> y.time}.last    
-    end 
-  end
-  
-  class Revision
-    attr_accessor :identifier, :author, :time, :message, :paths
-    def initialize(attributes={})
-      self.identifier = attributes[:identifier]
-      self.author = attributes[:author]
-      self.time = attributes[:time]
-      self.message = attributes[:message] || ""
-      self.paths = attributes[:paths]
-    end
-
-  end
-
-  # A line of Diff
-  class Diff
-
-    attr_accessor :nb_line_left
-    attr_accessor :line_left
-    attr_accessor :nb_line_right
-    attr_accessor :line_right
-    attr_accessor :type_diff_right
-    attr_accessor :type_diff_left
-    
-    def initialize ()
-      self.nb_line_left = ''
-      self.nb_line_right = ''
-      self.line_left = ''
-      self.line_right = ''
-      self.type_diff_right = ''
-      self.type_diff_left = ''
-    end
-
-    def inspect
-      puts '### Start Line Diff ###'
-      puts self.nb_line_left
-      puts self.line_left
-      puts self.nb_line_right
-      puts self.line_right
-    end
-  end
-
-  class DiffTableList < Array
-
-    def initialize (diff, type="inline")
-        diff_table = DiffTable.new type
-        diff.each do |line|
-            if line =~ /^Index: (.*)$/
-                self << diff_table if diff_table.length > 1
-                diff_table = DiffTable.new type
-            end
-            a = diff_table.add_line line
-        end
-        self << diff_table
-    end
-  end
-
-  # Class for create a Diff
-  class DiffTable < Hash
-
-    attr_reader :file_name, :line_num_l, :line_num_r    
-
-    # Initialize with a Diff file and the type of Diff View
-    # The type view must be inline or sbs (side_by_side)
-    def initialize (type="inline")
-      @parsing = false
-      @nb_line = 1
-      @start = false
-      @before = 'same'
-      @second = true
-      @type = type
-    end
-
-    # Function for add a line of this Diff
-    def add_line(line)
-      unless @parsing
-        if line =~ /^Index: (.*)$/
-          @file_name = $1
-          return false
-        elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
-          @line_num_l = $2.to_i
-          @line_num_r = $5.to_i
-          @parsing = true
-        end
-      else
-        if line =~ /^_+$/
-          self.delete(self.keys.sort.last)
-          @parsing = false
-          return false
-        elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
-          @line_num_l = $2.to_i
-          @line_num_r = $5.to_i
-        else
-          @nb_line += 1 if parse_line(line, @type)          
-        end
-      end
-      return true
-    end
-
-    def inspect
-      puts '### DIFF TABLE ###'
-      puts "file : #{file_name}"
-      self.each do |d|
-        d.inspect
-      end
-    end
-
-  private
-
-    # Test if is a Side By Side type
-    def sbs?(type, func)
-      if @start and type == "sbs"
-        if @before == func and @second
-          tmp_nb_line = @nb_line
-          self[tmp_nb_line] = Diff.new
-        else
-            @second = false
-            tmp_nb_line = @start
-            @start += 1
-            @nb_line -= 1
-        end
-      else
-        tmp_nb_line = @nb_line
-        @start = @nb_line
-        self[tmp_nb_line] = Diff.new
-        @second = true
-      end
-      unless self[tmp_nb_line]
-        @nb_line += 1
-        self[tmp_nb_line] = Diff.new
-      else
-        self[tmp_nb_line]
-      end
-    end
-
-    # Escape the HTML for the diff
-    def escapeHTML(line)
-        CGI.escapeHTML(line).gsub(/\s/, '&nbsp;')
-    end
-
-    def parse_line (line, type="inline")
-      if line[0, 1] == "+"
-        diff = sbs? type, 'add'
-        @before = 'add'
-        diff.line_left = escapeHTML line[1..-1]
-        diff.nb_line_left = @line_num_l
-        diff.type_diff_left = 'diff_in'
-        @line_num_l += 1
-        true
-      elsif line[0, 1] == "-"
-        diff = sbs? type, 'remove'
-        @before = 'remove'
-        diff.line_right = escapeHTML line[1..-1]
-        diff.nb_line_right = @line_num_r
-        diff.type_diff_right = 'diff_out'
-        @line_num_r += 1
-        true
-      elsif line[0, 1] =~ /\s/
-        @before = 'same'
-        @start = false
-        diff = Diff.new
-        diff.line_right = escapeHTML line[1..-1]
-        diff.nb_line_right = @line_num_r
-        diff.line_left = escapeHTML line[1..-1]
-        diff.nb_line_left = @line_num_l
-        self[@nb_line] = diff
-        @line_num_l += 1
-        @line_num_r += 1
-        true
-      else
-        false
-      end      
-    end
-  end
-end

app/models/time_entry.rb

@@ -1,3 +1,20 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 TimeEntry < ActiveRecord::Base
   # could have used polymorphic association
   # project association here allows easy loading of time entries at project level with one database trip
@@ -10,7 +27,7 @@ class TimeEntry < ActiveRecord::Base
   
   validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
   validates_numericality_of :hours, :allow_nil => true
-  validates_length_of :comment, :maximum => 255
+  validates_length_of :comments, :maximum => 255
 
   def before_validation
     self.project = issue.project if issue && project.nil?
@@ -28,6 +45,6 @@ class TimeEntry < ActiveRecord::Base
     super
     self.tyear = spent_on ? spent_on.year : nil
     self.tmonth = spent_on ? spent_on.month : nil
-    self.tweek = spent_on ? spent_on.cweek : nil
+    self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
   end  
 end

app/models/user.rb

@@ -18,9 +18,15 @@
 require "digest/sha1"
 
 class User < ActiveRecord::Base
-  has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => :delete_all
+  # Account statuses
+  STATUS_ACTIVE     = 1
+  STATUS_REGISTERED = 2
+  STATUS_LOCKED     = 3
+
+  has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name", :dependent => :delete_all
   has_many :projects, :through => :memberships
   has_many :custom_values, :dependent => :delete_all, :as => :customized
+  has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
   has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
   has_one :rss_key, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'"
   belongs_to :auth_source
@@ -44,11 +50,6 @@ class User < ActiveRecord::Base
   validates_confirmation_of :password, :allow_nil => true
   validates_associated :custom_values, :on => :update
 
-  # Account statuses
-  STATUS_ACTIVE     = 1
-  STATUS_REGISTERED = 2
-  STATUS_LOCKED     = 3
-
   def before_save
     # update hashed_password if password was set
     self.hashed_password = User.hash_password(self.password) if self.password
@@ -100,12 +101,8 @@ class User < ActiveRecord::Base
   end
 	
   # Return user's full name for display
-  def display_name
-    firstname + " " + lastname
-  end
-  
   def name
-    display_name
+    "#{firstname} #{lastname}"
   end
   
   def active?
@@ -125,10 +122,17 @@ class User < ActiveRecord::Base
   end
   
   def role_for_project(project)
+    return nil unless project
     member = memberships.detect {|m| m.project_id == project.id}
     member ? member.role : nil 
   end
   
+  def authorized_to(project, action)
+    return true if self.admin?
+    role = role_for_project(project)
+    role && Permission.allowed_to_role(action, role)
+  end
+  
   def pref
     self.preference ||= UserPreference.new(:user => self)
   end
@@ -141,9 +145,14 @@ class User < ActiveRecord::Base
     token = Token.find_by_value(key)
     token && token.user.active? ? token.user : nil
   end
+  
+  def self.find_by_autologin_key(key)
+    token = Token.find_by_action_and_value('autologin', key)
+    token && (token.created_on > Setting.autologin.to_i.day.ago) && token.user.active? ? token.user : nil
+  end
 
   def <=>(user)
-    lastname <=> user.lastname
+    lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname
   end
   
 private

app/models/user_preference.rb

@@ -26,11 +26,15 @@ class UserPreference < ActiveRecord::Base
     self.others ||= {}
   end
   
+  def before_save
+    self.others ||= {}
+  end
+  
   def [](attr_name)
     if attribute_present? attr_name
       super
     else
-      others[attr_name]
+      others ? others[attr_name] : nil
     end
   end
   
@@ -38,7 +42,8 @@ class UserPreference < ActiveRecord::Base
     if attribute_present? attr_name
       super
     else
-      others.store attr_name, value
+      self.others ||= {}
+      self.others.store attr_name, value
     end
   end
 end

app/models/version.rb

@@ -23,7 +23,7 @@ class Version < ActiveRecord::Base
 
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [:project_id]
-  validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date
+  validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date, :allow_nil => true
   
   def start_date
     effective_date
@@ -33,6 +33,27 @@ class Version < ActiveRecord::Base
     effective_date
   end
   
+  def completed?
+    effective_date && effective_date <= Date.today
+  end
+  
+  def wiki_page
+    if project.wiki && !wiki_page_title.blank?
+      @wiki_page ||= project.wiki.find_page(wiki_page_title)
+    end
+    @wiki_page
+  end
+  
+  # Versions are sorted by effective_date 
+  # Those with no effective_date are at the end, sorted by name
+  def <=>(version)
+    if self.effective_date
+      version.effective_date ? (self.effective_date <=> version.effective_date) : -1
+    else
+      version.effective_date ? 1 : (self.name <=> version.name)
+    end
+  end
+  
 private
   def check_integrity
     raise "Can't delete version" if self.fixed_issues.find(:first)

app/models/watcher.rb

@@ -0,0 +1,23 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 Watcher < ActiveRecord::Base
+  belongs_to :watchable, :polymorphic => true
+  belongs_to :user
+  
+  validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]
+end

app/models/wiki.rb

@@ -20,6 +20,7 @@ class Wiki < ActiveRecord::Base
   has_many :pages, :class_name => 'WikiPage', :dependent => :destroy
   
   validates_presence_of :start_page
+  validates_format_of :start_page, :with => /^[^,\.\/\?\;\|]*$/
   
   # find the page with the given title
   # if page doesn't exist, return a new page
@@ -30,13 +31,14 @@ class Wiki < ActiveRecord::Base
   
   # find the page with the given title
   def find_page(title)
-    pages.find_by_title(Wiki.titleize(title || start_page))
+    title = start_page if title.blank?
+    pages.find_by_title(Wiki.titleize(title))
   end
   
   # turn a string into a valid page title
   def self.titleize(title)
     # replace spaces with _ and remove unwanted caracters
-    title = title.gsub(/\s+/, '_').delete(',;|') if title
+    title = title.gsub(/\s+/, '_').delete(',./?;|') if title
     # upcase the first letter
     title = title[0..0].upcase + title[1..-1] if title
     title

app/models/wiki_content.rb

@@ -18,12 +18,14 @@
 require 'zlib'
 
 class WikiContent < ActiveRecord::Base
+  set_locking_column :version
   belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id'
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   validates_presence_of :text
   
   acts_as_versioned
   class Version
+    belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id'
     belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
     attr_protected :data
     

app/models/wiki_page.rb

@@ -15,12 +15,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'diff'
+
 class WikiPage < ActiveRecord::Base
   belongs_to :wiki
   has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
+  has_many :attachments, :as => :container, :dependent => :destroy
   
   validates_presence_of :title
-  validates_format_of :title, :with => /^[^,\s]*$/
+  validates_format_of :title, :with => /^[^,\.\/\?\;\|\s]*$/
   validates_uniqueness_of :title, :scope => :wiki_id, :case_sensitive => false
   validates_associated :content
   
@@ -38,7 +41,36 @@ class WikiPage < ActiveRecord::Base
     result
   end
   
+  def diff(version_to=nil, version_from=nil)
+    version_to = version_to ? version_to.to_i : self.content.version
+    version_from = version_from ? version_from.to_i : version_to - 1
+    version_to, version_from = version_from, version_to unless version_from < version_to
+    
+    content_to = content.versions.find_by_version(version_to)
+    content_from = content.versions.find_by_version(version_from)
+    
+    (content_to && content_from) ? WikiDiff.new(content_to, content_from) : nil
+  end
+  
   def self.pretty_title(str)
     (str && str.is_a?(String)) ? str.tr('_', ' ') : str
   end
+  
+  def project
+    wiki.project
+  end
+end
+
+class WikiDiff
+  attr_reader :diff, :words, :content_to, :content_from
+  
+  def initialize(content_to, content_from)
+    @content_to = content_to
+    @content_from = content_from
+    @words = content_to.text.split(/(\s+)/)
+    @words = @words.select {|word| word != ' '}
+    words_from = content_from.text.split(/(\s+)/)
+    words_from = words_from.select {|word| word != ' '}    
+    @diff = words_from.diff @words
+  end
 end

app/sweepers/issue_sweeper.rb

@@ -0,0 +1,38 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 IssueSweeper < ActionController::Caching::Sweeper
+  observe Issue
+
+  def after_save(issue)
+    expire_cache_for(issue)
+  end
+  
+  def after_destroy(issue)
+    expire_cache_for(issue)
+  end
+          
+private
+  def expire_cache_for(issue)
+    # fragments of the main project
+    expire_fragment(Regexp.new("projects/(calendar|gantt)/#{issue.project_id}\\."))
+    # fragments of the root project that include subprojects issues
+    unless issue.project.parent_id.nil?
+      expire_fragment(Regexp.new("projects/(calendar|gantt)/#{issue.project.parent_id}\\..*subprojects"))
+    end
+  end
+end

app/sweepers/project_sweeper.rb

@@ -0,0 +1,40 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 ProjectSweeper < ActionController::Caching::Sweeper
+  observe Project
+
+  def before_save(project)
+    if project.new_record?
+      expire_cache_for(project.parent) if project.parent
+    else
+      project_before_update = Project.find(project.id)
+      return if project_before_update.parent_id == project.parent_id && project_before_update.status == project.status
+      expire_cache_for(project.parent) if project.parent      
+      expire_cache_for(project_before_update.parent) if project_before_update.parent
+    end
+  end
+  
+  def after_destroy(project)
+    expire_cache_for(project.parent) if project.parent
+  end
+          
+private
+  def expire_cache_for(project)
+    expire_fragment(Regexp.new("projects/(calendar|gantt)/#{project.id}\\."))
+  end
+end

app/views/account/login.rhtml

@@ -3,22 +3,26 @@
 <h2 class="icon22 icon22-authent"><%=l(:label_please_login)%></h2>
 
 <% form_tag({:action=> "login"}, :class => "tabular") do %>
+
 <p><label for="login"><%=l(:field_login)%>:</label>
 <%= text_field_tag 'login', nil, :size => 25 %></p>
 
 <p><label for="password"><%=l(:field_password)%>:</label>
 <%= password_field_tag 'password', nil, :size => 25 %></p>
 
-<p><center><input type="submit" name="login" value="<%=l(:button_login)%> &#187;" class="primary" /></center>
+<% if Setting.autologin? %>
+<p><label for="autologin"><%= check_box_tag 'autologin' %> <%= l(:label_stay_logged_in) %></label></p>
 <% end %>
 
-<br>
+<p><input type="submit" name="login" value="<%=l(:button_login)%> &#187;" class="primary" /></p>
+<% end %>
+<%= javascript_tag "Form.Element.focus('login');" %>
+
 <% links = []
    links << link_to(l(:label_register), :action => 'register') if Setting.self_registration?
    links << link_to(l(:label_password_lost), :action => 'lost_password') if Setting.lost_password?
 %>
 <%= links.join(" | ") %>
-</p>
 
 </div>
 </center>

app/views/account/show.rhtml

@@ -1,4 +1,4 @@
-<h2><%= @user.display_name %></h2>
+<h2><%=h @user.name %></h2>
 
 <p>
 <%= mail_to @user.mail unless @user.pref.hide_mail %>
@@ -12,13 +12,15 @@
 </ul>
 </p>
 
+<% unless @memberships.empty? %>
 <h3><%=l(:label_project_plural)%></h3>
-<p>
-<% for membership in @user.memberships %>
-	<%= membership.project.name %> (<%= membership.role.name %>, <%= format_date(membership.created_on) %>)
-	<br />
+<ul>
+<% for membership in @memberships %>
+	<li><%= link_to membership.project.name, :controller => 'projects', :action => 'show', :id => membership.project %>
+    (<%= membership.role.name %>, <%= format_date(membership.created_on) %>)</li>
+<% end %>
+</ul>
 <% end %>
-</p>
 
 <h3><%=l(:label_activity)%></h3>
 <p>

app/views/admin/projects.rhtml

@@ -4,6 +4,15 @@
 
 <h2><%=l(:label_project_plural)%></h2>
 
+<% form_tag() do %>
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
+<label><%= l(:field_status) %> :</label>
+<%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+<%= submit_tag l(:button_apply), :class => "small" %>
+</fieldset>
+<% end %>
+&nbsp;
+
 <table class="list">
   <thead><tr>
 	<%= sort_header_tag('name', :caption => l(:label_project)) %>
@@ -12,22 +21,29 @@
 	<th><%=l(:label_subproject_plural)%></th>
 	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
     <th></th>
+    <th></th>
   </tr></thead>
   <tbody>
 <% for project in @projects %>
   <tr class="<%= cycle("odd", "even") %>">
-	<td><%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %>
+	<td><%= project.active? ? link_to(project.name, :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
 	<td><%=h project.description %>
 	<td align="center"><%= image_tag 'true.png' if project.is_public? %>
 	<td align="center"><%= project.children.size %>
 	<td align="center"><%= format_date(project.created_on) %>
-  <td align="center">
-    <%= button_to l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => "button-small" %>
+  <td align="center" style="width:10%">
+    <small>
+    <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project }, :method => :post, :class => 'icon icon-lock') if project.active? %>
+    <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
+    </small>
+  </td>
+  <td align="center" style="width:10%">
+    <small><%= link_to(l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => 'icon icon-del') %></small>
   </td>
   </tr>
 <% end %>
   </tbody>
 </table>
 
-<p><%= pagination_links_full @project_pages %>
-[ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p>
+<p><%= pagination_links_full @project_pages, :status => @status %>
+[ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p>

app/views/attachments/_form.rhtml

@@ -0,0 +1,4 @@
+<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
+<%= image_to_function "add.png", "addFileField();return false" %></label>
+
+<%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>

app/views/attachments/_links.rhtml

@@ -0,0 +1,13 @@
+<div class="attachments">
+<% for attachment in attachments %>
+  <p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'download', :id => attachment }, :class => 'icon icon-attachment' %>
+  (<%= number_to_human_size attachment.filesize %>)
+  <% unless options[:no_author] %>
+    <em><%= attachment.author.name %>, <%= format_date(attachment.created_on) %></em>
+  <% end %>
+  <% if options[:delete_url] %>
+    <%= link_to image_tag('delete.png'), options[:delete_url].update({:attachment_id => attachment}), :confirm => l(:text_are_you_sure), :method => :post %>
+  <% end %>
+  </p>
+<% end %>
+</div>

app/views/boards/_form.rhtml

@@ -0,0 +1,8 @@
+<%= error_messages_for 'board' %>
+
+<!--[form:board]-->
+<div class="box">
+<p><%= f.text_field :name, :required => true %></p>
+<p><%= f.text_field :description, :required => true, :size => 80 %></p>
+</div>
+<!--[eoform:board]-->

app/views/boards/edit.rhtml

@@ -0,0 +1,6 @@
+<h2><%= l(:label_board) %></h2>
+
+<% labelled_tabular_form_for :board, @board, :url => {:action => 'edit', :id => @board} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
+  <%= submit_tag l(:button_save) %>
+<% end %>

app/views/boards/index.rhtml

@@ -0,0 +1,30 @@
+<h2><%= l(:label_board_plural) %></h2>
+
+<table class="list">
+  <thead><tr>
+    <th><%= l(:label_board) %></th>
+    <th><%= l(:label_topic_plural) %></th>
+    <th><%= l(:label_message_plural) %></th>
+    <th><%= l(:label_message_last) %></th>
+  </tr></thead>
+  <tbody>
+<% for board in @boards %>
+  <tr class="<%= cycle 'odd', 'even' %>">
+    <td>
+      <%= link_to h(board.name), {:action => 'show', :id => board}, :class => "icon22 icon22-comment"  %><br />
+      <%=h board.description %>
+    </td>
+    <td align="center"><%= board.topics_count %></td>
+    <td align="center"><%= board.messages_count %></td>
+    <td>
+    <small>
+      <% if board.last_message %>
+      <%= board.last_message.author.name %>, <%= format_time(board.last_message.created_on) %><br />
+      <%= link_to_message board.last_message %>  
+      <% end %>
+    </small>
+    </td>
+  </tr>
+<% end %>
+  </tbody>
+</table>

app/views/boards/new.rhtml

@@ -0,0 +1,6 @@
+<h2><%= l(:label_board_new) %></h2>
+
+<% labelled_tabular_form_for :board, @board, :url => {:action => 'new'} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
+  <%= submit_tag l(:button_create) %>
+<% end %>

app/views/boards/show.rhtml

@@ -0,0 +1,37 @@
+<div class="contextual">
+<%= link_to l(:label_message_new), {:controller => 'messages', :action => 'new', :board_id => @board}, :class => "icon icon-add" %>
+<%= watcher_tag(@board, @logged_in_user) %>
+</div>
+
+<h2><%=h @board.name %></h2>
+
+<table class="list">
+  <thead><tr>
+    <th><%= l(:field_subject) %></th>
+    <th><%= l(:field_author) %></th>
+    <%= sort_header_tag("#{Message.table_name}.created_on", :caption => l(:field_created_on)) %>
+    <th><%= l(:label_reply_plural) %></th>
+    <%= sort_header_tag("#{Message.table_name}.updated_on", :caption => l(:label_message_last)) %>
+  </tr></thead>  
+  <tbody>
+  <% @topics.each do |topic| %>
+    <tr class="<%= cycle 'odd', 'even' %>">
+      <td><%= link_to h(topic.subject), :controller => 'messages', :action => 'show', :board_id => @board, :id => topic %></td>
+      <td align="center"><%= link_to_user topic.author %></td>
+      <td align="center"><%= format_time(topic.created_on) %></td>
+      <td align="center"><%= topic.replies_count %></td>
+      <td>
+      <small>
+        <% if topic.last_reply %>
+        <%= topic.last_reply.author.name %>, <%= format_time(topic.last_reply.created_on) %><br />
+        <%= link_to_message topic.last_reply %>
+        <% end %>
+      </small>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
+
+<p><%= pagination_links_full @topic_pages %>
+[ <%= @topic_pages.current.first_item %> - <%= @topic_pages.current.last_item %> / <%= @topic_count %> ]</p>

app/views/common/403.rhtml

@@ -0,0 +1,4 @@
+<h2>403</h2>
+
+<p><%= l(:notice_not_authorized) %></p>
+<p><a href="javascript:history.back()">Back</a></p>

app/views/custom_fields/_form.rhtml

@@ -84,6 +84,7 @@ when "IssueCustomField" %>
      
     <p><%= f.check_box :is_required %></p>
     <p><%= f.check_box :is_for_all %></p>
+    <p><%= f.check_box :is_filter %></p>
     
 <% when "UserCustomField" %>
     <p><%= f.check_box :is_required %></p>

app/views/documents/_form.rhtml

@@ -14,16 +14,4 @@
 <!--[eoform:document]-->
 </div>
 
-<% if Setting.text_formatting == 'textile' %>
-<%= javascript_include_tag 'jstoolbar' %>
-<script type="text/javascript">
-//<![CDATA[
-if (document.getElementById) { 
-	if (document.getElementById('document_description')) { 
-		var commentTb = new jsToolBar(document.getElementById('document_description')); 
-		commentTb.draw(); 
-	}
-}
-//]]>
-</script>
-<% end %>
+<%= wikitoolbar_for 'document_description' %>

app/views/documents/show.rhtml

@@ -7,7 +7,7 @@
 
 <p><em><%= @document.category.name %><br />
 <%= format_date @document.created_on %></em></p>
-<%= textilizable @document.description %>
+<%= textilizable @document.description, :attachments => @document.attachments %>
 <br />
 
 <h3><%= l(:label_attachment_plural) %></h3>
@@ -19,7 +19,7 @@
         </div>
         <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
         (<%= number_to_human_size attachment.filesize %>)<br />
-        <em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em><br />
+        <em><%= attachment.author.name %>, <%= format_date(attachment.created_on) %></em><br />
         <%= lwr(:label_download, attachment.downloads) %>
     </li>
 <% end %>
@@ -29,10 +29,8 @@
 
 <% if authorize_for('documents', 'add_attachment') %>
 <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
-  <% form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
-    <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
-    <%= image_to_function "add.png", "addFileField();return false" %></label>
-    <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+  <% form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
+    <%= render :partial => 'attachments/form' %>
   <%= submit_tag l(:button_add) %>
   <% end %> 
 <% end %>

app/views/feeds/history_atom.rxml

@@ -16,7 +16,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
       xml.author  { xml.name journal.user.name }
       xml.summary journal.notes
       xml.content "type" => "html" do
-        xml.text! journal.notes
+        xml.text! journal.notes if journal.notes
         xml.text! "<ul>"
         journal.details.each do |detail|
           xml.text! "<li>" + show_detail(detail, false) + "</li>"

app/views/issue_categories/_form.rhtml

@@ -1,7 +1,6 @@
-<%= error_messages_for 'issue_category' %>
-
-<!--[form:issue_category]-->
-<p><label for="issue_category_name"><%l(:field_name)%></label>
-<%= text_field 'issue_category', 'name'  %></p>
-<!--[eoform:issue_category]-->
+<%= error_messages_for 'category' %>
 
+<div class="box">
+<p><%= f.text_field :name, :size => 30, :required => true %></p>
+<p><%= f.select :assigned_to_id, @project.users.collect{|u| [u.name, u.id]}, :include_blank => true %></p>
+</div>

app/views/issue_categories/edit.rhtml

@@ -1,6 +1,6 @@
 <h2><%=l(:label_issue_category)%></h2>
 
-<% form_tag({:action => 'edit', :id => @category}, :class => "tabular") do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag l(:button_save) %>
+<% labelled_tabular_form_for :category, @category, :url => { :action => 'edit', :id => @category } do |f| %>
+<%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
+<%= submit_tag l(:button_create) %>
 <% end %>

app/views/issue_relations/_form.rhtml

@@ -0,0 +1,10 @@
+<%= error_messages_for 'relation' %>
+
+<p><%= f.select :relation_type, collection_for_relation_type_select, {}, :onchange => "setPredecessorFieldsVisibility();" %>
+<%= l(:label_issue) %> #<%= f.text_field :issue_to_id, :size => 6 %>
+<span id="predecessor_fields" style="display:none;">
+<%= l(:field_delay) %>: <%= f.text_field :delay, :size => 3 %> <%= l(:label_day_plural) %>
+</span>
+<%= submit_tag l(:button_add) %></p>
+
+<%= javascript_tag "setPredecessorFieldsVisibility();" %>

app/views/issues/_add_shortcut.rhtml

@@ -1,5 +0,0 @@
-<% if authorize_for('projects', 'add_issue') %>
-<% form_tag({ :controller => 'projects', :action => 'add_issue', :id => @project }, :method => 'get') do %>
-<%= l(:label_issue_new) %>: <%= select_tag 'tracker_id', ("<option></option>" + options_from_collection_for_select(trackers, 'id', 'name')), :onchange => "if (this.value!='') {this.form.submit();}" %>
-<% end %>
-<% end %>

app/views/issues/_pdf.rfpdf

@@ -1,5 +1,5 @@
 <%	pdf.SetFontStyle('B',11)   	
-   	pdf.Cell(190,10, "#{issue.project.name} - #{issue.tracker.name} # #{issue.long_id} - #{issue.subject}")
+   	pdf.Cell(190,10, "#{issue.project.name} - #{issue.tracker.name} # #{issue.id}: #{issue.subject}")
     pdf.Ln
     
     y0 = pdf.GetY

app/views/issues/_relations.rhtml

@@ -0,0 +1,22 @@
+<h3><%=l(:label_related_issues)%></h3>
+
+<table style="width:100%">
+<% @issue.relations.each do |relation| %>
+<tr>
+<td><%= l(relation.label_for(@issue)) %> <%= "(#{lwr(:actionview_datehelper_time_in_words_day, relation.delay)})" if relation.delay && relation.delay != 0 %> <%= link_to_issue relation.other_issue(@issue) %></td>
+<td><%=h relation.other_issue(@issue).subject %></td>
+<td><div class="square" style="background:#<%= relation.other_issue(@issue).status.html_color %>;"></div> <%= relation.other_issue(@issue).status.name %></td>
+<td><%= format_date(relation.other_issue(@issue).start_date) %></td>
+<td><%= format_date(relation.other_issue(@issue).due_date) %></td>
+<td><%= link_to_remote image_tag('delete.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :issue_id => @issue, :id => relation},                                              
+                                                  :method => :post
+                                                }, :title => l(:label_relation_delete) %></td>
+</tr>
+<% end %>
+</table>
+
+<% if authorize_for('issue_relations', 'new') %>&nbsp;  
+  <% remote_form_for(:relation, @relation, :url => {:controller => 'issue_relations', :action => 'new', :issue_id => @issue}, :method => :post) do |f| %>
+    <%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
+  <% end %>
+<% end %>

app/views/issues/change_status.rhtml

@@ -8,10 +8,23 @@
 <%= f.hidden_field :lock_version %>
 
 <div class="box">
+<div class="splitcontentleft">
 <p><label><%=l(:label_issue_status_new)%></label> <%= @new_status.name %></p>
 <p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
 <p><%= f.select :fixed_version_id, (@project.versions.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
+</div>
+<div class="splitcontentright">
+<% if authorize_for('timelog', 'edit') %>
+<% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
+<p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
+<p><%= time_entry.text_field :comments, :size => 40 %></p>
+<p><%= time_entry.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %></p>
+<% end %>
+<% end %>
+</div>
+
+<div class="clear"></div>
 
 <p><label for="notes"><%= l(:field_notes) %></label>
 <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %></p>

app/views/issues/edit.rhtml

@@ -33,19 +33,7 @@
 <%= submit_tag l(:button_save) %>
 <% end %>
 
-<% if Setting.text_formatting == 'textile' %>
-<%= javascript_include_tag 'jstoolbar' %>
-<script type="text/javascript">
-//<![CDATA[
-if (document.getElementById) { 
-	if (document.getElementById('issue_description')) { 
-		var commentTb = new jsToolBar(document.getElementById('issue_description')); 
-		commentTb.draw(); 
-	}
-}
-//]]>
-</script>
-<% end %>
+<%= wikitoolbar_for 'issue_description' %>
 
 <% content_for :header_tags do %>
 <%= javascript_include_tag 'calendar/calendar' %>

app/views/issues/show.rhtml

@@ -27,14 +27,14 @@
     <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= @issue.done_ratio %> %</td>
 </tr>
 <tr>
-    <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? @issue.fixed_version.name : "-" %></td>
+    <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
     <td><b><%=l(:label_spent_time)%> :</b></td>
     <td><%= @issue.spent_hours > 0 ? (link_to lwr(:label_f_hour, @issue.spent_hours), {:controller => 'timelog', :action => 'details', :issue_id => @issue}, :class => 'icon icon-time') : "-" %></td>
 </tr>
 <tr>
 <% n = 0
 for custom_value in @custom_values %>
-    <td><b><%= custom_value.custom_field.name %> :</b></td><td><%= h(show_value(custom_value)) %></td>
+    <td valign="top"><b><%= custom_value.custom_field.name %> :</b></td><td><%= simple_format(h(show_value(custom_value))) %></td>
 <% n = n + 1
    if (n > 1) 
         n = 0 %>
@@ -44,21 +44,27 @@ end %>
 </tr>
 </table>
 <hr />
-<br />
+
+<% if @issue.changesets.any? %>
+<div style="float:right;">
+  <em><%= l(:label_revision_plural) %>: <%= @issue.changesets.collect{|changeset| link_to(changeset.revision, :controller => 'repositories', :action => 'revision', :id => @project, :rev => changeset.revision)}.join(", ") %></em>
+</div>
+<% end %>
 
 <b><%=l(:field_description)%> :</b><br /><br />
-<%= textilizable @issue.description %>
+<%= textilizable @issue.description, :attachments => @issue.attachments %>
 <br />
 
 <div class="contextual">
 <%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit' %>
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
+<%= watcher_tag(@issue, @logged_in_user) %>
 <%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %>
 <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
 </div>
 
 <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
-  <% form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) do %>
+  <% form_tag({:controller => 'issues', :action => 'change_status', :id => @issue}) do %>
   <%=l(:label_change_status)%> :
   <select name="new_status_id">
   <%= options_from_collection_for_select @status_options, "id", "name" %>
@@ -69,6 +75,12 @@ end %>
 &nbsp;
 </div>
 
+<% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
+<div id="relations" class="box">
+<%= render :partial => 'relations' %>
+</div>
+<% end %>
+
 <div id="history" class="box">
 <h3><%=l(:label_history)%>
 <% if @journals_count > @journals.length %>(<%= l(:label_last_changes, @journals.length) %>)<% end %></h3>
@@ -80,33 +92,24 @@ end %>
 
 <div class="box">
 <h3><%=l(:label_attachment_plural)%></h3>
-<table width="100%">
-<% for attachment in @issue.attachments %>
-<tr>
-<td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= number_to_human_size(attachment.filesize) %>)</td>
-<td><%= format_date(attachment.created_on) %></td>
-<td><%= attachment.author.display_name %></td>
-<td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></div></td>
-</tr>
-<% end %>
-</table>
-<br />
+<%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %>
+
 <% if authorize_for('issues', 'add_attachment') %>
-  <% form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") do %>
-  <p id="attachments_p"><label><%=l(:label_attachment_new)%>
-  <%= image_to_function "add.png", "addFileField();return false" %></label>
-  <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
-  <%= submit_tag l(:button_add) %>
-  <% end %> 
+<p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
+<% form_tag({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
+  <%= render :partial => 'attachments/form' %>
+<%= submit_tag l(:button_add) %>
+<% end %>
 <% end %>
 </div>
 
 <% if authorize_for('issues', 'add_note') %>
   <div class="box">
   <h3><%= l(:label_add_note) %></h3>
-  <% form_tag ({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) do %>
+  <% form_tag({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) do %>
   <p><label for="notes"><%=l(:field_notes)%></label>
     <%= text_area_tag 'notes', '', :cols => 60, :rows => 10, :class => 'wiki-edit'  %></p>
+    <%= wikitoolbar_for 'notes' %>
   <%= submit_tag l(:button_add) %>
   <% end %>  
   </div>

app/views/layouts/base.rhtml

@@ -27,16 +27,25 @@
         <h2><%= Setting.app_subtitle %></h2>
     </div>
     <div style="float: right; padding-right: 1em; padding-top: 0.2em;">
-      <% if loggedin? %><small><%=l(:label_logged_as)%> <b><%= @logged_in_user.login %></b></small><% end %>
+      <% if loggedin? %><small><%=l(:label_logged_as)%> <strong><%= @logged_in_user.login %></strong> -</small><% end %>
+      <small><%= toggle_link l(:label_search), 'quick-search-form', :focus => 'quick-search-input' %></small>
+      <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get, :id => 'quick-search-form', :style => "display:none;" ) do %>
+        <%= text_field_tag 'q', @question, :size => 15, :class => 'small', :id => 'quick-search-input' %>
+      <% end %>
+    </div>
     </div>
-    </div> 
 	
 	<div id="navigation">
 		<ul>
 	<li><%= link_to l(:label_home), { :controller => 'welcome' }, :class => "icon icon-home" %></li>
 	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "icon icon-mypage" %></li>
-	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>
-			
+	
+	<% if loggedin? and @logged_in_user.memberships.any? %>
+      <li class="submenu"><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects", :onmouseover => "buttonMouseover(event, 'menuAllProjects');" %></li>
+	<% else %>
+	  <li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>
+	<% end %>
+
     <% unless @project.nil? || @project.id.nil? %>
         <li class="submenu"><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "icon icon-projects", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>
     <% end %>
@@ -55,7 +64,7 @@
 		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "icon icon-user" %></li>	
 	<% else %>	
 		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "icon icon-user" %></li>
-	<% end %>
+	<% end %>	
 		</ul>		
 	</div>
 
@@ -67,7 +76,10 @@
     <div id="menuProject" class="menu" onmouseover="menuMouseover(event)">
         <%= link_to l(:label_calendar), {:controller => 'projects', :action => 'calendar', :id => @project }, :class => "menuItem" %>
         <%= link_to l(:label_gantt), {:controller => 'projects', :action => 'gantt', :id => @project }, :class => "menuItem" %>
-        <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 }, :class => "menuItem" %>
+        <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %>
+        <% if @project && authorize_for('projects', 'add_issue') %>
+          <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuNewIssue');" onclick="this.blur(); return false;"><span class="menuItemText"><%= l(:label_issue_new) %></span><span class="menuItemArrow">&#9654;</span></a>
+        <% end %>
         <%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %>
         <%= link_to l(:label_activity), {:controller => 'projects', :action => 'activity', :id => @project }, :class => "menuItem" %>
         <%= link_to l(:label_news_plural), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %>
@@ -75,13 +87,30 @@
         <%= link_to l(:label_roadmap), {:controller => 'projects', :action => 'roadmap', :id => @project }, :class => "menuItem" %>
         <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %>
         <%= link_to l(:label_wiki), {:controller => 'wiki', :id => @project, :page => nil }, :class => "menuItem" if @project.wiki and !@project.wiki.new_record? %>        
+        <%= link_to l(:label_board_plural), {:controller => 'boards', :project_id => @project }, :class => "menuItem" unless @project.boards.empty? %>
         <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %>
-        <%= link_to l(:label_search), {:controller => 'projects', :action => 'search', :id => @project }, :class => "menuItem" %>
+        <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project }, :class => "menuItem" %>
         <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %>
         <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %>
     </div>
     <% end %>
+    
+    <% if @project && authorize_for('projects', 'add_issue') %>
+        <div id="menuNewIssue" class="menu" onmouseover="menuMouseover(event)">
+        <% Tracker.find(:all, :order => 'position').each do |tracker| %>
+            <%= link_to tracker.name, {:controller => 'projects', :action => 'add_issue', :id => @project, :tracker_id => tracker}, :class => "menuItem" %>
+        <% end %>
+        </div>
+    <% end %>
 
+    <% if loggedin? and @logged_in_user.memberships.any? %>
+        <div id="menuAllProjects" class="menu" onmouseover="menuMouseover(event)">
+        <%= link_to l(:label_project_all), {:controller => 'projects' }, :class => "menuItem" %>
+        <% @logged_in_user.memberships.find(:all, :limit => 20).each do |membership| %>
+            <%= link_to membership.project.name, {:controller => 'projects',:action => 'show', :id => membership.project }, :class => "menuItem" %>
+        <% end %>
+        </div>
+    <% end %>
 	
 	<div id="subcontent">
 	
@@ -91,36 +120,32 @@
 				<li><%= link_to l(:label_overview), :controller => 'projects', :action => 'show', :id => @project %></li>
 				<li><%= link_to l(:label_calendar), :controller => 'projects', :action => 'calendar', :id => @project %></li>
 				<li><%= link_to l(:label_gantt), :controller => 'projects', :action => 'gantt', :id => @project %></li>
-				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></li>
+				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
 				<li><%= link_to l(:label_report_plural), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
 				<li><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :id => @project %></li>
 				<li><%= link_to l(:label_news_plural), :controller => 'projects', :action => 'list_news', :id => @project %></li>
 				<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>
 				<li><%= link_to l(:label_roadmap), :controller => 'projects', :action => 'roadmap', :id => @project %></li>
 				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
-				<li><%= link_to l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil if @project.wiki and !@project.wiki.new_record? %></li>				
+				<%= content_tag("li", link_to(l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil)) if @project.wiki and !@project.wiki.new_record? %>
+				<%= content_tag("li", link_to(l(:label_board_plural), :controller => 'boards', :project_id => @project)) unless @project.boards.empty? %>
 				<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>
-				<li><%= link_to l(:label_search), :controller => 'projects', :action => 'search', :id => @project %></li>
-				<li><%= link_to l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project if @project.repository and !@project.repository.new_record? %></li>
+				<li><%= link_to l(:label_search), :controller => 'search', :action => 'index', :id => @project %></li>
+				<%= content_tag("li", link_to(l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project)) if @project.repository and !@project.repository.new_record? %>
 				<li><%= link_to_if_authorized l(:label_settings), :controller => 'projects', :action => 'settings', :id => @project %></li>
 			</ul>
 		<% end %>
-		
-		<% if loggedin? and @logged_in_user.memberships.length > 0 %>
-			<h2><%=l(:label_my_projects) %></h2>
-			<ul class="menublock">
-				<% for membership in @logged_in_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 %>		
 		<%= yield %>	
 	</div>
 	
+	<div id="ajax-indicator" style="display:none;">
+	   <span><%= l(:label_loading) %></span>
+	</div>
+
 	<div id="footer">
 		<p><a href="http://redmine.rubyforge.org/">redMine</a> <small><%= Redmine::VERSION %> &copy 2006-2007 Jean-Philippe Lang</small></p>
 	</div>

app/views/mailer/_issue.rhtml

@@ -1,5 +1,6 @@
 <%=l(:label_issue)%> #<%= issue.id %> - <%= issue.subject %>
-<%=l(:field_author)%>: <%= issue.author.display_name %>
+<%=l(:field_author)%>: <%= issue.author.name %>
+<%=l(:field_assigned_to)%>: <%= issue.assigned_to ? issue.assigned_to.name : "-" %>
 <%=l(:field_status)%>: <%= issue.status.name %>
 
 <%= issue.description %>

app/views/mailer/account_information.rhtml

@@ -0,0 +1,9 @@
+<% if @user.auth_source %>You can use your "<%= @user.auth_source.name %>" account to log into Redmine.
+<% else %>Your Redmine account information:
+* Login:    <%= @user.login %>
+* Password: <%= @password %>
+<% end %>
+Log in: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'login' %>
+<% unless @user.auth_source %>
+You can change your password here: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %>
+<% end %>

app/views/mailer/account_information_fr.rhtml

@@ -0,0 +1,9 @@
+<% if @user.auth_source %>Vous pouvez utiliser votre compte "<%= @user.auth_source.name %>" pour vous connecter à Redmine.
+<% else %>Paramètres de connexion de votre compte Redmine:
+* Identifiant:  <%= @user.login %>
+* Mot de passe: <%= @password %>
+<% end %>
+Pour se connecter à l'application: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'account', :action => 'login' %>
+<% unless @user.auth_source %>
+Vous pouvez changer votre mot de passe à l'adresse: <%= url_for :only_path => false, :host => Setting.host_name, :controller => 'my', :action => 'account' %>
+<% end %>

app/views/mailer/attachments_add_bg.rhtml

@@ -0,0 +1,6 @@
+<%= @added_to %>
+<%= @attachments.size %> файл(а) добавени.
+<% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
+<%= @url %>

app/views/mailer/attachments_add_nl.rhtml

@@ -0,0 +1,6 @@
+<%= @added_to %>
+<%= @attachments.size %> bestand(en) toegevoegd.
+<% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
+<%= @url %>